Refactor user services and separate authentication (issue-281)

Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/com/gitblit/models/TeamModel.java b/src/main/java/com/gitblit/models/TeamModel.java
index a1928283..aaa3d54a 100644
--- a/src/main/java/com/gitblit/models/TeamModel.java
+++ b/src/main/java/com/gitblit/models/TeamModel.java
@@ -27,6 +27,7 @@ import java.util.Set;
 

 import com.gitblit.Constants.AccessPermission;

 import com.gitblit.Constants.AccessRestrictionType;

+import com.gitblit.Constants.AccountType;

 import com.gitblit.Constants.PermissionType;

 import com.gitblit.Constants.RegistrantType;

 import com.gitblit.Constants.Unused;

@@ -48,6 +49,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> {
 	public boolean canAdmin;

 	public boolean canFork;

 	public boolean canCreate;

+	public AccountType accountType;

 	public final Set<String> users = new HashSet<String>();

 	// retained for backwards-compatibility with RPC clients

 	@Deprecated

@@ -59,6 +61,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> {
 

 	public TeamModel(String name) {

 		this.name = name;

+		this.accountType = AccountType.LOCAL;

 	}

 

 	/**

@@ -358,6 +361,10 @@ public class TeamModel implements Serializable, Comparable<TeamModel> {
 		}

 	}

 

+	public boolean isLocalTeam() {

+		return accountType.isLocal();

+	}

+

 	@Override

 	public String toString() {

 		return name;