Merge pull request #1201 from stormpath/issue/1198_1.3.0

Fixed register/unverified bug

Author: dogeared

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RegisterController.java

@@ -19,11 +19,11 @@
 import com.stormpath.sdk.account.AccountStatus;
 import com.stormpath.sdk.application.Application;
 import com.stormpath.sdk.authc.AuthenticationResult;
+import com.stormpath.sdk.cache.Cache;
 import com.stormpath.sdk.client.Client;
 import com.stormpath.sdk.directory.AccountStore;
 import com.stormpath.sdk.directory.AccountStoreVisitorAdapter;
 import com.stormpath.sdk.directory.Directory;
-import com.stormpath.sdk.group.Group;
 import com.stormpath.sdk.lang.Assert;
 import com.stormpath.sdk.organization.Organization;
 import com.stormpath.sdk.servlet.account.event.impl.DefaultRegisteredAccountRequestEvent;
@@ -46,8 +46,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.stormpath.sdk.servlet.mvc.View.STORMPATH_JSON_VIEW_NAME;
-
 /**
  * @since 1.0.RC4
  */
@@ -277,11 +275,20 @@ public void visit(Organization organization) {
                 return new DefaultViewModel(loginUri + "?status=created").setRedirect(true);
             }
         } else if (status == AccountStatus.UNVERIFIED) {
+            // purge account from cache in case status is updated on the backend
+            invalidateAccountCache(account);
             return new DefaultViewModel(loginUri + "?status=unverified").setRedirect(true);
         }
         return new DefaultViewModel(nextUri).setRedirect(true);
     }
 
+    // resolves https://github.com/stormpath/stormpath-sdk-java/issues/1198
+    @SuppressWarnings("unchecked")
+    private void invalidateAccountCache(Account account) {
+        Cache accountCache = client.getCacheManager().getCache(Account.class.getName());
+        accountCache.remove(account.getHref());
+    }
+
     private Map<String, Object> getCustomData(HttpServletRequest request, Form form) {
         //Custom fields are either declared as form fields which shouldn't not be account fields or through a customField attribute
         Map<String, Object> result = new LinkedHashMap<String, Object>();

extensions/servlet/src/test/groovy/com/stormpath/sdk/servlet/mvc/RegisterControllerTest.groovy

@@ -16,14 +16,16 @@
 package com.stormpath.sdk.servlet.mvc
 
 import com.stormpath.sdk.account.Account
+import com.stormpath.sdk.account.AccountStatus
 import com.stormpath.sdk.application.Application
+import com.stormpath.sdk.cache.Cache
+import com.stormpath.sdk.cache.CacheManager
 import com.stormpath.sdk.client.Client
 import com.stormpath.sdk.directory.CustomData
 import com.stormpath.sdk.directory.Directory
 import com.stormpath.sdk.group.Group
 import com.stormpath.sdk.impl.account.DefaultAccount
 import com.stormpath.sdk.impl.directory.DefaultDirectory
-import com.stormpath.sdk.impl.ds.InternalDataStore
 import com.stormpath.sdk.impl.group.DefaultGroup
 import com.stormpath.sdk.impl.organization.DefaultOrganization
 import com.stormpath.sdk.organization.Organization
@@ -47,7 +49,6 @@ import javax.servlet.http.HttpServletResponse
 import static org.easymock.EasyMock.anyObject
 import static org.easymock.EasyMock.createMock
 import static org.easymock.EasyMock.createNiceMock
-import static org.easymock.EasyMock.createStrictMock
 import static org.easymock.EasyMock.expect
 import static org.easymock.EasyMock.partialMockBuilder
 import static org.easymock.EasyMock.replay
@@ -133,6 +134,49 @@ public class RegisterControllerTest {
         assertNotNull(vm, "ViewModel should not be empty")
     }
 
+    @Test
+    void testAccountUnverifiedRemovedFromCache() {
+        def HREF = "a real href"
+        def cacheManager = createMock(CacheManager)
+        def cache = createMock(Cache)
+
+        RegisterController registerController = new RegisterController(
+            client: client,
+            preRegisterHandler: registerPreHandler,
+            csrfTokenManager: csrfTokenManager,
+            fieldValueResolver: requestFieldValueResolver,
+            produces: Arrays.asList(MediaType.TEXT_HTML),
+            eventPublisher: eventPublisher,
+            accountStoreResolver: accountStoreResolver
+        )
+
+        expect(client.instantiate(Account.class)).andReturn account
+        expect(requestFieldValueResolver.getAllFields(request)).andReturn new HashMap<String, Object>()
+        expect(request.getAttribute(Application.class.getName())).andReturn ((Application)application)
+        expect(accountStoreResolver.getAccountStore(request, response)).andReturn directory
+        expect(registerPreHandler.handle(request, response, account)).andReturn true
+        expect(account.setGivenName("UNKNOWN")).andReturn account
+        expect(account.setSurname("UNKNOWN")).andReturn account
+        expect(account.getStatus()).andReturn AccountStatus.UNVERIFIED
+        expect(account.getHref()).andReturn HREF
+        expect(account.getCustomData()).andReturn customData
+        expect(directory.createAccount(account)).andReturn account
+        expect(eventPublisher.publish(anyObject()))
+
+        expect(request.getAttribute(UserAgents.USER_AGENT_REQUEST_ATTRIBUTE_NAME)).andReturn new DefaultUserAgent(request)
+        expect(request.getHeader("Accept")).andReturn "text/html"
+
+        expect(client.getCacheManager()).andReturn cacheManager
+        expect(cacheManager.getCache(Account.class.name)).andReturn cache
+        expect(cache.remove(HREF)).andReturn(cache).once()
+
+        replay eventPublisher, registerPreHandler, request, response, client, cacheManager, cache, requestFieldValueResolver, application, account, accountStoreResolver, directory
+
+        def vm = registerController.onValidSubmit(request, response, form)
+
+        verify eventPublisher, registerPreHandler, request, response, client, cacheManager, cache, requestFieldValueResolver, application, account, accountStoreResolver, directory
+    }
+
     @Test(expectedExceptions = [IllegalStateException])
     void testAccountStoreResolverResolvesGroup() {
         RegisterController registerController = new RegisterController(