@openfort/openfort-js 0.7.10 → 0.7.11

package/dist/index.cjs

@@ -1274,6 +1274,9 @@ const AuthenticationApiAxiosParamCreator = function (configuration) {
             const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options };
             const localVarHeaderParameter = {};
             const localVarQueryParameter = {};
+            // authentication pk required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration);
             localVarHeaderParameter['Content-Type'] = 'application/json';
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
@@ -3109,7 +3112,7 @@ var OpenfortErrorType;
     OpenfortErrorType["MISSING_SIGNER_ERROR"] = "MISSING_SIGNER_ERROR";
 })(OpenfortErrorType || (OpenfortErrorType = {}));
 function isAPIError(error) {
-    return 'code' in error && 'message' in error;
+    return 'type' in error && 'message' in error;
 }
 class OpenfortError extends Error {
     type;
@@ -4877,13 +4880,16 @@ class AuthManager {
             return response.data;
         }, OpenfortErrorType.USER_REGISTRATION_ERROR);
     }
-    async validateCredentials() {
+    async validateCredentials(forceRefresh) {
         const jwk = await this.instanceManager.getJWK();
         const accessToken = this.instanceManager.getAccessToken()?.token;
         const refreshToken = this.instanceManager.getRefreshToken();
         if (!accessToken || !refreshToken || !jwk) {
             throw new OpenfortError('Must be logged in to validate and refresh token', OpenfortErrorType.NOT_LOGGED_IN_ERROR);
         }
+        if (forceRefresh) {
+            return this.refreshTokens(refreshToken, forceRefresh);
+        }
         try {
             const key = (await jose.importJWK({
                 kty: jwk.kty,
@@ -4900,23 +4906,27 @@ class AuthManager {
         }
         catch (error) {
             if (error instanceof jose.errors.JWTExpired) {
-                const request = {
-                    refreshTokenRequest: {
-                        refreshToken,
-                    },
-                };
-                return withOpenfortError(async () => {
-                    const newToken = await this.backendApiClients.authenticationApi.refresh(request);
-                    return {
-                        player: newToken.data.player.id,
-                        accessToken: newToken.data.token,
-                        refreshToken: newToken.data.refreshToken,
-                    };
-                }, OpenfortErrorType.REFRESH_TOKEN_ERROR);
+                return this.refreshTokens(refreshToken);
             }
             throw error;
         }
     }
+    async refreshTokens(refreshToken, forceRefresh) {
+        const request = {
+            refreshTokenRequest: {
+                refreshToken,
+                forceRefresh,
+            },
+        };
+        return withOpenfortError(async () => {
+            const response = await this.backendApiClients.authenticationApi.refresh(request);
+            return {
+                player: response.data.player.id,
+                accessToken: response.data.token,
+                refreshToken: response.data.refreshToken,
+            };
+        }, OpenfortErrorType.REFRESH_TOKEN_ERROR);
+    }
     async logout(accessToken, refreshToken) {
         const request = {
             logoutRequest: {
@@ -6408,13 +6418,13 @@ class Openfort {
     /**
      * Validates and refreshes the access token if needed.
      */
-    async validateAndRefreshToken() {
+    async validateAndRefreshToken(forceRefresh) {
         const authType = this.credentialsProvided();
         if (!authType) {
             throw new OpenfortError('Must be logged in to validate and refresh token', OpenfortErrorType.NOT_LOGGED_IN_ERROR);
         }
         if (authType === exports.AuthType.OPENFORT) {
-            const auth = await this.authManager.validateCredentials();
+            const auth = await this.authManager.validateCredentials(forceRefresh);
             this.storeCredentials(auth);
             if (this.signer && this.signer.useCredentials()) {
                 await this.signer.updateAuthentication();

package/dist/index.d.ts

@@ -823,7 +823,7 @@ declare class Openfort {
     /**
      * Validates and refreshes the access token if needed.
      */
-    validateAndRefreshToken(): Promise<void>;
+    validateAndRefreshToken(forceRefresh?: boolean): Promise<void>;
     private credentialsProvided;
     private recoverSigner;
     private waitSigner;

package/dist/index.js

@@ -1251,6 +1251,9 @@ const AuthenticationApiAxiosParamCreator = function (configuration) {
             const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options };
             const localVarHeaderParameter = {};
             const localVarQueryParameter = {};
+            // authentication pk required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration);
             localVarHeaderParameter['Content-Type'] = 'application/json';
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
@@ -3086,7 +3089,7 @@ var OpenfortErrorType;
     OpenfortErrorType["MISSING_SIGNER_ERROR"] = "MISSING_SIGNER_ERROR";
 })(OpenfortErrorType || (OpenfortErrorType = {}));
 function isAPIError(error) {
-    return 'code' in error && 'message' in error;
+    return 'type' in error && 'message' in error;
 }
 class OpenfortError extends Error {
     type;
@@ -4854,13 +4857,16 @@ class AuthManager {
             return response.data;
         }, OpenfortErrorType.USER_REGISTRATION_ERROR);
     }
-    async validateCredentials() {
+    async validateCredentials(forceRefresh) {
         const jwk = await this.instanceManager.getJWK();
         const accessToken = this.instanceManager.getAccessToken()?.token;
         const refreshToken = this.instanceManager.getRefreshToken();
         if (!accessToken || !refreshToken || !jwk) {
             throw new OpenfortError('Must be logged in to validate and refresh token', OpenfortErrorType.NOT_LOGGED_IN_ERROR);
         }
+        if (forceRefresh) {
+            return this.refreshTokens(refreshToken, forceRefresh);
+        }
         try {
             const key = (await importJWK({
                 kty: jwk.kty,
@@ -4877,23 +4883,27 @@ class AuthManager {
         }
         catch (error) {
             if (error instanceof errors.JWTExpired) {
-                const request = {
-                    refreshTokenRequest: {
-                        refreshToken,
-                    },
-                };
-                return withOpenfortError(async () => {
-                    const newToken = await this.backendApiClients.authenticationApi.refresh(request);
-                    return {
-                        player: newToken.data.player.id,
-                        accessToken: newToken.data.token,
-                        refreshToken: newToken.data.refreshToken,
-                    };
-                }, OpenfortErrorType.REFRESH_TOKEN_ERROR);
+                return this.refreshTokens(refreshToken);
             }
             throw error;
         }
     }
+    async refreshTokens(refreshToken, forceRefresh) {
+        const request = {
+            refreshTokenRequest: {
+                refreshToken,
+                forceRefresh,
+            },
+        };
+        return withOpenfortError(async () => {
+            const response = await this.backendApiClients.authenticationApi.refresh(request);
+            return {
+                player: response.data.player.id,
+                accessToken: response.data.token,
+                refreshToken: response.data.refreshToken,
+            };
+        }, OpenfortErrorType.REFRESH_TOKEN_ERROR);
+    }
     async logout(accessToken, refreshToken) {
         const request = {
             logoutRequest: {
@@ -6385,13 +6395,13 @@ class Openfort {
     /**
      * Validates and refreshes the access token if needed.
      */
-    async validateAndRefreshToken() {
+    async validateAndRefreshToken(forceRefresh) {
         const authType = this.credentialsProvided();
         if (!authType) {
             throw new OpenfortError('Must be logged in to validate and refresh token', OpenfortErrorType.NOT_LOGGED_IN_ERROR);
         }
         if (authType === AuthType.OPENFORT) {
-            const auth = await this.authManager.validateCredentials();
+            const auth = await this.authManager.validateCredentials(forceRefresh);
             this.storeCredentials(auth);
             if (this.signer && this.signer.useCredentials()) {
                 await this.signer.updateAuthentication();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfort/openfort-js",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "author": "Openfort (https://www.openfort.xyz)",
   "bugs": "https://github.com/openfort-xyz/openfort-js/issues",
   "repository": "openfort-xyz/openfort-js.git",