supaapps-auth 1.0.3 → 1.0.5

package/dist/AuthManager.d.ts

@@ -3,10 +3,12 @@ export declare class AuthManager {
     private readonly authServer;
     private readonly realmName;
     private readonly redirectUri;
-    constructor(authServer: string, realmName: string, redirectUri: string);
+    private readonly loginCallback;
+    constructor(authServer: string, realmName: string, redirectUri: string, loginCallback: () => void);
     static getInstance<T>(): AuthManager;
     private toBase64Url;
     private generatePKCEPair;
+    mustBeLoggedIn(): Promise<void>;
     getLoginWithGoogleUri(): string;
     isLoggedIn(): Promise<boolean>;
     getAccessToken(): Promise<string>;

package/dist/AuthManager.js

@@ -12,10 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthManager = void 0;
 const crypto_1 = require("crypto");
 class AuthManager {
-    constructor(authServer, realmName, redirectUri) {
+    constructor(authServer, realmName, redirectUri, loginCallback) {
         this.authServer = null;
         this.realmName = null;
         this.redirectUri = null;
+        this.loginCallback = () => { };
         this.toBase64Url = (base64String) => {
             return base64String
                 .replace(/\+/g, '-')
@@ -26,17 +27,18 @@ class AuthManager {
             const NUM_OF_BYTES = 32; // This will generate a verifier of sufficient length
             const HASH_ALG = 'sha256';
             // Generate code verifier
-            const codeVerifier = this.toBase64Url((0, crypto_1.randomBytes)(NUM_OF_BYTES).toString('base64'));
+            const newCodeVerifier = this.toBase64Url((0, crypto_1.randomBytes)(NUM_OF_BYTES).toString('base64'));
             // Generate code challenge
             const hash = (0, crypto_1.createHash)(HASH_ALG)
-                .update(codeVerifier)
+                .update(newCodeVerifier)
                 .digest('base64');
-            const codeChallenge = this.toBase64Url(hash);
-            return { codeVerifier, codeChallenge };
+            const newCodeChallenge = this.toBase64Url(hash);
+            return { newCodeVerifier, newCodeChallenge };
         };
         this.authServer = authServer;
         this.realmName = realmName;
         this.redirectUri = redirectUri;
+        this.loginCallback = loginCallback;
         AuthManager.instance = this;
     }
     static getInstance() {
@@ -45,8 +47,18 @@ class AuthManager {
         }
         return AuthManager.instance;
     }
+    mustBeLoggedIn() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.isLoggedIn())) {
+                this.loginCallback();
+            }
+        });
+    }
     getLoginWithGoogleUri() {
-        const { codeVerifier, codeChallenge } = this.generatePKCEPair();
+        // get or create codeVerifier and codeChallenge from localstorage
+        const { newCodeVerifier, newCodeChallenge } = this.generatePKCEPair();
+        let codeVerifier = localStorage.getItem('codeVerifier') || newCodeVerifier;
+        let codeChallenge = localStorage.getItem('codeChallenge') || newCodeChallenge;
         localStorage.setItem('codeVerifier', codeVerifier);
         localStorage.setItem('codeChallenge', codeChallenge);
         if (this.authServer && this.realmName && this.redirectUri) {
@@ -128,6 +140,8 @@ class AuthManager {
                             }),
                         })
                             .then((response) => {
+                            localStorage.removeItem('codeVerifier');
+                            localStorage.removeItem('codeChallenge');
                             if (response.status !== 200) {
                                 throw new Error('Failed to exchange code for token');
                             }
@@ -139,6 +153,8 @@ class AuthManager {
                             resolve();
                         })
                             .catch((error) => {
+                            localStorage.removeItem('codeVerifier');
+                            localStorage.removeItem('codeChallenge');
                             reject(error);
                         });
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supaapps-auth",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/AuthManager.ts

@@ -9,10 +9,13 @@ export class AuthManager {
     private readonly realmName: string | null = null;
 
     private readonly redirectUri: string | null = null;
-    public constructor(authServer: string, realmName: string, redirectUri: string) {
+    private readonly loginCallback: () => void = () => {};
+
+    public constructor(authServer: string, realmName: string, redirectUri: string, loginCallback: () => void) {
         this.authServer = authServer;
         this.realmName = realmName;
         this.redirectUri = redirectUri;
+        this.loginCallback = loginCallback;
         AuthManager.instance = this;
     }
 
@@ -34,20 +37,29 @@ export class AuthManager {
         const HASH_ALG = 'sha256';
 
         // Generate code verifier
-        const codeVerifier = this.toBase64Url(
+        const newCodeVerifier = this.toBase64Url(
             randomBytes(NUM_OF_BYTES).toString('base64'),
         );
 
         // Generate code challenge
         const hash = createHash(HASH_ALG)
-            .update(codeVerifier)
+            .update(newCodeVerifier)
             .digest('base64');
-        const codeChallenge = this.toBase64Url(hash);
+        const newCodeChallenge = this.toBase64Url(hash);
 
-        return { codeVerifier, codeChallenge };
+        return { newCodeVerifier, newCodeChallenge };
     };
+
+    public async mustBeLoggedIn(): Promise<void> {
+        if (!await this.isLoggedIn()) {
+            this.loginCallback();
+        }
+    }
     public getLoginWithGoogleUri(): string {
-        const { codeVerifier, codeChallenge } = this.generatePKCEPair();
+        // get or create codeVerifier and codeChallenge from localstorage
+        const { newCodeVerifier, newCodeChallenge } = this.generatePKCEPair();
+        let codeVerifier = localStorage.getItem('codeVerifier') || newCodeVerifier;
+        let codeChallenge = localStorage.getItem('codeChallenge') || newCodeChallenge;
         localStorage.setItem('codeVerifier', codeVerifier);
         localStorage.setItem('codeChallenge', codeChallenge);
 
@@ -127,6 +139,8 @@ export class AuthManager {
                         }),
                     })
                         .then((response) => {
+                            localStorage.removeItem('codeVerifier');
+                            localStorage.removeItem('codeChallenge');
                             if (response.status !== 200) {
                                 throw new Error('Failed to exchange code for token');
                             }
@@ -138,6 +152,8 @@ export class AuthManager {
                             resolve();
                         })
                         .catch((error) => {
+                            localStorage.removeItem('codeVerifier');
+                            localStorage.removeItem('codeChallenge');
                             reject(error);
                         });
                 }