[AAE-12521] allow to set the preventClearHashAfterLogin value by forR…

…oot method to choose if clear hash fragment after the lib read the token
Alfresco · Jan 18, 2024 · 7c8b9eb · 7c8b9eb
1 parent 503ec42
commit 7c8b9eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/core/src/lib/auth/oidc/auth-config.ts b/lib/core/src/lib/auth/oidc/auth-config.ts
@@ -19,6 +19,7 @@ import { InjectionToken } from '@angular/core';
 
 export interface AuthModuleConfig {
     readonly useHash: boolean;
+    preventClearHashAfterLogin?: boolean;
 }
 
 export const AUTH_MODULE_CONFIG = new InjectionToken<AuthModuleConfig>('AUTH_MODULE_CONFIG');
diff --git a/lib/core/src/lib/auth/oidc/auth.module.ts b/lib/core/src/lib/auth/oidc/auth.module.ts
@@ -65,6 +65,7 @@ export function loginFactory(oAuthService: OAuthService, storage: OAuthStorage,
 })
 export class AuthModule {
     static forRoot(config: AuthModuleConfig = { useHash: false }): ModuleWithProviders<AuthModule> {
+        config.preventClearHashAfterLogin = config.preventClearHashAfterLogin ?? true;
         return {
             ngModule: AuthModule,
             providers: [{ provide: AUTH_MODULE_CONFIG, useValue: config }]

diff --git a/lib/core/src/lib/auth/oidc/redirect-auth.service.ts b/lib/core/src/lib/auth/oidc/redirect-auth.service.ts
@@ -15,18 +15,21 @@
  * limitations under the License.
  */
 
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, inject } from '@angular/core';
 import { AuthConfig, AUTH_CONFIG, OAuthErrorEvent, OAuthService, OAuthStorage, TokenResponse, LoginOptions } from 'angular-oauth2-oidc';
 import { JwksValidationHandler } from 'angular-oauth2-oidc-jwks';
 import { from, Observable } from 'rxjs';
 import { distinctUntilChanged, filter, map, shareReplay } from 'rxjs/operators';
 import { AuthService } from './auth.service';
+import { AUTH_MODULE_CONFIG, AuthModuleConfig } from './auth-config';
 
 const isPromise = <T>(value: T | Promise<T>): value is Promise<T> => value && typeof (value as Promise<T>).then === 'function';
 
 @Injectable()
 export class RedirectAuthService extends AuthService {
 
+  readonly authModuleConfig: AuthModuleConfig = inject(AUTH_MODULE_CONFIG);
+
   onLogin: Observable<any>;
 
   private _loadDiscoveryDocumentPromise = Promise.resolve(false);
@@ -129,7 +132,7 @@ export class RedirectAuthService extends AuthService {
 
   async loginCallback(loginOptions?: LoginOptions): Promise<string | undefined> {
     return this.ensureDiscoveryDocument()
-      .then(() => this.oauthService.tryLogin({ ...loginOptions, preventClearHashAfterLogin: true }))
+      .then(() => this.oauthService.tryLogin({ ...loginOptions, preventClearHashAfterLogin: this.authModuleConfig.preventClearHashAfterLogin }))
       .then(() => this._getRedirectUrl());
   }