Changeset 1863

Timestamp:

04/05/12 15:14:10 (12 years ago)

Author:

twagoo

Message:

Users without user entry in database that go to user settings (see #156) now get an entry created. Previously this would lead to an exception occurring.

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• frontend/UserSettingsPage.java (modified) (3 diffs)
• impl/database/ComponentRegistryFactoryDbImpl.java (modified) (2 diffs)
• rest/ComponentRegistryRestService.java (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/UserSettingsPage.java

@@ -5 +5 @@
 package clarin.cmdi.componentregistry.frontend;
 
+import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.impl.database.UserDao;
 import clarin.cmdi.componentregistry.model.RegistryUser;
@@ -29 +31 @@
     @SpringBean
     private UserDao userDao;
+    @SpringBean(name = "componentRegistryFactory")
+    private ComponentRegistryFactory componentRegistryFactory;
     private RegistryUser registryUser;
 
@@ -35 +39 @@
 
         Principal userPrincipal = ((WebRequestCycle) (RequestCycle.get())).getWebRequest().getHttpServletRequest().getUserPrincipal();
-        registryUser = userDao.getByPrincipalName(userPrincipal.getName());
-        
+        registryUser = componentRegistryFactory.getOrCreateUser(new UserCredentials(userPrincipal));
+
         add(new Label("userName", registryUser.getPrincipalName()));
 

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java

@@ -20 +20 @@
  * ComponentRegistryDbImpl implementation of ComponentRegistry for accessing the
  * registry
- * 
+ *
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
@@ -118 +118 @@
         RegistryUser user = userDao.getByPrincipalName(principalName);
         if (user == null) {
+            LOG.info("Request to create user with principal name {} and display name {}", new Object[]{principalName, displayName});
             // Create the new user
             user = new RegistryUser();

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -779 +779 @@
             }
             response.setIsProfile(desc.isProfile());
-            if (response.isRegistered()) {
-                LOG.info("Registration of {} was successful", response.getDescription().getId());
-            }
             return Response.ok(response).build();
         } finally {