Skip to content

Commit ef1e48e

Browse files
cslzchencslzchen
committed
Add new pages and rework user-facing error messages
1 parent efb0e3c commit ef1e48e

5 files changed

Lines changed: 227 additions & 10 deletions

‎src/main/resources/messages.properties‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -686,16 +686,37 @@ screen.onetimepasswordrequired.message=Two-factor authentication has been enable
686686
style="white-space: nowrap" href="mailto:support@osf.io">OSF Support</a>.
687687
screen.institutionssofailed.title=Institution SSO Error
688688
screen.institutionssofailed.heading=Institution login failed
689-
screen.institutionssofailed.message=Your request cannot be completed at this time. Please \
690-
<a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later.</br></br>If the issue persists, \
691-
check with your institution to verify your account is entitled to authenticate to OSF.</br></br>If you believe this \
692-
is in error, please contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
693-
screen.institutionssoselectivelogindenied.message=Your institutional account is unable to authenticate to OSF. \
694-
Please check with your institution. If your institution believes this is in error, please contact \
695-
<a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
696-
screen.institutionssoosfapifailed.message=Your request cannot be completed at this time due to an unexpected error. Please \
697-
<a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later.</br></br>If the issue persists, \
698-
please contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
689+
screen.institutionssofailed.message=\
690+
Your request cannot be completed at this time. \
691+
Please <a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later. \
692+
If the issue persists, check with your institution to verify your account is entitled to authenticate to OSF. \
693+
If you believe this is in error, \
694+
contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
695+
screen.institutionssoaccountinactive.message=\
696+
Institution login is not available for an inactive OSF account. \
697+
Please contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
698+
screen.institutionssoattributemissing.message=\
699+
Your request cannot be completed at this time. \
700+
The system failed to receive required information from your institution. \
701+
Please <a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later. \
702+
If the issue persists, contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
703+
screen.institutionssoattributeparsingfailed.message=\
704+
Your request cannot be completed at this time. \
705+
The system failed to validate the information provided by your institution. \
706+
Please <a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later. \
707+
If the issue persists, contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
708+
screen.institutionssoduplicateidentity.message=\
709+
Your request cannot be completed at this time due to an error caused by duplicate SSO identity. \
710+
Please contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
711+
screen.institutionssoselectivelogindenied.message=\
712+
Your institutional account is unable to authenticate to OSF. Please check with your institution. \
713+
If your institution believes this is in error, \
714+
contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
715+
screen.institutionssoosfapifailed.message=\
716+
Your request cannot be completed at this time due to an unexpected error. \
717+
Please <a style="white-space: nowrap" href="{0}">return to OSF</a> and try again later. \
718+
If the issue persists, contact <a style="white-space: nowrap" href="mailto:support@osf.io">Support</a> for help.
719+
699720
#
700721
# OAuth 2.0 Views and Error Views
701722
#

‎src/main/resources/templates/casInstitutionSsoAccountInactiveView.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE html>
2+
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layoutosf}">
3+
4+
<head>
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7+
8+
<title th:text="#{screen.institutionssofailed.title}"></title>
9+
<link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
10+
</head>
11+
12+
<body class="mdc-typography">
13+
<div layout:fragment="content" class="d-flex justify-content-center">
14+
15+
<div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content w-lg-30">
16+
<section class="login-error-card">
17+
<section>
18+
<div th:replace="fragments/osfbannerui :: osfBannerUI">
19+
<a href="fragments/osfbannerui.html"></a>
20+
</div>
21+
</section>
22+
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical title-danger">
23+
<span th:utext="#{screen.authnerror.tips}"></span>
24+
</section>
25+
<hr class="my-4" />
26+
<section class="card-message">
27+
<h1 th:utext="#{screen.institutionssofailed.heading}"></h1>
28+
<p th:utext="#{screen.institutionssoaccountinactive.message}"></p>
29+
</section>
30+
<section class="form-button">
31+
<a class="mdc-button mdc-button--raised button-osf-blue" th:href="@{/logout(service=${osfUrl.logout})}">
32+
<span class="mdc-button__label" th:utext="#{screen.authnerror.button.backtoosf}"></span>
33+
</a>
34+
</section>
35+
<hr class="my-4" />
36+
<section class="text-with-mdi" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
37+
<span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
38+
</section>
39+
</section>
40+
</div>
41+
42+
<script type="text/javascript">
43+
disableSignUpButton();
44+
</script>
45+
46+
</div>
47+
</body>
48+
49+
</html>

‎src/main/resources/templates/casInstitutionSsoAttributeMissingView.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE html>
2+
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layoutosf}">
3+
4+
<head>
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7+
8+
<title th:text="#{screen.institutionssofailed.title}"></title>
9+
<link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
10+
</head>
11+
12+
<body class="mdc-typography">
13+
<div layout:fragment="content" class="d-flex justify-content-center">
14+
15+
<div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content w-lg-30">
16+
<section class="login-error-card">
17+
<section>
18+
<div th:replace="fragments/osfbannerui :: osfBannerUI">
19+
<a href="fragments/osfbannerui.html"></a>
20+
</div>
21+
</section>
22+
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical title-danger">
23+
<span th:utext="#{screen.authnerror.tips}"></span>
24+
</section>
25+
<hr class="my-4" />
26+
<section class="card-message">
27+
<h1 th:utext="#{screen.institutionssofailed.heading}"></h1>
28+
<p th:utext="#{screen.institutionssoattributemissing.message}"></p>
29+
</section>
30+
<section class="form-button">
31+
<a class="mdc-button mdc-button--raised button-osf-blue" th:href="@{/logout(service=${osfUrl.logout})}">
32+
<span class="mdc-button__label" th:utext="#{screen.authnerror.button.backtoosf}"></span>
33+
</a>
34+
</section>
35+
<hr class="my-4" />
36+
<section class="text-with-mdi" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
37+
<span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
38+
</section>
39+
</section>
40+
</div>
41+
42+
<script type="text/javascript">
43+
disableSignUpButton();
44+
</script>
45+
46+
</div>
47+
</body>
48+
49+
</html>

‎src/main/resources/templates/casInstitutionSsoAttributeParsingFailedView.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE html>
2+
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layoutosf}">
3+
4+
<head>
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7+
8+
<title th:text="#{screen.institutionssofailed.title}"></title>
9+
<link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
10+
</head>
11+
12+
<body class="mdc-typography">
13+
<div layout:fragment="content" class="d-flex justify-content-center">
14+
15+
<div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content w-lg-30">
16+
<section class="login-error-card">
17+
<section>
18+
<div th:replace="fragments/osfbannerui :: osfBannerUI">
19+
<a href="fragments/osfbannerui.html"></a>
20+
</div>
21+
</section>
22+
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical title-danger">
23+
<span th:utext="#{screen.authnerror.tips}"></span>
24+
</section>
25+
<hr class="my-4" />
26+
<section class="card-message">
27+
<h1 th:utext="#{screen.institutionssofailed.heading}"></h1>
28+
<p th:utext="#{screen.institutionssoattributeparsingfailed.message}"></p>
29+
</section>
30+
<section class="form-button">
31+
<a class="mdc-button mdc-button--raised button-osf-blue" th:href="@{/logout(service=${osfUrl.logout})}">
32+
<span class="mdc-button__label" th:utext="#{screen.authnerror.button.backtoosf}"></span>
33+
</a>
34+
</section>
35+
<hr class="my-4" />
36+
<section class="text-with-mdi" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
37+
<span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
38+
</section>
39+
</section>
40+
</div>
41+
42+
<script type="text/javascript">
43+
disableSignUpButton();
44+
</script>
45+
46+
</div>
47+
</body>
48+
49+
</html>

‎src/main/resources/templates/casInstitutionSsoDuplicateIdentityView.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE html>
2+
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layoutosf}">
3+
4+
<head>
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7+
8+
<title th:text="#{screen.institutionssofailed.title}"></title>
9+
<link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
10+
</head>
11+
12+
<body class="mdc-typography">
13+
<div layout:fragment="content" class="d-flex justify-content-center">
14+
15+
<div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content w-lg-30">
16+
<section class="login-error-card">
17+
<section>
18+
<div th:replace="fragments/osfbannerui :: osfBannerUI">
19+
<a href="fragments/osfbannerui.html"></a>
20+
</div>
21+
</section>
22+
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical title-danger">
23+
<span th:utext="#{screen.authnerror.tips}"></span>
24+
</section>
25+
<hr class="my-4" />
26+
<section class="card-message">
27+
<h1 th:utext="#{screen.institutionssofailed.heading}"></h1>
28+
<p th:utext="#{screen.institutionssoduplicateidentity.message}"></p>
29+
</section>
30+
<section class="form-button">
31+
<a class="mdc-button mdc-button--raised button-osf-blue" th:href="@{/logout(service=${osfUrl.logout})}">
32+
<span class="mdc-button__label" th:utext="#{screen.authnerror.button.backtoosf}"></span>
33+
</a>
34+
</section>
35+
<hr class="my-4" />
36+
<section class="text-with-mdi" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
37+
<span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
38+
</section>
39+
</section>
40+
</div>
41+
42+
<script type="text/javascript">
43+
disableSignUpButton();
44+
</script>
45+
46+
</div>
47+
</body>
48+
49+
</html>

0 commit comments

Comments
 (0)