@redzone/taunt-logins 0.0.14 → 0.0.16

package/dist/cjs/index.cjs

@@ -347,19 +347,24 @@ function ErrorFromResponse(response) {
     }
 }
 
+const REFRESH_KEY = "taunt_refresh_token";
 class TauntApi {
+    get refreshToken() {
+        return localStorage.getItem(REFRESH_KEY);
+    }
+    set refreshToken(token) {
+        if (token) {
+            localStorage.setItem(REFRESH_KEY, token);
+        } else {
+            localStorage.removeItem(REFRESH_KEY);
+        }
+    }
     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,
@@ -371,9 +376,6 @@ class TauntApi {
         if (data?.refreshToken) {
             this.refreshToken = data.refreshToken;
         }
-        if (data?.accessToken) {
-            this.accessToken = data.accessToken;
-        }
         return data;
     }
     async post(url, body = {}, headers = {}) {
@@ -387,8 +389,7 @@ class TauntApi {
         if (!walletAddress) {
             throw new Error("No wallet address found");
         }
-        const cryptoValuesArray = new Uint32Array(3);
-        const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString();
+        const clientNonce = this.randomTokenString();
         const serverNonce = await this.nonceLogin(walletAddress, clientNonce);
         const payload = JSON.stringify({
             clientNonce,
@@ -399,7 +400,6 @@ class TauntApi {
         try {
             signature = await provider.personalSign(message, walletAddress);
         } catch (err) {
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             throw new Error(`User denied message signature, ${err}`);
         }
         if (!signature) {
@@ -519,8 +519,6 @@ class TauntApi {
         return Promise.resolve();
     }
     constructor(endpoint){
-        this.refreshToken = null;
-        this.accessToken = null;
         this.claimrToken = null;
         this.onError = async (error)=>{
             const originalRequest = error.config;
@@ -540,18 +538,16 @@ class TauntApi {
             return Promise.reject(ErrorFromResponse(error.response));
         };
         this.setLoginDetails = async (props, checkGet = true)=>{
-            this.accessToken = props.accessToken;
             this.refreshToken = props.refreshToken;
             if (checkGet) {
                 const user = await this.getLoggedInUser();
                 if (!user) {
-                    this.accessToken = null;
                     this.refreshToken = null;
                     return null;
                 }
             }
             return {
-                accessToken: this.accessToken,
+                accessToken: props.accessToken,
                 refreshToken: this.refreshToken
             };
         };
@@ -593,12 +589,16 @@ class TauntApi {
             const data = await this.get("v1/claimr/referral-code");
             return data.data?.ref_id;
         };
-        this.randomTokenString = ()=>crypto.randomUUID().replace(/-/g, "");
+        this.randomTokenString = (len = 3)=>{
+            const cryptoValuesArray = new Uint32Array(len);
+            return crypto.getRandomValues(cryptoValuesArray).toString();
+        };
         // 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.get("/v1/auth/me");
         this._axios = axios__default.default.create({
-            baseURL: endpoint
+            baseURL: endpoint,
+            withCredentials: true
         });
         // Response interceptor for API calls
         this._axios.interceptors.response.use((response)=>response, (error)=>this.onError(error));

package/dist/cjs/index.d.cts

@@ -250,8 +250,8 @@ interface AxiosErrorResponse {
 }
 declare class TauntApi {
     private _axios;
-    private refreshToken;
-    private accessToken;
+    get refreshToken(): string | null;
+    set refreshToken(token: string | null);
     private claimrToken;
     constructor(endpoint: string);
     onError: (error: AxiosErrorResponse) => Promise<AxiosResponse<any, any, {}>>;
@@ -270,7 +270,7 @@ declare class TauntApi {
     getClaimrToken: () => Promise<string>;
     getClaimrSkulls: () => Promise<ClaimrCampaignData>;
     getClaimrReferralCode: () => Promise<string | undefined>;
-    randomTokenString: () => string;
+    randomTokenString: (len?: number) => string;
     withProvider(provider: {
         getAddress: () => Promise<string | undefined | null>;
         personalSign: (message: string, address: string) => Promise<string | undefined | null>;

package/dist/es/index.d.ts

@@ -250,8 +250,8 @@ interface AxiosErrorResponse {
 }
 declare class TauntApi {
     private _axios;
-    private refreshToken;
-    private accessToken;
+    get refreshToken(): string | null;
+    set refreshToken(token: string | null);
     private claimrToken;
     constructor(endpoint: string);
     onError: (error: AxiosErrorResponse) => Promise<AxiosResponse<any, any, {}>>;
@@ -270,7 +270,7 @@ declare class TauntApi {
     getClaimrToken: () => Promise<string>;
     getClaimrSkulls: () => Promise<ClaimrCampaignData>;
     getClaimrReferralCode: () => Promise<string | undefined>;
-    randomTokenString: () => string;
+    randomTokenString: (len?: number) => string;
     withProvider(provider: {
         getAddress: () => Promise<string | undefined | null>;
         personalSign: (message: string, address: string) => Promise<string | undefined | null>;

package/dist/es/index.js

@@ -341,19 +341,24 @@ function ErrorFromResponse(response) {
     }
 }
 
+const REFRESH_KEY = "taunt_refresh_token";
 class TauntApi {
+    get refreshToken() {
+        return localStorage.getItem(REFRESH_KEY);
+    }
+    set refreshToken(token) {
+        if (token) {
+            localStorage.setItem(REFRESH_KEY, token);
+        } else {
+            localStorage.removeItem(REFRESH_KEY);
+        }
+    }
     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,
@@ -365,9 +370,6 @@ class TauntApi {
         if (data?.refreshToken) {
             this.refreshToken = data.refreshToken;
         }
-        if (data?.accessToken) {
-            this.accessToken = data.accessToken;
-        }
         return data;
     }
     async post(url, body = {}, headers = {}) {
@@ -381,8 +383,7 @@ class TauntApi {
         if (!walletAddress) {
             throw new Error("No wallet address found");
         }
-        const cryptoValuesArray = new Uint32Array(3);
-        const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString();
+        const clientNonce = this.randomTokenString();
         const serverNonce = await this.nonceLogin(walletAddress, clientNonce);
         const payload = JSON.stringify({
             clientNonce,
@@ -393,7 +394,6 @@ class TauntApi {
         try {
             signature = await provider.personalSign(message, walletAddress);
         } catch (err) {
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             throw new Error(`User denied message signature, ${err}`);
         }
         if (!signature) {
@@ -513,8 +513,6 @@ class TauntApi {
         return Promise.resolve();
     }
     constructor(endpoint){
-        this.refreshToken = null;
-        this.accessToken = null;
         this.claimrToken = null;
         this.onError = async (error)=>{
             const originalRequest = error.config;
@@ -534,18 +532,16 @@ class TauntApi {
             return Promise.reject(ErrorFromResponse(error.response));
         };
         this.setLoginDetails = async (props, checkGet = true)=>{
-            this.accessToken = props.accessToken;
             this.refreshToken = props.refreshToken;
             if (checkGet) {
                 const user = await this.getLoggedInUser();
                 if (!user) {
-                    this.accessToken = null;
                     this.refreshToken = null;
                     return null;
                 }
             }
             return {
-                accessToken: this.accessToken,
+                accessToken: props.accessToken,
                 refreshToken: this.refreshToken
             };
         };
@@ -587,12 +583,16 @@ class TauntApi {
             const data = await this.get("v1/claimr/referral-code");
             return data.data?.ref_id;
         };
-        this.randomTokenString = ()=>crypto.randomUUID().replace(/-/g, "");
+        this.randomTokenString = (len = 3)=>{
+            const cryptoValuesArray = new Uint32Array(len);
+            return crypto.getRandomValues(cryptoValuesArray).toString();
+        };
         // 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.get("/v1/auth/me");
         this._axios = axios.create({
-            baseURL: endpoint
+            baseURL: endpoint,
+            withCredentials: true
         });
         // Response interceptor for API calls
         this._axios.interceptors.response.use((response)=>response, (error)=>this.onError(error));

package/package.json

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