Changeset 6860

Timestamp:

12/01/15 08:08:02 (9 years ago)

Author:

Twan Goosen

Message:

auth info: isAdmin

Location:

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• model/AuthenticationInfo.java (modified) (3 diffs)
• rest/AuthenticationRestService.java (modified) (4 diffs)

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/AuthenticationInfo.java

@@ -18 +18 @@
     @XmlElement
     private String displayName;
+    @XmlElement
+    private boolean isAdmin;
 
     public AuthenticationInfo() {
@@ -26 +28 @@
     }
 
-    public AuthenticationInfo(UserCredentials userInfo) {
+    public AuthenticationInfo(UserCredentials userInfo, boolean isAdmin) {
         this.authenticated = (userInfo != null);
         if (userInfo != null) {
             this.username = userInfo.getPrincipalName();
             this.displayName = userInfo.getDisplayName();
+            this.isAdmin = isAdmin;
         }
     }
@@ -46 +49 @@
     }
 
+    public boolean isIsAdmin() {
+        return isAdmin;
+    }
+
 }

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/AuthenticationRestService.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.AuthenticationRequiredException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.Configuration;
 import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.impl.database.ValidationException;
@@ -27 +28 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -74 +76 @@
     @Context
     private UriInfo uriInfo;
+    @Autowired
+    private Configuration configuration;
 
     @GET
@@ -89 +93 @@
             authInfo = new AuthenticationInfo(false);
         } else {
-            authInfo = new AuthenticationInfo(new UserCredentials(userPrincipal));
+            authInfo = new AuthenticationInfo(new UserCredentials(userPrincipal), configuration.isAdminUser(userPrincipal));
         }