Added setUser methdo on ESUserVerifier interface

eclipse-emfstore · Feb 12, 2015 · 4738ecf · 4738ecf
1 parent eba6068
commit 4738ecf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/.../eclipse/emf/emfstore/internal/server/model/impl/api/ESAuthenticationInformationImpl.java b/.../eclipse/emf/emfstore/internal/server/model/impl/api/ESAuthenticationInformationImpl.java
@@ -13,9 +13,12 @@
 
 import org.eclipse.emf.emfstore.internal.common.api.AbstractAPIImpl;
 import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
+import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACUser;
 import org.eclipse.emf.emfstore.server.model.ESAuthenticationInformation;
 import org.eclipse.emf.emfstore.server.model.ESUser;
 
+import com.google.common.base.Preconditions;
+
 /**
  * Mapping between {@link ESAuthenticationInformation} and {@link AuthenticationInformation}.
  *
@@ -44,4 +47,15 @@ public ESUser getUser() {
 		// TODO: double check
 		return toInternalAPI().getResolvedACUser().toAPI();
 	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.emfstore.server.model.ESAuthenticationInformation#setUser(org.eclipse.emf.emfstore.server.model.ESUser)
+	 */
+	public void setUser(ESUser user) {
+		Preconditions.checkNotNull(user);
+		toInternalAPI().setResolvedACUser(
+			(ACUser) ESUserImpl.class.cast(user).toInternalAPI());
+	}
 }
diff --git a/...e.server.model/src/org/eclipse/emf/emfstore/server/model/ESAuthenticationInformation.java b/...e.server.model/src/org/eclipse/emf/emfstore/server/model/ESAuthenticationInformation.java
@@ -22,9 +22,17 @@ public interface ESAuthenticationInformation {
 
 	/**
 	 * Returns the authenticated user.
-	 * 
+	 *
 	 * @return the authenticated user
 	 */
 	ESUser getUser();
 
+	/**
+	 * Sets the authenticated user.
+	 *
+	 * @param user
+	 *            the authenticated user
+	 */
+	void setUser(ESUser user);
+
 }
diff --git a/....eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java b/....eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java
@@ -33,7 +33,8 @@ public interface ESUserVerifier {
 	 * @param clientVersionInfo
 	 *            the version of the client
 	 * @return an {@link ESAuthenticationInformation} instance holding information about the
-	 *         logged-in session
+	 *         logged-in session. Note that the return {@link ESAuthenticationInformation} must
+	 *         hold an {@link org.eclipse.emf.emfstore.server.model.ESUser ESUser}
 	 *
 	 * @throws AccessControlException in case the login fails
 	 */