supaapps-auth 2.0.0-rc.4 → 2.0.0-rc.6

package/dist/AuthManager.d.ts

@@ -1,4 +1,4 @@
-import { AuthManagerEvent } from './types';
+import { AuthManagerEvent, UserTokenPayload } from './types';
 export declare class AuthManager {
     private static instance;
     private authServer;
@@ -21,6 +21,6 @@ export declare class AuthManager {
     private saveTokens;
     loginUsingPkce(code: string): Promise<void>;
     logout(): Promise<void>;
-    static validateToken(authServer: string, bearerToken: string): Promise<boolean>;
+    static validateToken(authServer: string, bearerToken: string): Promise<UserTokenPayload>;
     static resetInstance(): void;
 }

package/dist/AuthManager.js

@@ -90,7 +90,7 @@ class AuthManager {
     checkAccessToken() {
         return __awaiter(this, arguments, void 0, function* (isInitilization = false) {
             const accessToken = localStorage.getItem('access_token');
-            if (accessToken || this.isTokenExpired(accessToken)) {
+            if (accessToken && this.isTokenExpired(accessToken)) {
                 return this.refreshAccessToken(isInitilization);
             }
             return accessToken;
@@ -192,23 +192,34 @@ class AuthManager {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             // @todo tests missing for this static validation
-            try {
-                const decodedToken = (_a = (0, jsonwebtoken_1.decode)(bearerToken, {
-                    complete: true,
-                })) === null || _a === void 0 ? void 0 : _a.payload;
-                if (!decodedToken) {
-                    return false;
-                }
-                const { data: publicKey } = yield axios_1.default.get(`${authServer}public/public_key`);
-                const { data: algo } = yield axios_1.default.get(`${authServer}public/algo`);
-                (0, jsonwebtoken_1.verify)(bearerToken, publicKey, { algorithms: [algo] });
-                const { data: revokedIds } = yield axios_1.default.get(`${authServer}public/revoked_ids`);
-                // eslint-disable-next-line @typescript-eslint/dot-notation
-                return !revokedIds.includes(decodedToken['id']);
+            // @todo add caching for public key and algo
+            const decodedToken = (_a = (0, jsonwebtoken_1.decode)(bearerToken, {
+                complete: true,
+            })) === null || _a === void 0 ? void 0 : _a.payload;
+            if (!decodedToken) {
+                throw new Error('Not a valid jwt token');
             }
-            catch (error) {
-                return false;
+            const userToken = {
+                id: decodedToken['id'],
+                iss: decodedToken['iss'],
+                sub: parseInt(decodedToken['sub']),
+                first_name: decodedToken['first_name'],
+                last_name: decodedToken['last_name'],
+                email: decodedToken['email'],
+                aud: decodedToken['aud'],
+                iat: decodedToken['iat'],
+                exp: decodedToken['exp'],
+                scopes: decodedToken['scopes'],
+                realm: decodedToken['realm'],
+            };
+            const { data: publicKey } = yield axios_1.default.get(`${authServer}public/public_key`);
+            const { data: algo } = yield axios_1.default.get(`${authServer}public/algo`);
+            (0, jsonwebtoken_1.verify)(bearerToken, publicKey, { algorithms: [algo] });
+            const { data: revokedIds } = yield axios_1.default.get(`${authServer}public/revoked_ids`);
+            if (revokedIds.includes(decodedToken['id'])) {
+                throw new Error('Token is revoked');
             }
+            return userToken;
         });
     }
     static resetInstance() {

package/dist/types.d.ts

@@ -18,6 +18,7 @@ export interface UserTokenPayload {
     iat: number;
     exp: number;
     scopes: string;
+    realm: string;
 }
 export interface AuthManagerEvent {
     type: AuthEventType;

package/package.json

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

package/src/AuthManager.ts

@@ -124,7 +124,7 @@ export class AuthManager {
 
   public async checkAccessToken(isInitilization: boolean = false): Promise<string> {
     const accessToken = localStorage.getItem('access_token');
-    if (accessToken || this.isTokenExpired(accessToken)) {
+    if (accessToken && this.isTokenExpired(accessToken)) {
       return this.refreshAccessToken(isInitilization);
     }
     return accessToken;
@@ -230,34 +230,47 @@ export class AuthManager {
   public static async validateToken(
     authServer: string,
     bearerToken: string,
-  ): Promise<boolean> {
+  ): Promise<UserTokenPayload> {
     // @todo tests missing for this static validation
-    try {
-      const decodedToken = jwtDecode(bearerToken, {
-        complete: true,
-      })?.payload;
+    // @todo add caching for public key and algo
+    const decodedToken = jwtDecode(bearerToken, {
+      complete: true,
+    })?.payload;
 
-      if (!decodedToken) {
-        return false;
-      }
+    if (!decodedToken) {
+      throw new Error('Not a valid jwt token');
+    }
 
-      const { data: publicKey } = await axios.get(
-        `${authServer}public/public_key`,
-      );
-      const { data: algo } = await axios.get(
-        `${authServer}public/algo`,
-      );
+    const userToken: UserTokenPayload = {
+        id: decodedToken['id'],
+        iss: decodedToken['iss'],
+        sub: parseInt(decodedToken['sub'] as string),
+        first_name: decodedToken['first_name'],
+        last_name: decodedToken['last_name'],
+        email: decodedToken['email'],
+        aud: decodedToken['aud'],
+        iat: decodedToken['iat'],
+        exp: decodedToken['exp'],
+        scopes: decodedToken['scopes'],
+        realm: decodedToken['realm'],
+    }
 
-      jwtVerify(bearerToken, publicKey, { algorithms: [algo] });
+    const { data: publicKey } = await axios.get(
+      `${authServer}public/public_key`,
+    );
+    const { data: algo } = await axios.get(
+      `${authServer}public/algo`,
+    );
 
-      const { data: revokedIds } = await axios.get(
-        `${authServer}public/revoked_ids`,
-      );
-      // eslint-disable-next-line @typescript-eslint/dot-notation
-      return !revokedIds.includes(decodedToken['id']);
-    } catch (error) {
-      return false;
+    jwtVerify(bearerToken, publicKey, { algorithms: [algo] });
+
+    const { data: revokedIds } = await axios.get(
+      `${authServer}public/revoked_ids`,
+    );
+    if(revokedIds.includes(decodedToken['id'])){
+      throw new Error('Token is revoked');
     }
+    return userToken;
   }
 
   public static resetInstance(): void {

package/src/types.ts

@@ -20,6 +20,7 @@ export interface UserTokenPayload {
     iat: number;
     exp: number;
     scopes: string;
+    realm: string;
 }
 
 export interface AuthManagerEvent {

package/tests/AuthManager.test.ts

@@ -12,7 +12,12 @@ const tokenThatWontExpire2 = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxM
 const tokenThatExpired = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwiZmlyc3RfbmFtZSI6IkpvaG4gRG9lIiwibGFzdF9uYW1lIjoiRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJzY29wZXMiOiIvcm9vdC8qIiwiZXhwIjo1MDAsImlkIjoyLCJpc3MiOjEyMywiYXVkIjoidGVzdGluZyJ9.ungpbhHfCM5ZP5oiZ1RnMkJ-NKJI8s3_IPJptjyKHR4';
 
 
+
+
 describe('AuthManager Tests', () => {
+    beforeAll(() => {
+      jest.spyOn(localStorage, 'getItem');
+    });
 
     beforeEach(() => {
         localStorage.clear();  // Clear localStorage before each test
@@ -72,6 +77,26 @@ describe('AuthManager Tests', () => {
     });
   
 
+    describe('AuthManager Tests isolated ', () => {
+      it('doesn\'t refresh access token when its not expired', async () => {
+        const stateChange = jest.fn();
+        
+
+        // check that we set localstorage correct
+        localStorage.setItem('access_token', tokenThatWontExpire1);
+        localStorage.setItem('refresh_token', 'mockRefreshToken');
+    
+        const manager = AuthManager.initialize('http://auth-server.com/', 'example-realm', 'http://myapp.com/callback', stateChange);
+
+        const currentCallCount = (localStorage.getItem as jest.Mock).mock.calls.length;
+
+        const token = await manager.getAccessToken();
+    
+        expect(localStorage.getItem).toHaveBeenCalledTimes(currentCallCount + 1);
+    
+      });
+    });
+    
     it('throws an error when no refresh token is found', async () => {
       localStorage.removeItem('refresh_token');
 
@@ -125,4 +150,4 @@ describe('AuthManager Tests', () => {
 
   
   
-});
+});