Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Refresh & document OIDC support (#363) #367

Merged
merged 1 commit into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
/* avRegistration */
@import "avRegistration/login-controller/login-controller.less";
@import "avRegistration/login-directive/login-directive.less";
@import "avRegistration/openid-connect-directive/openid-connect-directive.less";
@import "avRegistration/register-directive/register-directive.less";
@import "avRegistration/field-directive/field-directive.less";
@import "avRegistration/fields/email-field-directive/email-field-directive.less";
Expand Down
6 changes: 1 addition & 5 deletions avRegistration/login-controller/login-controller.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@
with-code="{{withCode}}"
username="{{username}}"
is-otl="{{isOtl}}"
is-open-id="{{isOpenId}}"
otl-secret="{{otlSecret}}"
with-alt-method="{{withAltMethod}}"
selected-alt-method="{{selectedAltMethod}}"
ng-if="!isOpenId"
>
</div>
<div
av-openid-connect
ng-if="isOpenId">
</div>
</div>
</div>
54 changes: 35 additions & 19 deletions avRegistration/login-directive/login-directive.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<div class="container-login">
<div class="container-login" ng-if="!isOpenId">
<div class="row">
<div class="col-sm-12 loginheader">
<h3
class="tex-center login-header-text"
ng-if="!isAdmin && !isOtl && !isCensusQuery && method !== 'openid-connect'"
ng-if="!isAdmin && !isOtl && !isCensusQuery"
ng-i18next="[i18next]({name: orgName})avRegistration.loginHeader">
</h3>
<h3
class="tex-center login-header-text"
ng-if="isAdmin && !isOtl"
ng-i18next="[i18next]avRegistration.adminLoginHeader">
</h3>
<h3
class="tex-center login-header-text"
ng-if="!isCensusQuery && method === 'openid-connect'"
ng-i18next="[i18next]avRegistration.loginButton">
</h3>
<h3
class="tex-center login-header-text"
ng-if="!!isCensusQuery"
Expand Down Expand Up @@ -82,8 +77,8 @@
class="error text-danger"
role="alert"
ng-if="error"
ng-bind-html="error"
></div>
ng-i18next
>[html:i18next]({{errorData}}){{error}}</div>
</div>
<div class="input-warn">
<div class="warn-box" ng-if="!form.$valid || sendingData" >
Expand Down Expand Up @@ -209,20 +204,41 @@
</p>
</div>

<div class="col-sm-12 text-center" ng-if="method === 'openid-connect'">
<span ng-repeat="provider in openIDConnectProviders">
<a
<div class="col-sm-12 text-center oidc-section" ng-if="method === 'openid-connect'">
<p
class="oidc-login-description"
ng-i18next="[html]avRegistration.openidLoginDescription"
></p>
<span
ng-repeat="provider in current_oidc_providers"
class="provider-span"
>
<button
ng-click="openidConnectAuth(provider)"
alt="{{provider.description}}"
class="btn btn-lg btn-primary btn-login">
alt="{{provider.public_info.description}}"
tabindex="0"
class="btn btn-block btn-lg btn-success-action provider-btn"
ng-class="{[provider.public_info.id]: true}"
>
<img
ng-if="!!provider.icon"
alt="{{provider.description}}"
ng-if="!!provider.public_info.icon"
alt="{{provider.public_info.description}}"
class="logo-img"
ng-src="{{provider.icon}}" />
{{provider.title}}
</a>
ng-src="{{provider.public_info.icon}}"
/>
{{provider.public_info.title}}
</button>
</span>
<div class="button-group">
<div class="input-error">
<div
class="error text-danger"
role="alert"
ng-if="error"
ng-i18next
>[html:i18next]({{errorData}}){{error}}</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
Loading
Loading