From 644bdd5a59a5ed5fbf93a0765f92608b0530c16a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 31 Oct 2012 23:16:24 -0400
Subject: [PATCH] Improve transparency of permissions by indicating permission source

---
 src/com/gitblit/IUserService.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/com/gitblit/IUserService.java b/src/com/gitblit/IUserService.java
index 78b6e2f..059d648 100644
--- a/src/com/gitblit/IUserService.java
+++ b/src/com/gitblit/IUserService.java
@@ -84,7 +84,7 @@
 	 * @param model
 	 * @return cookie value
 	 */
-	char[] getCookie(UserModel model);
+	String getCookie(UserModel model);
 
 	/**
 	 * Authenticate a user based on their cookie.
@@ -126,6 +126,15 @@
 	 */
 	boolean updateUserModel(UserModel model);
 
+	/**
+	 * Updates/writes all specified user objects.
+	 * 
+	 * @param models a list of user models
+	 * @return true if update is successful
+	 * @since 1.2.0
+	 */
+	boolean updateUserModels(List<UserModel> models);
+	
 	/**
 	 * Adds/updates a user object keyed by username. This method allows for
 	 * renaming a user.
@@ -205,7 +214,8 @@
 	 * @param teamnames
 	 * @return true if successful
 	 * @since 0.8.0
-	 */	
+	 */
+	@Deprecated
 	boolean setTeamnamesForRepositoryRole(String role, List<String> teamnames);
 	
 	/**
@@ -226,6 +236,15 @@
 	 */	
 	boolean updateTeamModel(TeamModel model);
 
+	/**
+	 * Updates/writes all specified team objects.
+	 * 
+	 * @param models a list of team models
+	 * @return true if update is successful
+	 * @since 1.2.0
+	 */	
+	boolean updateTeamModels(List<TeamModel> models);
+	
 	/**
 	 * Updates/writes and replaces a complete team object keyed by teamname.
 	 * This method allows for renaming a team.
@@ -277,6 +296,7 @@
 	 * @param usernames
 	 * @return true if successful
 	 */
+	@Deprecated
 	boolean setUsernamesForRepositoryRole(String role, List<String> usernames);
 
 	/**

--
Gitblit v1.9.1