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.

Sign up for GitHub

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

Add Login for OIDC client #9408

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Add Login for OIDC client #9408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
119 changes: 72 additions & 47 deletions src/auth/FormElement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,15 @@ export default class GmfAuthForm extends GmfBaseElement {
@state() private allowPasswordReset = false;
@state() private changingPassword = false;
@state() private userMustChangeItsPassword = false;
@state() private openIdConnectUrl = '';
@state() private error = false;
@state() private otpImage = '';
@state() private gmfUser: User = null;
@state() private customCSS_ = '';
private changingPasswordUsername_ = '';
private initialApplicationUrl = window.location.href;
private currentApplicationUrl = window.location.href;
private openIdConnectBaseUrl = '';

connectedCallback(): void {
super.connectedCallback();
Expand All @@ -73,13 +77,21 @@ export default class GmfAuthForm extends GmfBaseElement {
}
},
}),

user.getLoginMessage().subscribe({
next: (message: string) => {
this.loginInfoMessage = message;
this._updateOpenIdConnectUrl();
},
}),
);

window.addEventListener('popstate', () => {
this.currentApplicationUrl = window.location.href;
this._updateOpenIdConnectUrl();
});
this._updateOpenIdConnectUrl();

// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
const loginField = document.body.querySelector('input[slot=gmf-auth-login]') as HTMLInputElement;
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
Expand All @@ -97,11 +109,20 @@ export default class GmfAuthForm extends GmfBaseElement {
});
}

_updateOpenIdConnectUrl(): void {
const applicationUrl = this.loginInfoMessage ? this.currentApplicationUrl : this.initialApplicationUrl;
const params = new URLSearchParams({
came_from: applicationUrl,
});
this.openIdConnectUrl = `${this.openIdConnectBaseUrl}?${params.toString()}`;
}

// override default initConfig
initConfig(configuration: Configuration): void {
this.twoFactorAuth = configuration.gmfTwoFactorAuth;
this.allowPasswordChange = configuration.gmfAuthenticationConfig.allowPasswordChange;
this.allowPasswordReset = configuration.gmfAuthenticationConfig.allowPasswordReset;
this.openIdConnectBaseUrl = configuration.gmfOidcLoginUrl;
if (configuration.gmfCustomCSS && configuration.gmfCustomCSS.authentication !== undefined) {
this.customCSS_ = configuration.gmfCustomCSS.authentication;
}
Expand Down Expand Up @@ -167,7 +188,7 @@ export default class GmfAuthForm extends GmfBaseElement {
</div>
<div class="form-group">
<input
?hidden="${!this.allowPasswordChange}"
?hidden="${!(this.allowPasswordChange && this.gmfUser.login_type !== 'oidc')}"
type="button"
class="form-control btn btn-default"
value=${i18next.t('Change password')}
Expand Down Expand Up @@ -195,53 +216,57 @@ export default class GmfAuthForm extends GmfBaseElement {
`
: ''}
${this.gmfUser.username === null && !this.changingPassword
? html`
<div>
<form name="loginForm" role="form" @submit=${(evt: Event) => this.login(evt)}>
<div class="form-group">
<slot name="gmf-auth-login"></slot>
</div>
<div class="form-group">
<slot name="gmf-auth-password"></slot>
</div>
${this.twoFactorAuth
? html`
<div class="form-group">
${i18next.t('The following field should be kept empty on first login:')}
<input
type="text"
class="form-control"
name="otp"
autocomplete="one-time-code"
placeholder=${i18next.t('Authentication code')}
/>
</div>
`
: ''}
<div class="form-group">
<input type="submit" class="form-control btn prime" value=${i18next.t('Connect')} />
</div>
${this.isLoading
? html`
<div class="login-spinner">
<i class="fa fa-spin">${svgSpinner()}</i>
</div>
`
? this.gmfUser.login_type === 'oidc'
? html`<a class="btn prime form-control" role="button" href="${this.openIdConnectUrl}"
>${i18next.t('Connect')}</a
>`
: html`
<div>
<form name="loginForm" role="form" @submit=${(evt: Event) => this.login(evt)}>
<div class="form-group">
<slot name="gmf-auth-login"></slot>
</div>
<div class="form-group">
<slot name="gmf-auth-password"></slot>
</div>
${this.twoFactorAuth
? html`
<div class="form-group">
${i18next.t('The following field should be kept empty on first login:')}
<input
type="text"
class="form-control"
name="otp"
autocomplete="one-time-code"
placeholder=${i18next.t('Authentication code')}
/>
</div>
`
: ''}
<div class="form-group">
<input type="submit" class="form-control btn prime" value=${i18next.t('Connect')} />
</div>
${this.isLoading
? html`
<div class="login-spinner">
<i class="fa fa-spin">${svgSpinner()}</i>
</div>
`
: ''}
<div ?hidden="${!this.allowPasswordReset}" class="form-group">
<a @click=${(evt: Event) => this.resetPassword(evt)} href=""
>${i18next.t('Password forgotten?')}</a
>
</div>
</form>

${this.resetPasswordShown
? html` <div class="alert alert-info">
${i18next.t('A new password has just been sent to you by e-mail.')}
</div>`
: ''}
<div ?hidden="${!this.allowPasswordReset}" class="form-group">
<a @click=${(evt: Event) => this.resetPassword(evt)} href=""
>${i18next.t('Password forgotten?')}</a
>
</div>
</form>

${this.resetPasswordShown
? html` <div class="alert alert-info">
${i18next.t('A new password has just been sent to you by e-mail.')}
</div>`
: ''}
</div>
`
</div>
`
: ''}
${this.changingPassword
? html`
Expand Down
13 changes: 13 additions & 0 deletions src/auth/component.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,19 @@ const login = user.getEmptyUserProperties();
login.username = 'George';
WithUser.args.user = login;

export const EmptyOidc: any = Template.bind({});
EmptyOidc.args = {...defaultProperties};
const loginEmptyOidc = user.getEmptyUserProperties();
loginEmptyOidc.login_type = 'oidc';
EmptyOidc.args.user = loginEmptyOidc;

export const WithUserOidc: any = Template.bind({});
WithUserOidc.args = {...defaultProperties};
const loginOidc = user.getEmptyUserProperties();
loginOidc.login_type = 'oidc';
loginOidc.username = 'George OIDC';
WithUserOidc.args.user = loginOidc;

/**
* @returns The HTML of the story
*/
Expand Down
1 change: 1 addition & 0 deletions srcapi/store/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,6 +1471,7 @@ export type Configuration = {
gmfI18nextConfiguration: InitOptions;
pytreeLidarprofileJsonUrl: pytreeLidarprofileJsonUrl;
gmfDatasourceOptions: gmfDatasourceOptions;
gmfOidcLoginUrl: string;
};

export type APIConfig = {
Expand Down
24 changes: 15 additions & 9 deletions srcapi/store/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ export interface User {
* The two-factor authentication secret on first login
*/
two_factor_totp_secret: string;
/**
* The server-side login type (oidc or local)
*/
login_type?: string;
}

export enum UserState {
Expand Down Expand Up @@ -203,15 +207,17 @@ export class UserModel {
*/
getEmptyUserProperties(): User {
return {
email: null,
is_intranet: null,
functionalities: null,
is_password_changed: null,
roles: null,
username: null,
otp_key: null,
otp_uri: null,
two_factor_totp_secret: null,
...{
email: null,
is_intranet: null,
functionalities: null,
is_password_changed: null,
roles: null,
username: null,
otp_key: null,
otp_uri: null,
two_factor_totp_secret: null,
},
};
}

Expand Down
Loading