Skip to content

Commit cdc860a

Browse files
cslzchencslzchen
authored
[ENG-8793] [ENG-8785] [ENG-8793] Remove branded login + Update no service pages + Update OAuth workflow (#98)
* Remove branded login from all affected pages * Remove fragment osfbannerui and serviceui and their CSS * Fix 405 language * Update generic logged-in and logged-out page * Rework OAuth confirm and error pages
1 parent 3db8a65 commit cdc860a

10 files changed

Lines changed: 35 additions & 213 deletions

File tree

‎src/main/resources/messages.properties‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ screen.error.page.title.pagenotfound=Error - Page Not Found
168168
screen.error.page.title.requestunsupported=Error - Unsupported Request
169169
screen.error.page.accessdenied=Access Denied
170170
screen.error.page.permissiondenied=You do not have permission to view this page.
171-
screen.error.page.requestunsupported=The request type or syntax is not supported.
171+
screen.error.page.requestunsupported=Request Not Supported
172172
# screen.error.page.loginagain=Login Again
173173
screen.error.page.notfound=Page Not Found
174174
screen.error.page.doesnotexist=The page you are attempting to access does not exist at the moment.
@@ -760,14 +760,15 @@ screen.institutionssomultipleemailsnotsupported.message=\
760760
screen.oauth.confirm.title=Approve Access
761761
screen.oauth.confirm.header=Approve or deny authorization
762762
screen.oauth.confirm.message=Do you want to grant access to the following service with listed access scopes?
763-
screen.oauth.confirm.service=Name: {0}
764-
screen.oauth.confirm.description=Description: {0}
765-
screen.oauth.confirm.scopes=Scope(s) requested: {0}
763+
screen.oauth.confirm.service.name=Service Name
764+
screen.oauth.confirm.service.description=Service Description
765+
screen.oauth.confirm.service.scopes=Scope(s) Requested
766766
screen.oauth.confirm.allow=Allow
767767
screen.oauth.confirm.deny=Deny
768768
screen.oauth.confirm.backtoosf=Exit and go back to OSF
769769
screen.oauth.error.title=OAuth Error
770770
screen.oauth.error.heading=Authorization failed
771+
screen.oauth.error.detail=Error Detail
771772
screen.oauth.error.exit=Exit
772773
#
773774
# Pac4j Authentication Delegation Error Views

‎src/main/resources/static/css/cas.css‎

Lines changed: 14 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,7 @@ button.close {
679679
--cas-theme-osf-blue-hover: #0089ff;
680680
--cas-theme-grey-hover: #f5f8fb;
681681
--cas-theme-osf-red: #b52b27;
682+
--cas-theme-osf-red-hover: #E40303;
682683
--cas-theme-osf-disabled: #eeeeee;
683684
--cas-theme-osf-disabled-dark: #cccccc;
684685
--cas-theme-primary: var(--cas-theme-osf-navbar, #263947);
@@ -830,6 +831,10 @@ body {
830831
.form-button .button-osf-red,
831832
.form-button-inline .button-osf-red {
832833
background-color: var(--cas-theme-osf-red, #b52b27);
834+
835+
&:hover {
836+
background-color: var(--cas-theme-osf-red-hover, #E40303);
837+
}
833838
}
834839

835840
.form-button .button-osf-disabled,
@@ -870,8 +875,7 @@ body {
870875
color: #F7F7F7;
871876
}
872877

873-
.mdc-top-app-bar__row .hidden-narrow,
874-
.service-ui .osf-shield-with-name .hidden-narrow {
878+
.mdc-top-app-bar__row .hidden-narrow {
875879
font-weight: normal;
876880
}
877881

@@ -886,53 +890,11 @@ body {
886890
flex: 1;
887891
}
888892

893+
.login-section .card-message h1,
889894
.login-error-card .card-message h1 {
890895
text-align: center;
891896
}
892897

893-
#serviceui {
894-
background-color: transparent;
895-
}
896-
897-
.service-ui {
898-
margin-top: 1rem!important;
899-
margin-bottom: 1rem!important;
900-
}
901-
902-
.service-ui .service-ui-logo {
903-
max-height: 56px;
904-
max-width: 360px;
905-
}
906-
907-
.service-ui .service-ui-logo-branded {
908-
max-height: 48px;
909-
max-width: 360px;
910-
}
911-
912-
.service-ui .osf-shield-with-name {
913-
margin: 0 auto;
914-
padding-bottom: 1rem;
915-
}
916-
917-
.osf-shield-with-name .service-ui-logo {
918-
padding-right: 0.5rem;
919-
}
920-
921-
.osf-shield-with-name .service-ui-logo-branded {
922-
padding-right: 1rem;
923-
}
924-
925-
.osf-shield-with-name .service-ui-name {
926-
font-size: 2.25rem;
927-
font-weight: bold;
928-
}
929-
930-
.osf-shield-with-name .service-ui-name-branded {
931-
font-size: 2rem;
932-
font-weight: normal;
933-
overflow-wrap: anywhere;
934-
}
935-
936898
.text-with-mdi,
937899
.text-without-mdi {
938900
font-size: 1rem;
@@ -1011,7 +973,8 @@ body {
1011973
font-size: 1rem;
1012974
}
1013975

1014-
.login-error-card .pre-formatted-small pre {
976+
.login-error-card .pre-formatted-small pre,
977+
.login-section .card-message .pre-formatted-small pre {
1015978
font-size: 0.75rem;
1016979
white-space: pre-wrap;
1017980
}
@@ -1041,8 +1004,11 @@ body {
10411004
}
10421005

10431006
.login-error-card #errorInfo,
1044-
.login-error-card #authnAttr {
1007+
.login-error-card #authnAttr,
1008+
.login-error-card .text-with-border,
1009+
.login-section .text-with-border {
10451010
margin-top: 1rem;
1011+
margin-bottom: 1rem;
10461012
padding: 0 1rem;
10471013
border: solid #e7e7e7;
10481014
}
@@ -1137,11 +1103,6 @@ body {
11371103
.mdc-top-app-bar__row .mdc-button {
11381104
}
11391105

1140-
.service-ui {
1141-
margin-top: 1rem!important;
1142-
margin-bottom: 1rem!important;
1143-
}
1144-
11451106
.cas-footer-osf {
11461107
font-size: 1.125rem!important;
11471108
padding-bottom: 1.125rem!important;
@@ -1168,11 +1129,6 @@ body {
11681129
padding-top: 48px;
11691130
}
11701131

1171-
.service-ui {
1172-
margin-top: 0.875rem!important;
1173-
margin-bottom: 0.875rem!important;
1174-
}
1175-
11761132
.cas-footer-osf {
11771133
font-size: 1rem!important;
11781134
padding-bottom: 1rem!important;
@@ -1199,11 +1155,6 @@ body {
11991155
padding-top: 36px;
12001156
}
12011157

1202-
.service-ui {
1203-
margin-top: 0.75rem!important;
1204-
margin-bottom: 0.75rem!important;
1205-
}
1206-
12071158
.cas-footer-osf {
12081159
font-size: 0.875rem!important;
12091160
padding-bottom: 0.875rem!important;
@@ -1230,11 +1181,6 @@ body {
12301181
padding-top: 24px;
12311182
}
12321183

1233-
.service-ui {
1234-
margin-top: 0.5rem!important;
1235-
margin-bottom: 0.5rem!important;
1236-
}
1237-
12381184
.cas-footer-osf {
12391185
font-size: 0.625rem!important;
12401186
padding-bottom: 0.625rem!important;
@@ -1250,16 +1196,11 @@ body {
12501196
.w-card-wide {
12511197
width: 75%;
12521198
}
1253-
1254-
.service-ui .service-ui-logo {
1255-
max-width: 320px;
1256-
}
12571199
}
12581200

12591201
@media all and (max-width: 699.99px) {
12601202

1261-
.mdc-top-app-bar__row .hidden-narrow,
1262-
.service-ui-name .osf-shield-with-name .hidden-narrow {
1203+
.mdc-top-app-bar__row .hidden-narrow {
12631204
display: None;
12641205
}
12651206

@@ -1269,22 +1210,6 @@ body {
12691210
.w-card-wide {
12701211
width: 100%;
12711212
}
1272-
1273-
.service-ui .service-ui-logo {
1274-
max-width: 280px;
1275-
}
1276-
1277-
.osf-shield-with-name .service-ui-logo {
1278-
max-height: 48px;
1279-
}
1280-
1281-
.osf-shield-with-name .service-ui-name {
1282-
font-size: 2rem;
1283-
}
1284-
1285-
.osf-shield-with-name .service-ui-name-branded {
1286-
font-size: 1.75rem;
1287-
}
12881213
}
12891214

12901215
@media all and (max-width: 511.99px) {
@@ -1317,22 +1242,6 @@ body {
13171242

13181243
@media all and (max-width: 399.99px) {
13191244

1320-
.service-ui .service-ui-logo {
1321-
max-width: 240px;
1322-
}
1323-
1324-
.osf-shield-with-name .service-ui-logo {
1325-
max-height: 36px;
1326-
}
1327-
1328-
.osf-shield-with-name .service-ui-name {
1329-
font-size: 1.75rem;
1330-
}
1331-
1332-
.osf-shield-with-name .service-ui-name-branded {
1333-
font-size: 1.5rem;
1334-
}
1335-
13361245
.login-section .mdi-before-text,
13371246
.login-error-card .mdi-before-text {
13381247
display: none;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
<div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content w-lg-30">
1616
<section class="login-error-card">
17-
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical title">
18-
<span th:utext="#{screen.generic.loginsuccess.tips}"></span>
19-
</section>
20-
<hr class="my-4" />
2117
<section class="card-message">
2218
<h1 th:utext="#{screen.generic.loginsuccess.heading}"></h1>
2319
<div th:utext="#{screen.generic.loginsuccess.message}"></div>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
<div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content w-lg-30">
1616
<section class="login-error-card">
17-
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical title">
18-
<span th:utext="#{screen.generic.logoutsuccess.tips}"></span>
19-
</section>
20-
<hr class="my-4" />
2117
<section class="card-message">
2218
<h1 th:utext="#{screen.generic.logoutsuccess.heading}"></h1>
2319
<div th:utext="#{screen.generic.logoutsuccess.message}"></div>

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,13 @@
1414

1515
<div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content w-lg-30">
1616
<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" />
2617
<section class="card-message">
2718
<h1 th:utext="#{screen.oauth.error.heading}"></h1>
2819
<p th:utext="#{${errorMsg}}"></p>
29-
<p class="pre-formatted-small word-break-all">
20+
<h2 th:text="#{screen.oauth.error.detail}" />
21+
<section class="text-with-border pre-formatted-small word-break-all">
3022
<pre class="wrap" th:utext="#{${errorCode + ': ' + errorParam}}"></pre>
31-
</p>
23+
</section>
3224
</section>
3325
<hr class="my-4" />
3426
<section class="text-with-mdi">

‎src/main/resources/templates/fragments/loginform.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
<!-- Login form template begins here -->
1717
<div th:fragment="loginform" class="d-flex flex-column justify-content-between m-auto">
1818

19-
<section th:if="${delegatedAuthenticationProviderPrimary == null}">
20-
<div class="service-ui" th:replace="fragments/serviceui :: serviceUI">
21-
<a href="fragments/serviceui.html"></a>
22-
</div>
23-
</section>
24-
2519
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical">
2620
<span th:utext="#{screen.welcome.tips}"></span>
2721
</section>

‎src/main/resources/templates/fragments/osfbannerui.html‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/main/resources/templates/fragments/serviceui.html‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/main/resources/templates/fragments/totploginform.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
<!-- Two-factor authentication login form template begins here -->
1717
<div th:fragment="totploginform" class="d-flex flex-column justify-content-between m-auto">
1818

19-
<section>
20-
<div class="service-ui" th:replace="fragments/osfbannerui :: osfBannerUI">
21-
<a href="fragments/osfbannerui.html"></a>
22-
</div>
23-
</section>
24-
2519
<section class="text-without-mdi text-center text-bold text-large margin-large-vertical">
2620
<span th:utext="#{screen.twofactor.tips.top}"></span>
2721
</section>

0 commit comments

Comments
 (0)