Skip to content

Commit 466591a

Browse files
committed
Add institution support email to login context
1 parent c5312fa commit 466591a

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ protected Event doExecute(RequestContext context) {
7575
encodedServiceUrl,
7676
institutionLogin,
7777
institutionId,
78+
StringUtils.EMPTY,
7879
unsupportedInstitutionLogin,
7980
orcidRedirect,
8081
orcidLoginUrl,
@@ -85,6 +86,7 @@ protected Event doExecute(RequestContext context) {
8586
loginContext.setEncodedServiceUrl(encodedServiceUrl);
8687
loginContext.setInstitutionLogin(institutionLogin);
8788
loginContext.setInstitutionId(institutionId);
89+
loginContext.setInstitutionSupportEmail(StringUtils.EMPTY);
8890
loginContext.setUnsupportedInstitutionLogin(unsupportedInstitutionLogin);
8991
loginContext.setOrcidLoginUrl(orcidLoginUrl);
9092
loginContext.setOrcidRedirect(false);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ protected Event doExecute(RequestContext context) {
8080
loginContext.setInstitutionId(null);
8181
context.getFlowScope().put(PARAMETER_LOGIN_CONTEXT, loginContext);
8282
institutionId = null;
83+
} else {
84+
final String institutionSupportEmail = OsfInstitutionUtils.getInstitutionSupportEmail(jpaOsfDao, institutionId);
85+
if (institutionSupportEmail != null)
86+
loginContext.setInstitutionSupportEmail(institutionSupportEmail);
8387
}
8488
}
8589

src/main/java/io/cos/cas/osf/web/support/OsfCasLoginContext.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public class OsfCasLoginContext implements Serializable {
4040

4141
private String institutionId;
4242

43+
private String institutionSupportEmail;
44+
4345
private boolean unsupportedInstitutionLogin;
4446

4547
private boolean orcidRedirect;
@@ -59,6 +61,7 @@ public OsfCasLoginContext (
5961
final String encodedServiceUrl,
6062
final boolean institutionLogin,
6163
final String institutionId,
64+
final String institutionSupportEmail,
6265
final boolean unsupportedInstitutionLogin,
6366
final boolean orcidRedirect,
6467
final String orcidLoginUrl,
@@ -69,6 +72,7 @@ public OsfCasLoginContext (
6972
this.handleErrorName = null;
7073
this.institutionLogin = institutionLogin;
7174
this.institutionId = institutionId;
75+
this.institutionSupportEmail = institutionSupportEmail;
7276
this.unsupportedInstitutionLogin = unsupportedInstitutionLogin;
7377
this.orcidRedirect = orcidRedirect;
7478
this.orcidLoginUrl = orcidLoginUrl;

0 commit comments

Comments
 (0)