Skip to content

Commit 450cb72

Browse files
committed
Simplify shortcut SSO mode check
1 parent a12f7ec commit 450cb72

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

src/main/java/io/cos/cas/osf/authentication/support/OsfInstitutionUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,17 @@ public static String getInstitutionSupportEmail(final JpaOsfDao jpaOsfDao, final
3737
public static Map<String, String> getInstitutionLoginUrlMap(
3838
final JpaOsfDao jpaOsfDao,
3939
final String target,
40-
final String institutionId,
41-
boolean isShortcutSso
40+
final String institutionId
4241
) {
4342
List<OsfInstitution> institutionList = new LinkedList<>();
43+
boolean isShortcutSso = false;
4444
if (institutionId == null || institutionId.isEmpty()) {
4545
institutionList = jpaOsfDao.findAllInstitutions();
4646
} else {
4747
final OsfInstitution institution = jpaOsfDao.findOneInstitutionById(institutionId);
4848
if (institution != null) {
4949
institutionList.add(institution);
50+
isShortcutSso = true;
5051
} else {
5152
institutionList = jpaOsfDao.findAllInstitutions();
5253
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ protected Event doExecute(RequestContext context) {
7171
}
7272

7373
String institutionId = null;
74-
boolean isShortcutSsoMode = false;
7574
OsfCasLoginContext loginContext;
7675
loginContext = Optional.of(context).map(requestContext
7776
-> (OsfCasLoginContext) requestContext.getFlowScope().get(PARAMETER_LOGIN_CONTEXT)).orElse(null);
@@ -82,7 +81,6 @@ protected Event doExecute(RequestContext context) {
8281
context.getFlowScope().put(PARAMETER_LOGIN_CONTEXT, loginContext);
8382
institutionId = null;
8483
} else {
85-
isShortcutSsoMode = true;
8684
final String institutionSupportEmail = OsfInstitutionUtils.getInstitutionSupportEmail(jpaOsfDao, institutionId);
8785
if (institutionSupportEmail != null) {
8886
loginContext.setInstitutionSupportEmail(institutionSupportEmail);
@@ -91,7 +89,7 @@ protected Event doExecute(RequestContext context) {
9189
}
9290

9391
final Map<String, String> institutionLoginUrlMap
94-
= OsfInstitutionUtils.getInstitutionLoginUrlMap(jpaOsfDao, target, institutionId, isShortcutSsoMode);
92+
= OsfInstitutionUtils.getInstitutionLoginUrlMap(jpaOsfDao, target, institutionId);
9593
final Map<String, String> institutionLoginUrlMapSorted;
9694
if (institutionId != null) {
9795
institutionLoginUrlMapSorted = institutionLoginUrlMap;

0 commit comments

Comments
 (0)