feat: authts#4 reduce usage of any type: session_state is typeof string

kyxyes · Aug 24, 2021 · 5e81347 · 5e81347
1 parent c8973f6
commit 5e81347
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 27 deletions.
diff --git a/src/CheckSessionIFrame.ts b/src/CheckSessionIFrame.ts
@@ -14,7 +14,7 @@ export class CheckSessionIFrame {
     private _frame: HTMLIFrameElement;
     private _boundMessageEvent: ((e: MessageEvent<string>) => void) | null;
     private _timer: number | null;
-    private _session_state: any | null;
+    private _session_state: string | null;
 
     public constructor(callback: () => Promise<void> | void, client_id: string, url: string, interval?: number, stopOnError?: boolean) {
         this._callback = callback;
@@ -37,7 +37,7 @@ export class CheckSessionIFrame {
 
         this._boundMessageEvent = null;
         this._timer = null;
-
+        this._session_state = null;
     }
 
     public load() {
@@ -73,28 +73,30 @@ export class CheckSessionIFrame {
         }
     }
 
-    public start(session_state: any) {
-        if (this._session_state !== session_state) {
-            Log.debug("CheckSessionIFrame.start");
+    public start(session_state: string) {
+        if (this._session_state === session_state) {
+            return;
+        }
 
-            this.stop();
+        Log.debug("CheckSessionIFrame.start");
 
-            this._session_state = session_state;
+        this.stop();
 
-            const send = () => {
-                this._frame.contentWindow &&
+        this._session_state = session_state;
 
-                // session_state is unknown... (could likley not be string)
-                // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
-                this._frame.contentWindow.postMessage(this._client_id + " " + this._session_state, this._frame_origin);
-            };
+        const send = () => {
+            if (!this._frame.contentWindow || !this._session_state) {
+                return;
+            }
 
-            // trigger now
-            send();
+            this._frame.contentWindow.postMessage(this._client_id + " " + this._session_state, this._frame_origin);
+        };
 
-            // and setup timer
-            this._timer = window.setInterval(send, this._interval);
-        }
+        // trigger now
+        send();
+
+        // and setup timer
+        this._timer = window.setInterval(send, this._interval);
     }
 
     public stop() {

diff --git a/src/SessionMonitor.ts b/src/SessionMonitor.ts
@@ -55,7 +55,7 @@ export class SessionMonitor {
     }
 
     protected async _start(user: User | {
-        session_state: any;
+        session_state: string;
             profile: {
                 sub: string;
                 sid: string;

diff --git a/src/SigninResponse.ts b/src/SigninResponse.ts
@@ -8,23 +8,23 @@ const OidcScope = "openid";
 export class SigninResponse {
     public readonly code: string;
 
-    // will be set from ResponseValidator
+    // updated by ResponseValidator
     public state: string | undefined;
 
-    // will be set from ResponseValidator
+    // updated by ResponseValidator
     public error: string | undefined;
     public error_description: string | undefined;
     public error_uri: string | undefined;
 
-    // will be set from ResponseValidator
+    // updated by ResponseValidator
     public id_token: string | undefined;
     public session_state: string | undefined;
     public access_token: string | undefined;
     public token_type: string | undefined;
     public scope: string | undefined;
     public expires_at: number | undefined
 
-    // will be set from ResponseValidator
+    // set by ResponseValidator
     public profile: any |  undefined;
 
     public constructor(url?: string, delimiter = "#") {

diff --git a/src/User.ts b/src/User.ts
@@ -5,13 +5,13 @@ import { Log, Timer } from "./utils";
 
 export class User {
     public id_token: string;
-    public session_state: any;
+    public session_state: string | undefined;
     public access_token: string;
-    public refresh_token: string;
+    public refresh_token: string | undefined;
     public token_type: string;
     public scope: string;
     public profile: any;
-    public state: any;
+    public state: any | undefined;
     public expires_at: number;
 
     public constructor({

diff --git a/src/UserManager.ts b/src/UserManager.ts
@@ -523,7 +523,7 @@ export class UserManager extends OidcClient {
         return true;
     }
 
-    protected async _revokeRefreshTokenInternal(refresh_token: string, required: boolean): Promise<boolean> {
+    protected async _revokeRefreshTokenInternal(refresh_token: string | undefined, required: boolean): Promise<boolean> {
         if (!refresh_token) {
             return false;
         }