fix(console): update dependencies, force reauth on invalid token (#2267)

* fix: update oidc lib, force reauth * chore(console): deps (#2302) * cli core * cdk material * chore(deps-dev): bump @types/node from 15.12.2 to 16.7.6 in /console (#2284) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.12.2 to 16.7.6. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump ts-node from 10.2.0 to 10.2.1 in /console (#2252) Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.2.0 to 10.2.1. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v10.2.0...v10.2.1) --- updated-dependencies: - dependency-name: ts-node dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * audit fix Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-11-03 21:02:15 +00:00 · 2021-09-14 07:04:14 +00:00
parent 490cafa538
commit 33a2054be9
4 changed files with 1169 additions and 1844 deletions
@@ -5,62 +5,62 @@ import { BehaviorSubject, from, Observable } from 'rxjs';
 import { StatehandlerService } from './statehandler.service';

@Injectable({
-    providedIn: 'root',
+  providedIn: 'root',
 })
 export class AuthenticationService {
-    private authConfig!: AuthConfig;
-    private _authenticated: boolean = false;
-    private readonly _authenticationChanged: BehaviorSubject<
-        boolean
-    > = new BehaviorSubject(this.authenticated);
+  private authConfig!: AuthConfig;
+  private _authenticated: boolean = false;
+  private readonly _authenticationChanged: BehaviorSubject<
+    boolean
+  > = new BehaviorSubject(this.authenticated);

-    constructor(
-        private oauthService: OAuthService,
-        private statehandler: StatehandlerService,
-    ) { }
+  constructor(
+    private oauthService: OAuthService,
+    private statehandler: StatehandlerService,
+  ) { }

-    public initConfig(data: AuthConfig): void {
-        this.authConfig = data;
+  public initConfig(data: AuthConfig): void {
+    this.authConfig = data;
+  }
+
+  public get authenticated(): boolean {
+    return this._authenticated;
+  }
+
+  public get authenticationChanged(): Observable<boolean> {
+    return this._authenticationChanged;
+  }
+
+  public getOIDCUser(): Observable<any> {
+    return from(this.oauthService.loadUserProfile());
+  }
+
+  public async authenticate(
+    partialConfig?: Partial<AuthConfig>,
+    force: boolean = false,
+  ): Promise<boolean> {
+    if (partialConfig) {
+      Object.assign(this.authConfig, partialConfig);
    }
+    this.oauthService.configure(this.authConfig);

-    public get authenticated(): boolean {
-        return this._authenticated;
+    this.oauthService.strictDiscoveryDocumentValidation = false;
+    await this.oauthService.loadDiscoveryDocumentAndTryLogin();
+
+    this._authenticated = this.oauthService.hasValidAccessToken();
+    if (!this.oauthService.hasValidIdToken() || !this.authenticated || partialConfig || force) {
+      const newState = await this.statehandler.createState().toPromise();
+      this.oauthService.initCodeFlow(newState);
    }
+    this._authenticationChanged.next(this.authenticated);

-    public get authenticationChanged(): Observable<boolean> {
-        return this._authenticationChanged;
-    }
+    return this.authenticated;
+  }

-    public getOIDCUser(): Observable<any> {
-        return from(this.oauthService.loadUserProfile());
-    }
-
-    public async authenticate(
-        partialConfig?: Partial<AuthConfig>,
-    ): Promise<boolean> {
-        if (partialConfig) {
-            Object.assign(this.authConfig, partialConfig);
-        }
-        this.oauthService.configure(this.authConfig);
-
-        this.oauthService.strictDiscoveryDocumentValidation = false;
-        await this.oauthService.loadDiscoveryDocumentAndTryLogin();
-
-        this._authenticated = this.oauthService.hasValidAccessToken();
-
-        if (!this.oauthService.hasValidIdToken() || !this.authenticated || partialConfig) {
-            const newState = await this.statehandler.createState().toPromise();
-            this.oauthService.initCodeFlow(newState);
-        }
-        this._authenticationChanged.next(this.authenticated);
-
-        return this.authenticated;
-    }
-
-    public signout(): void {
-        this.oauthService.logOut();
-        this._authenticated = false;
-        this._authenticationChanged.next(false);
-    }
+  public signout(): void {
+    this.oauthService.logOut();
+    this._authenticated = false;
+    this._authenticationChanged.next(false);
+  }
 }