Remove empty action and update flow for unsupported institution login

In addition, fixed one bug where a wrong setter was called to set the
"encodedServiceUrl"; and improved case-insensitive check by using the
".equalsIgnoreCase()" instead of ".toLowerCase()"

Author: cslzchen

src/main/java/io/cos/cas/osf/web/config/OsfCasSupportActionsConfiguration.java

@@ -3,7 +3,6 @@
 import io.cos.cas.osf.dao.JpaOsfDao;
 import io.cos.cas.osf.web.flow.login.OsfDefaultLoginPreparationAction;
 import io.cos.cas.osf.web.flow.login.OsfInstitutionLoginPreparationAction;
-import io.cos.cas.osf.web.flow.login.OsfUnsupportedInstitutionLoginPreparationAction;
 import io.cos.cas.osf.web.flow.login.OsfCasPreInitialFlowSetupAction;
 import io.cos.cas.osf.web.flow.login.OsfPrincipalFromNonInteractiveCredentialsAction;
 
@@ -126,18 +125,4 @@ public Action osfInstitutionLoginCheckAction() {
                 casProperties.getAuthn().getOsfPostgres().getInstitutionClients()
         );
     }
-
-    /**
-     * Bean configuration for {@link OsfUnsupportedInstitutionLoginPreparationAction}.
-     *
-     * @return the initialized action
-     */
-    @Bean
-    public Action osfUnsupportedInstitutionLoginCheckAction() {
-        return new OsfUnsupportedInstitutionLoginPreparationAction(
-                initialAuthenticationAttemptWebflowEventResolver.getObject(),
-                serviceTicketRequestWebflowEventResolver.getObject(),
-                adaptiveAuthenticationPolicy.getObject()
-        );
-    }
 }

src/main/java/io/cos/cas/osf/web/flow/configurer/OsfCasLoginWebflowConfigurer.java

@@ -140,7 +140,6 @@ protected void createDefaultActionStates(final Flow flow) {
         // Create the customized interactive login check actions
         createOsfDefaultLoginCheckAction(flow);
         createOsfInstitutionLoginCheckAction(flow);
-        createOsfUnsupportedInstitutionLoginCheckAction(flow);
         // Create the customized non-interactive authentication check action
         createOsfNonInteractiveAuthenticationCheckAction(flow);
     }
@@ -332,7 +331,7 @@ private void createOsfDefaultLoginCheckAction(final Flow flow) {
         createTransitionForState(
                 action,
                 OsfCasWebflowConstants.TRANSITION_ID_UNSUPPORTED_INSTITUTION_LOGIN,
-                OsfCasWebflowConstants.STATE_ID_OSF_UNSUPPORTED_INSTITUTION_LOGIN_CHECK
+                OsfCasWebflowConstants.VIEW_ID_UNSUPPORTED_INSTITUTION_SSO_INIT
         );
         createTransitionForState(
                 action,
@@ -374,29 +373,6 @@ private void createOsfInstitutionLoginCheckAction(final Flow flow) {
         );
     }
 
-    /**
-     * Create the unsupported institution login check / preparation action for OSF CAS.
-     *
-     * @param flow the flow
-     */
-    private void createOsfUnsupportedInstitutionLoginCheckAction(final Flow flow) {
-        ActionState action = createActionState(
-                flow,
-                OsfCasWebflowConstants.STATE_ID_OSF_UNSUPPORTED_INSTITUTION_LOGIN_CHECK,
-                OsfCasWebflowConstants.ACTION_ID_OSF_UNSUPPORTED_INSTITUTION_LOGIN_CHECK
-        );
-        createTransitionForState(
-                action,
-                CasWebflowConstants.TRANSITION_ID_ERROR,
-                OsfCasWebflowConstants.VIEW_ID_INSTITUTION_SSO_FAILED
-        );
-        createTransitionForState(
-                action,
-                CasWebflowConstants.TRANSITION_ID_SUCCESS,
-                OsfCasWebflowConstants.VIEW_ID_UNSUPPORTED_INSTITUTION_SSO_INIT
-        );
-    }
-
     /**
      * Create extra authentication exception view states for OSF CAS.
      *
@@ -538,7 +514,7 @@ protected void createInstitutionLoginView(final Flow flow) {
     }
 
     /**
-     * Create the institution SSO init view state to support the OSF feature "sign-in via institutions".
+     * Create the unsupported institution view state to support the OSF feature "I can't find my institution".
      *
      * @param flow the flow
      */

src/main/java/io/cos/cas/osf/web/flow/login/OsfDefaultLoginPreparationAction.java

@@ -82,7 +82,7 @@ protected Event doExecute(RequestContext context) {
                     defaultServiceUrl
             );
         } else {
-            loginContext.setDefaultServiceUrl(encodedServiceUrl);
+            loginContext.setEncodedServiceUrl(encodedServiceUrl);
             loginContext.setInstitutionLogin(institutionLogin);
             loginContext.setInstitutionId(institutionId);
             loginContext.setUnsupportedInstitutionLogin(unsupportedInstitutionLogin);
@@ -116,7 +116,7 @@ protected Event doExecute(RequestContext context) {
 
     private boolean isInstitutionLogin(final RequestContext context) {
         final String campaign = context.getRequestParameters().get(PARAMETER_CAMPAIGN);
-        return StringUtils.isNotBlank(campaign) && PARAMETER_CAMPAIGN_VALUE.equals(campaign.toLowerCase());
+        return StringUtils.isNotBlank(campaign) && PARAMETER_CAMPAIGN_VALUE.equalsIgnoreCase(campaign);
     }
 
     private String getInstitutionIdFromRequestContext(final RequestContext context) {
@@ -126,13 +126,13 @@ private String getInstitutionIdFromRequestContext(final RequestContext context)
 
     private boolean isUnsupportedInstitutionLogin(final RequestContext context) {
         final String campaign = context.getRequestParameters().get(PARAMETER_CAMPAIGN);
-        return StringUtils.isNotBlank(campaign) && PARAMETER_CAMPAIGN_UNSUPPORTED_INSTITUTION_VALUE.equals(campaign.toLowerCase());
+        return StringUtils.isNotBlank(campaign) && PARAMETER_CAMPAIGN_UNSUPPORTED_INSTITUTION_VALUE.equalsIgnoreCase(campaign);
     }
 
     private boolean isOrcidLoginAutoRedirect(final RequestContext context) {
         final String orcidRedirect = context.getRequestParameters().get(PARAMETER_ORCID_REDIRECT);
         return StringUtils.isNotBlank(orcidRedirect)
-                && PARAMETER_ORCID_REDIRECT_VALUE.equals(orcidRedirect.toLowerCase());
+                && PARAMETER_ORCID_REDIRECT_VALUE.equalsIgnoreCase(orcidRedirect);
     }
 
     private String getOrcidLoginUrlFromFlowScope(final RequestContext context) {

src/main/java/io/cos/cas/osf/web/flow/login/OsfUnsupportedInstitutionLoginPreparationAction.java

@@ -20,8 +20,6 @@ public interface OsfCasWebflowConstants {
 
     String ACTION_ID_OSF_INSTITUTION_LOGIN_CHECK = "osfInstitutionLoginCheckAction";
 
-    String ACTION_ID_OSF_UNSUPPORTED_INSTITUTION_LOGIN_CHECK = "osfUnsupportedInstitutionLoginCheckAction";
-
     String TRANSITION_ID_USERNAME_PASSWORD_LOGIN = "continueToUsernamePasswordLogin";
 
     String TRANSITION_ID_INSTITUTION_LOGIN = "switchToInstitutionLogin";
@@ -38,8 +36,6 @@ public interface OsfCasWebflowConstants {
 
     String STATE_ID_OSF_INSTITUTION_LOGIN_CHECK = "osfInstitutionLoginCheck";
 
-    String STATE_ID_OSF_UNSUPPORTED_INSTITUTION_LOGIN_CHECK = "osfUnsupportedInstitutionLoginCheck";
-
     String VIEW_ID_INSTITUTION_SSO_INIT = "casInstitutionLoginView";
 
     String VIEW_ID_UNSUPPORTED_INSTITUTION_SSO_INIT = "casUnsupportedInstitutionLoginView";