supaapps-auth 2.0.0-rc.7 → 2.0.0-rc.8

package/dist/AuthManager.d.ts

@@ -11,15 +11,15 @@ export declare class AuthManager {
     private tokenToPayload;
     private toBase64Url;
     private generatePKCEPair;
-    refreshAccessToken(isInitilization?: boolean): Promise<string>;
+    refreshAccessToken(isInitialization?: boolean): Promise<string>;
     checkAccessToken(isInitilization?: boolean): Promise<string>;
     private isTokenExpired;
     mustBeLoggedIn(): Promise<void>;
     getLoginWithGoogleUri(): string;
     isLoggedIn(): Promise<boolean>;
     getAccessToken(mustBeLoggedIn?: boolean): Promise<string>;
-    verifyEmail(email: string, code: string): Promise<boolean>;
-    doPassReset(email: string, code: string, newPassword: string): Promise<boolean>;
+    verifyEmail(email: string, token: string): Promise<boolean>;
+    doPassReset(email: string, token: string, newPassword: string): Promise<boolean>;
     changeEmail(email: string): Promise<boolean>;
     initPasswordReset(email: string): Promise<boolean>;
     changePassword(oldPassword: string, newPassword: string, email: string): Promise<boolean>;

package/dist/AuthManager.js

@@ -63,7 +63,7 @@ class AuthManager {
         return { verifier, challenge };
     }
     refreshAccessToken() {
-        return __awaiter(this, arguments, void 0, function* (isInitilization = false) {
+        return __awaiter(this, arguments, void 0, function* (isInitialization = false) {
             try {
                 const refreshToken = localStorage.getItem('refresh_token');
                 if (!refreshToken) {
@@ -79,7 +79,7 @@ class AuthManager {
                 console.error(`Refresh token error, logging out: ${error}`);
                 localStorage.removeItem('access_token');
                 localStorage.removeItem('refresh_token');
-                if (!isInitilization) {
+                if (!isInitialization) {
                     // throw refresh fail only if not initialization
                     this.onStateChange({ type: types_1.AuthEventType.REFRESH_FAILED });
                 }
@@ -139,12 +139,12 @@ class AuthManager {
             }
         });
     }
-    verifyEmail(email, code) {
+    verifyEmail(email, token) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield axios_1.default.post(`${this.authServer}auth/email/verify`, {
                 realm_name: this.realmName,
                 email,
-                code,
+                token,
             });
             if (response.data.error || response.data.errors) {
                 throw new Error(response.data.error || response.data.message);
@@ -152,11 +152,13 @@ class AuthManager {
             return response.status === 200;
         });
     }
-    doPassReset(email, code, newPassword) {
+    doPassReset(email, token, newPassword) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield axios_1.default.post(`${this.authServer}auth/email/do_pass_reset`, {
                 realm_name: this.realmName,
                 email,
+                token,
+                new_password: newPassword,
             });
             if (response.data.error || response.data.errors) {
                 throw new Error(response.data.error || response.data.message);
@@ -306,23 +308,23 @@ class AuthManager {
                 throw new Error('Not a valid jwt token');
             }
             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'],
+                id: decodedToken.id,
+                iss: decodedToken.iss,
+                sub: typeof decodedToken.sub === 'string' ? parseInt(decodedToken.sub) : 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'])) {
+            if (revokedIds.includes(decodedToken.id)) {
                 throw new Error('Token is revoked');
             }
             return userToken;

package/dist/types.d.ts

@@ -10,7 +10,7 @@ export declare enum AuthEventType {
 export interface UserTokenPayload {
     id: number;
     iss: string;
-    sub: number;
+    sub: number | string;
     first_name: string;
     last_name: string;
     email: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supaapps-auth",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.0-rc.8",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "axios-mock-adapter": "^1.22.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
     "eslint-config-next": "^13.5.6",

package/src/AuthManager.ts

@@ -95,7 +95,7 @@ export class AuthManager {
     return { verifier, challenge };
   }
 
-  public async refreshAccessToken(isInitilization: boolean = false): Promise<string> {
+  public async refreshAccessToken(isInitialization: boolean = false): Promise<string> {
     try {
       const refreshToken = localStorage.getItem('refresh_token');
       if (!refreshToken) {
@@ -114,7 +114,7 @@ export class AuthManager {
       console.error(`Refresh token error, logging out: ${error}`);
       localStorage.removeItem('access_token');
       localStorage.removeItem('refresh_token');
-      if (!isInitilization) {
+      if (!isInitialization) {
         // throw refresh fail only if not initialization
         this.onStateChange({ type: AuthEventType.REFRESH_FAILED });
       }
@@ -170,13 +170,13 @@ export class AuthManager {
     }
   }
 
-  public async verifyEmail(email: string, code: string): Promise<boolean> {
+  public async verifyEmail(email: string, token: string): Promise<boolean> {
     const response = await axios.post(
       `${this.authServer}auth/email/verify`,
       {
         realm_name: this.realmName,
         email,
-        code,
+        token,
       },
     );
     if (response.data.error || response.data.errors) {
@@ -186,12 +186,14 @@ export class AuthManager {
     return response.status === 200;
   }
 
-  public async doPassReset(email: string, code: string, newPassword: string): Promise<boolean> {
+  public async doPassReset(email: string, token: string, newPassword: string): Promise<boolean> {
     const response = await axios.post(
         `${this.authServer}auth/email/do_pass_reset`,
         {
           realm_name: this.realmName,
           email,
+          token,
+          new_password: newPassword,
         },
     );
     if (response.data.error || response.data.errors) {
@@ -369,24 +371,24 @@ export class AuthManager {
     // @todo add caching for public key and algo
     const decodedToken = jwtDecode(bearerToken, {
       complete: true,
-    })?.payload;
+    })?.payload as unknown as UserTokenPayload;
 
     if (!decodedToken) {
       throw new Error('Not a valid jwt token');
     }
 
     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'],
+        id: decodedToken.id,
+        iss: decodedToken.iss,
+        sub: typeof decodedToken.sub === 'string' ? parseInt(decodedToken.sub) : 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 } = await axios.get(
@@ -401,7 +403,7 @@ export class AuthManager {
     const { data: revokedIds } = await axios.get(
       `${authServer}public/revoked_ids`,
     );
-    if(revokedIds.includes(decodedToken['id'])){
+    if(revokedIds.includes(decodedToken.id)){
       throw new Error('Token is revoked');
     }
     return userToken;

package/src/types.ts

@@ -12,7 +12,7 @@ export enum AuthEventType {
 export interface UserTokenPayload {
     id: number;
     iss: string;
-    sub: number;
+    sub: number | string;
     first_name: string;
     last_name: string;
     email: string;