npm - @redzone/taunt-logins - Versions diffs - 0.0.8 → 0.0.9 - Mend

@redzone/taunt-logins 0.0.8 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/cjs/index.cjs CHANGED Viewed

@@ -468,28 +468,39 @@ function ErrorFromResponse(response) {
 }
 class TauntApi {
-    async stdPGET(method, url, body, headers = {}) {
-        const response = await this.api.request({
+    async _api(method, url, body, headers = {}) {
+        headers = {
+            "Content-Type": "application/json",
+            Accept: "application/json",
+            ...headers
+        };
+        if (this.accessToken) {
+            headers = {
+                ...headers,
+                Authorization: `Bearer ${this.accessToken}`
+            };
+        }
+        const response = await this._axios.request({
             url,
             method,
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
-                ...headers
-            },
-            data: body ? JSON.stringify(body) : null
+            headers,
+            data: body ? JSON.stringify(body) : null,
+            withCredentials: true
         });
         const data = response.data;
-        if (data.refreshToken) {
+        if (data?.refreshToken) {
             this.refreshToken = data.refreshToken;
         }
+        if (data?.accessToken) {
+            this.accessToken = data.accessToken;
+        }
         return data;
     }
     async post(url, body = {}, headers = {}) {
-        return this.stdPGET("POST", url, body, headers);
+        return this._api("POST", url, body, headers);
     }
     async get(url, headers = {}) {
-        return this.stdPGET("GET", url, undefined, headers);
+        return this._api("GET", url, undefined, headers);
     }
     // this.user = data
     // localStorage.setItem("user", JSON.stringify(data))
@@ -599,15 +610,16 @@ class TauntApi {
     }
     constructor(endpoint){
         this.refreshToken = null;
+        this.accessToken = null;
         this.claimrToken = null;
         this.onError = async (error)=>{
             const originalRequest = error.config;
-            if (error.response.status === 401 && !originalRequest._retry) {
+            if (error.response.status === 401 && !originalRequest._retry && this.refreshToken) {
                 originalRequest._retry = true;
                 console.log("401 - refreshing token");
                 try {
                     const data = await this.refresh();
-                    return this.api(originalRequest);
+                    return this._axios(originalRequest);
                 } catch (error) {
                     console.log("Unable to refresh access token, please log in");
                     this.refreshToken = null;
@@ -626,36 +638,41 @@ class TauntApi {
             });
         this.loginWithWeb3WalletSignature = (props)=>this.post("/v1/auth/login/signature", props);
         this.loginExtWithWeb3WalletSignature = (props)=>this.post("/v1/auth/login/ext-signature", props);
-        this.refresh = (refreshToken)=>this.post(`/v1/auth/token/refresh`, {
-                token: refreshToken || this.refreshToken
+        this.refresh = (refreshToken)=>{
+            const token = refreshToken || this.refreshToken;
+            if (!token) {
+                return Promise.reject(new Error("No refresh token available"));
+            }
+            return this.post(`/v1/auth/token/refresh`, {
+                token
             });
+        };
         // Logout of the backend with access token. Assumes user is currently logged in and has a cookie with the access token
         this.logout = async ()=>{
             // If logging out fails on the backend we'll still remove the user info
-            await this.api.post("/v1/auth/logout");
+            await this.post("/v1/auth/logout");
             await this.writePlayerEvent("player_logged_out");
         };
         this.getClaimrToken = async ()=>{
             if (!this.claimrToken) {
                 const url = "v1/claimr/token";
-                const { data } = await this.api.get(`${url}`);
+                const data = await this.get(`${url}`);
                 this.claimrToken = data.data.token;
             }
             return this.claimrToken;
         };
         this.getClaimrData = async ()=>{
-            const { data } = await this.api.get("/v1/beamable/inventory/skulls");
+            const data = await this.get("/v1/beamable/inventory/skulls");
             return data;
         };
         // Use the cookie stored in the browser to get the user and save user model in state and local storage
         // This assumes that the user is logged to backend in and has a cookie jwt
-        this.getLoggedInUser = ()=>this.api.get("/v1/auth/me");
-        this.api = axios__default.default.create({
-            baseURL: `${endpoint}`,
-            withCredentials: true
+        this.getLoggedInUser = ()=>this.get("/v1/auth/me");
+        this._axios = axios__default.default.create({
+            baseURL: `${endpoint}`
         });
         // Response interceptor for API calls
-        this.api.interceptors.response.use((response)=>response, (error)=>this.onError(error));
+        this._axios.interceptors.response.use((response)=>response, (error)=>this.onError(error));
     }
 }

package/dist/cjs/index.d.cts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { AxiosResponse, AxiosRequestConfig, Method } from 'axios';
+import { AxiosResponse, AxiosRequestConfig } from 'axios';
 import * as magic_sdk from 'magic-sdk';
 import { OAuthRedirectResult, OAuthRedirectError } from '@magic-ext/oauth2';
 import { BaseProvider } from '@metamask/providers';
@@ -313,8 +313,9 @@ type ClaimrCampaignData = {
     questComplete: boolean;
 };
 declare class TauntApi {
-    private api;
+    private _axios;
     private refreshToken;
+    private accessToken;
     private claimrToken;
     constructor(endpoint: string);
     onError: (error: {
@@ -323,7 +324,7 @@ declare class TauntApi {
         };
         response: AxiosResponse;
     }) => Promise<AxiosResponse<any, any, {}>>;
-    stdPGET<T = TauntRespType>(method: Method, url: string, body?: unknown, headers?: {}): Promise<T>;
+    private _api;
     post<T = TauntRespType>(url: string, body?: {}, headers?: {}): Promise<T>;
     get<T = TauntRespType>(url: string, headers?: {}): Promise<T>;
     nonceLogin: (walletAddress: string, clientNonce: string) => Promise<string>;
@@ -332,9 +333,9 @@ declare class TauntApi {
     loginExtWithWeb3WalletSignature: (props: TauntExtSigProps) => Promise<TauntRespType>;
     refresh: (refreshToken?: string) => Promise<TauntRespType>;
     logout: () => Promise<void>;
-    getClaimrToken: () => Promise<string | null>;
+    getClaimrToken: () => Promise<string>;
     getClaimrData: () => Promise<ClaimrCampaignData>;
-    getLoggedInUser: () => Promise<AxiosResponse<TauntUser, any, {}>>;
+    getLoggedInUser: () => Promise<TauntUser>;
     writePlayerEvent(eventName: string, eventData?: unknown, retryIfLoginNeeded?: boolean): Promise<void>;
 }

package/dist/es/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { AxiosResponse, AxiosRequestConfig, Method } from 'axios';
+import { AxiosResponse, AxiosRequestConfig } from 'axios';
 import * as magic_sdk from 'magic-sdk';
 import { OAuthRedirectResult, OAuthRedirectError } from '@magic-ext/oauth2';
 import { BaseProvider } from '@metamask/providers';
@@ -313,8 +313,9 @@ type ClaimrCampaignData = {
     questComplete: boolean;
 };
 declare class TauntApi {
-    private api;
+    private _axios;
     private refreshToken;
+    private accessToken;
     private claimrToken;
     constructor(endpoint: string);
     onError: (error: {
@@ -323,7 +324,7 @@ declare class TauntApi {
         };
         response: AxiosResponse;
     }) => Promise<AxiosResponse<any, any, {}>>;
-    stdPGET<T = TauntRespType>(method: Method, url: string, body?: unknown, headers?: {}): Promise<T>;
+    private _api;
     post<T = TauntRespType>(url: string, body?: {}, headers?: {}): Promise<T>;
     get<T = TauntRespType>(url: string, headers?: {}): Promise<T>;
     nonceLogin: (walletAddress: string, clientNonce: string) => Promise<string>;
@@ -332,9 +333,9 @@ declare class TauntApi {
     loginExtWithWeb3WalletSignature: (props: TauntExtSigProps) => Promise<TauntRespType>;
     refresh: (refreshToken?: string) => Promise<TauntRespType>;
     logout: () => Promise<void>;
-    getClaimrToken: () => Promise<string | null>;
+    getClaimrToken: () => Promise<string>;
     getClaimrData: () => Promise<ClaimrCampaignData>;
-    getLoggedInUser: () => Promise<AxiosResponse<TauntUser, any, {}>>;
+    getLoggedInUser: () => Promise<TauntUser>;
     writePlayerEvent(eventName: string, eventData?: unknown, retryIfLoginNeeded?: boolean): Promise<void>;
 }

package/dist/es/index.js CHANGED Viewed

@@ -462,28 +462,39 @@ function ErrorFromResponse(response) {
 }
 class TauntApi {
-    async stdPGET(method, url, body, headers = {}) {
-        const response = await this.api.request({
+    async _api(method, url, body, headers = {}) {
+        headers = {
+            "Content-Type": "application/json",
+            Accept: "application/json",
+            ...headers
+        };
+        if (this.accessToken) {
+            headers = {
+                ...headers,
+                Authorization: `Bearer ${this.accessToken}`
+            };
+        }
+        const response = await this._axios.request({
             url,
             method,
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
-                ...headers
-            },
-            data: body ? JSON.stringify(body) : null
+            headers,
+            data: body ? JSON.stringify(body) : null,
+            withCredentials: true
         });
         const data = response.data;
-        if (data.refreshToken) {
+        if (data?.refreshToken) {
             this.refreshToken = data.refreshToken;
         }
+        if (data?.accessToken) {
+            this.accessToken = data.accessToken;
+        }
         return data;
     }
     async post(url, body = {}, headers = {}) {
-        return this.stdPGET("POST", url, body, headers);
+        return this._api("POST", url, body, headers);
     }
     async get(url, headers = {}) {
-        return this.stdPGET("GET", url, undefined, headers);
+        return this._api("GET", url, undefined, headers);
     }
     // this.user = data
     // localStorage.setItem("user", JSON.stringify(data))
@@ -593,15 +604,16 @@ class TauntApi {
     }
     constructor(endpoint){
         this.refreshToken = null;
+        this.accessToken = null;
         this.claimrToken = null;
         this.onError = async (error)=>{
             const originalRequest = error.config;
-            if (error.response.status === 401 && !originalRequest._retry) {
+            if (error.response.status === 401 && !originalRequest._retry && this.refreshToken) {
                 originalRequest._retry = true;
                 console.log("401 - refreshing token");
                 try {
                     const data = await this.refresh();
-                    return this.api(originalRequest);
+                    return this._axios(originalRequest);
                 } catch (error) {
                     console.log("Unable to refresh access token, please log in");
                     this.refreshToken = null;
@@ -620,36 +632,41 @@ class TauntApi {
             });
         this.loginWithWeb3WalletSignature = (props)=>this.post("/v1/auth/login/signature", props);
         this.loginExtWithWeb3WalletSignature = (props)=>this.post("/v1/auth/login/ext-signature", props);
-        this.refresh = (refreshToken)=>this.post(`/v1/auth/token/refresh`, {
-                token: refreshToken || this.refreshToken
+        this.refresh = (refreshToken)=>{
+            const token = refreshToken || this.refreshToken;
+            if (!token) {
+                return Promise.reject(new Error("No refresh token available"));
+            }
+            return this.post(`/v1/auth/token/refresh`, {
+                token
             });
+        };
         // Logout of the backend with access token. Assumes user is currently logged in and has a cookie with the access token
         this.logout = async ()=>{
             // If logging out fails on the backend we'll still remove the user info
-            await this.api.post("/v1/auth/logout");
+            await this.post("/v1/auth/logout");
             await this.writePlayerEvent("player_logged_out");
         };
         this.getClaimrToken = async ()=>{
             if (!this.claimrToken) {
                 const url = "v1/claimr/token";
-                const { data } = await this.api.get(`${url}`);
+                const data = await this.get(`${url}`);
                 this.claimrToken = data.data.token;
             }
             return this.claimrToken;
         };
         this.getClaimrData = async ()=>{
-            const { data } = await this.api.get("/v1/beamable/inventory/skulls");
+            const data = await this.get("/v1/beamable/inventory/skulls");
             return data;
         };
         // Use the cookie stored in the browser to get the user and save user model in state and local storage
         // This assumes that the user is logged to backend in and has a cookie jwt
-        this.getLoggedInUser = ()=>this.api.get("/v1/auth/me");
-        this.api = axios.create({
-            baseURL: `${endpoint}`,
-            withCredentials: true
+        this.getLoggedInUser = ()=>this.get("/v1/auth/me");
+        this._axios = axios.create({
+            baseURL: `${endpoint}`
         });
         // Response interceptor for API calls
-        this.api.interceptors.response.use((response)=>response, (error)=>this.onError(error));
+        this._axios.interceptors.response.use((response)=>response, (error)=>this.onError(error));
     }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@redzone/taunt-logins",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "type": "module",
   "files": [