Merge branch 'cslzchen/fix-sso-error' into hotfix/23.2.1

cslzchen · cslzchen · commit 67fdc773d319 · 2023-07-07T11:18:04.000-04:00
diff --git a/src/main/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java b/src/main/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java
@@ -7,6 +7,7 @@
 import com.google.gson.JsonParser;
 
 import io.cos.cas.osf.authentication.credential.OsfPostgresCredential;
+import io.cos.cas.osf.authentication.exception.InstitutionSsoAccountInactiveException;
 import io.cos.cas.osf.authentication.exception.InstitutionSsoAttributeMissingException;
 import io.cos.cas.osf.authentication.exception.InstitutionSsoAttributeParsingException;
 import io.cos.cas.osf.authentication.exception.InstitutionSsoDuplicateIdentityException;
@@ -788,7 +789,7 @@ private OsfApiInstitutionAuthenticationResult notifyOsfApiOfInstnAuthnSuccess(
                 }
                 if (OsfApiPermissionDenied.INSTITUTION_SSO_ACCOUNT_INACTIVE.getId().equals(errorDetail)) {
                     LOGGER.error("[OSF API] Failure - Inactive Account: {}", ssoUser);
-                    throw new InstitutionSsoDuplicateIdentityException("OSF API denies inactive account");
+                    throw new InstitutionSsoAccountInactiveException("OSF API denies inactive account");
                 }
             }
             // Handle unidentified HTTP 403 FORBIDDEN failures

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import com.google.gson.JsonParser;`
`8`	`8`
`9`	`9`	`import io.cos.cas.osf.authentication.credential.OsfPostgresCredential;`
	`10`	`+import io.cos.cas.osf.authentication.exception.InstitutionSsoAccountInactiveException;`
`10`	`11`	`import io.cos.cas.osf.authentication.exception.InstitutionSsoAttributeMissingException;`
`11`	`12`	`import io.cos.cas.osf.authentication.exception.InstitutionSsoAttributeParsingException;`
`12`	`13`	`import io.cos.cas.osf.authentication.exception.InstitutionSsoDuplicateIdentityException;`
`@@ -788,7 +789,7 @@ private OsfApiInstitutionAuthenticationResult notifyOsfApiOfInstnAuthnSuccess(`
`788`	`789`	`}`
`789`	`790`	`if (OsfApiPermissionDenied.INSTITUTION_SSO_ACCOUNT_INACTIVE.getId().equals(errorDetail)) {`
`790`	`791`	`LOGGER.error("[OSF API] Failure - Inactive Account: {}", ssoUser);`
`791`		`- throw new InstitutionSsoDuplicateIdentityException("OSF API denies inactive account");`
	`792`	`+ throw new InstitutionSsoAccountInactiveException("OSF API denies inactive account");`
`792`	`793`	`}`
`793`	`794`	`}`
`794`	`795`	`// Handle unidentified HTTP 403 FORBIDDEN failures`