Corrected ExternalAccountStoreModelFactory login test

Author: bdemers

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

@@ -174,7 +174,7 @@ public boolean isNotAllowedIfAuthenticated() {
     protected void appendModel(HttpServletRequest request, HttpServletResponse response, Form form, List<ErrorModel> errors,
                                Map<String, Object> model) {
 
-//        final List<AccountStoreModel> accountStores = accountStoreModelFactory.getAccountStores(request);
+
 
         // 748: If stormpath.web.idSite.enabled is false and stormpath.web.callback.enabled is false AND
         // there are SAML directories mapped to the application, that is a configuration error.
@@ -189,8 +189,8 @@ protected void appendModel(HttpServletRequest request, HttpServletResponse respo
                 errors.add(ErrorModel.builder().setStatus(HttpServletResponse.SC_OK).setMessage(errorMsg).build());
             }
         }
-
-//        model.put("accountStores", accountStores);
+        final List<AccountStoreModel> accountStores = accountStoreModelFactory.getAccountStores(request);
+        model.put("accountStores", accountStores);
 
         if (isHtmlPreferred(request, response)) {
             model.put("forgotPasswordEnabled", forgotPasswordEnabled);

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/provider/ExternalAccountStoreModelFactory.java

@@ -59,14 +59,11 @@ public List<AccountStoreModel> getAccountStores(HttpServletRequest request) {
         AccountStoreModelVisitor visitor =
                 new AccountStoreModelVisitor(accountStores, getAuthorizeBaseUri(request, app.getWebConfig()));
 
-        // TODO - if introduced for Okta. Need to deal with for real when we add social support
-        if (mappings.getHref() != null) {
-            for (ApplicationAccountStoreMapping mapping : mappings) {
+        for (ApplicationAccountStoreMapping mapping : mappings) {
 
-                final AccountStore accountStore = mapping.getAccountStore();
+            final AccountStore accountStore = mapping.getAccountStore();
 
-                accountStore.accept(visitor);
-            }
+            accountStore.accept(visitor);
         }
 
         return visitor.getAccountStores();

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

@@ -195,7 +195,7 @@ class LoginControllerTest {
 
         List<AccountStoreModel> accountStores = new ArrayList<AccountStoreModel>()
         accountStores.add(new DefaultAccountStoreModel(null, new DefaultProviderModel('foo', 'saml'), null))
-//        expect(accountStoreModelFactory.getAccountStores(request)).andReturn(accountStores)
+        expect(accountStoreModelFactory.getAccountStores(request)).andReturn(accountStores)
         expect(request.getAttribute(UserAgents.USER_AGENT_REQUEST_ATTRIBUTE_NAME)).andReturn new DefaultUserAgent(request)
         expect(request.getParameter("status")).andReturn null
         expect(request.getHeader("Accept")).andReturn "text/html"

impl/src/main/java/com/stormpath/sdk/impl/application/okta/OktaApplication.java

@@ -75,7 +75,10 @@
 import com.stormpath.sdk.saml.SamlPolicy;
 import com.stormpath.sdk.tenant.Tenant;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -84,7 +87,7 @@ public class OktaApplication extends AbstractResource implements Application, OA
 
     private final Directory OKTA_TENANT_DIR;
 
-    private final ApplicationAccountStoreMappingList applicationAccountStoreMappingList;
+    private final ApplicationAccountStoreMappingCollectionBackedList applicationAccountStoreMappingList;
 
     private String name;
 
@@ -101,9 +104,14 @@ public OktaApplication(InternalDataStore dataStore, Map<String, Object> properti
         mappingProperties.put("application", this);
         mappingProperties.put("accountStore", OKTA_TENANT_DIR);
 
-        ApplicationAccountStoreMapping mapping = new DefaultApplicationAccountStoreMapping(dataStore, mappingProperties);
-
-        applicationAccountStoreMappingList = AbstractCollectionResource.singletonCollectionResource(dataStore, DefaultApplicationAccountStoreMappingList.class, mapping);
+        ApplicationAccountStoreMapping mapping = new DefaultApplicationAccountStoreMapping(dataStore, mappingProperties) {
+            @Override
+            public AccountStore getAccountStore() {
+                return OKTA_TENANT_DIR;
+            }
+        };
+        mapping.setAccountStore(OKTA_TENANT_DIR);
+        applicationAccountStoreMappingList = new ApplicationAccountStoreMappingCollectionBackedList(Collections.singletonList(mapping));
     }
 
     @Override
@@ -577,4 +585,52 @@ public IdSiteAuthenticator createIdSiteAuthenticator() {
     public OAuthTokenRevocator createOAuhtTokenRevocator() {
         return new DefaultOAuthTokenRevocator(this, getDataStore(), "/oauth2/v1/token");
     }
+
+
+    public static class ApplicationAccountStoreMappingCollectionBackedList implements ApplicationAccountStoreMappingList {
+
+        final private Collection<ApplicationAccountStoreMapping> accountStoreMappings;
+
+        public ApplicationAccountStoreMappingCollectionBackedList(Collection<ApplicationAccountStoreMapping> accountStoreMappings) {
+            this.accountStoreMappings = accountStoreMappings;
+        }
+
+        @Override
+        public String getHref() {
+            return null;
+        }
+
+        @Override
+        public int getOffset() {
+            return 0;
+        }
+
+        @Override
+        public int getLimit() {
+            return getSize();
+        }
+
+        @Override
+        public int getSize() {
+            return accountStoreMappings.size();
+        }
+
+        @Override
+        public ApplicationAccountStoreMapping single() {
+            Iterator<ApplicationAccountStoreMapping> iterator = iterator();
+            if (!iterator.hasNext()) {
+                throw new IllegalStateException("This list is empty while it was expected to contain one (and only one) element.");
+            }
+            ApplicationAccountStoreMapping itemToReturn = iterator.next();
+            if (iterator.hasNext()) {
+                throw new IllegalStateException("Only a single resource was expected, but this list contains more than one item.");
+            }
+            return itemToReturn;
+        }
+
+        @Override
+        public Iterator<ApplicationAccountStoreMapping> iterator() {
+            return accountStoreMappings.iterator();
+        }
+    }
 }