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

@redzone/taunt-logins 0.0.8 → 0.0.10

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,68 @@ 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);
+    }
+    async withProvider(provider, extNonce) {
+        const walletAddress = await provider.getAddress();
+        if (!walletAddress) {
+            throw new Error("No wallet address found");
+        }
+        const cryptoValuesArray = new Uint32Array(3);
+        const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString();
+        const serverNonce = await this.nonceLogin(walletAddress, clientNonce);
+        const payload = JSON.stringify({
+            clientNonce,
+            serverNonce
+        });
+        const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`;
+        let signature;
+        try {
+            signature = await provider.personalSign(message, walletAddress);
+        } catch (err) {
+            throw new Error("User denied message signature");
+        }
+        if (!signature) {
+            throw new Error("No signature returned");
+        }
+        return this.loginExtWithWeb3WalletSignature({
+            walletAddress,
+            message,
+            signature,
+            extNonce
+        });
     }
     // this.user = data
     // localStorage.setItem("user", JSON.stringify(data))
@@ -599,15 +639,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;
@@ -621,41 +662,48 @@ class TauntApi {
                 walletAddress,
                 clientNonce
             });
-        this.loginWithMagicDid = (did)=>this.post("/v1/auth/login/did", {
-                did
-            });
+        // loginWithMagicDid = (did: string) => this.post("/v1/auth/login/did", { did })
         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.loginExtWithWeb3WalletSignature = (props)=>{
+            props.extNonce = props.extNonce || this.randomTokenString();
+            return this.post("/v1/auth/login/ext-signature", props);
+        };
+        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;
         };
+        this.randomTokenString = ()=>crypto.randomUUID().replace(/-/g, "");
         // 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));
     }
 }
@@ -669,102 +717,67 @@ const getMagic = (magicKey)=>new magicSdk.Magic(magicKey, {
             new oauth2.OAuthExtension()
         ]
     });
-function emailOTPWithMagic(magicKey, email) {
-    const magic = getMagic(magicKey);
+function emailOTPWithMagic(magicKey, email, magic) {
+    magic = magic || getMagic(magicKey);
     return magic.auth.loginWithEmailOTP({
         email
     });
 }
-function telegramWithMagic(magicKey) {
-    const magic = getMagic(magicKey);
+function telegramWithMagic(magicKey, magic) {
+    magic = magic || getMagic(magicKey);
     return magic.oauth2.loginWithPopup({
         provider: "telegram"
     });
 }
-async function tauntMagicTelegramLogin(tauntServiceEndpoint, magicKey, tauntApi) {
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    try {
-        let result = await telegramWithMagic(magicKey);
-        const errResult = result;
-        if (errResult.error) {
-            throw new Error(`No ID token returned ${errResult.error}`);
-        }
-        result = result;
-        console.log("Magic telegram login", {
-            result
-        });
-        return taunt.loginWithMagicDid(result.magic.idToken);
-    } catch (err) {
-        console.error("Magic login error:", err);
-        throw err;
-    }
+function tauntMagicTelegramLogin(tauntServiceEndpoint, magicKey, tauntApi, extNonce) {
+    return withLoginTry(tauntServiceEndpoint, tauntApi, magicKey, undefined, extNonce, (magic)=>telegramWithMagic(magicKey, magic));
 }
-async function tauntMagicEmailOTPLogin(tauntServiceEndpoint, magicKey, email, tauntApi) {
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
+function tauntMagicEmailOTPLogin(tauntServiceEndpoint, magicKey, email, tauntApi, extNonce) {
+    return withLoginTry(tauntServiceEndpoint, tauntApi, magicKey, undefined, extNonce, (magic)=>emailOTPWithMagic(magicKey, email, magic));
+}
+async function withLoginTry(endpoint, tauntApi, magicKey, magic, extNonce, fn) {
+    tauntApi = tauntApi || new TauntApi(endpoint);
+    magic = magic || getMagic(magicKey);
     try {
-        const did = await emailOTPWithMagic(magicKey, email);
-        if (!did) throw new Error("No DID returned");
-        console.log("Magic email OTP login", {
-            did
-        });
-        return taunt.loginWithMagicDid(did);
+        if (!await magic.user.isLoggedIn()) {
+            await fn(magic, tauntApi);
+        }
+        // check if user is logged in
+        const isLoggedIn = await magic.user.isLoggedIn();
+        if (!isLoggedIn) {
+            throw new Error("User is not logged in");
+        }
+        return tauntApi.withProvider({
+            getAddress: ()=>magic.rpcProvider.send("eth_accounts", []).then((accounts)=>accounts[0]),
+            personalSign: (message, address)=>magic.rpcProvider.send("personal_sign", [
+                    message,
+                    address
+                ]).then((sig)=>sig)
+        }, extNonce);
     } catch (err) {
         console.error("Magic login error:", err);
         throw err;
     }
 }
-async function tauntMagicDidLogin(tauntServiceEndpoint, did, tauntApi) {
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    return taunt.loginWithMagicDid(did);
-}
-async function tauntSignWithMetamask(tauntServiceEndpoint, provider, tauntApi) {
+async function tauntMetamaskLogin(tauntServiceEndpoint, provider, tauntApi, extNonce) {
     provider = provider || window.ethereum;
-    if (!provider) throw new Error("MetaMask provider not found");
-    const accounts = await provider.request({
-        method: "eth_requestAccounts"
-    });
-    if (!accounts.length) throw new Error("No accounts returned");
-    console.log("MetaMask", {
-        accounts
-    });
-    const walletAddress = accounts[0];
-    const cryptoValuesArray = new Uint32Array(3);
-    const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString();
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    const serverNonce = await taunt.nonceLogin(walletAddress, clientNonce);
-    const payload = JSON.stringify({
-        clientNonce,
-        serverNonce
-    });
-    const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`;
-    let signature;
-    try {
-        signature = await provider.request({
-            method: "personal_sign",
-            params: [
-                message,
-                walletAddress
-            ]
-        });
-    } catch (err) {
-        throw new Error("User denied message signature");
+    if (!provider) {
+        throw new Error("MetaMask provider not found");
     }
-    if (!signature) throw new Error("No signature returned");
-    return {
-        walletAddress,
-        message,
-        signature
-    };
-}
-async function tauntMetamaskLogin(tauntServiceEndpoint, providerParam, tauntApi) {
     const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    const { walletAddress, message, signature } = await tauntSignWithMetamask(tauntServiceEndpoint, providerParam, tauntApi);
-    return taunt.loginWithWeb3WalletSignature({
-        walletAddress,
-        message,
-        signature
-    });
+    return taunt.withProvider({
+        getAddress: ()=>provider.request({
+                method: "eth_requestAccounts"
+            }).then((accounts)=>accounts?.[0]),
+        personalSign: (message, address)=>provider.request({
+                method: "personal_sign",
+                params: [
+                    message,
+                    address
+                ]
+            })
+    }, extNonce);
 }
 exports.BadGatewayError = BadGatewayError;
@@ -810,9 +823,7 @@ exports.UnsupportedMediaTypeError = UnsupportedMediaTypeError;
 exports.UpgradeRequiredError = UpgradeRequiredError;
 exports.VariantAlsoNegotiatesError = VariantAlsoNegotiatesError;
 exports.emailOTPWithMagic = emailOTPWithMagic;
-exports.tauntMagicDidLogin = tauntMagicDidLogin;
 exports.tauntMagicEmailOTPLogin = tauntMagicEmailOTPLogin;
 exports.tauntMagicTelegramLogin = tauntMagicTelegramLogin;
 exports.tauntMetamaskLogin = tauntMetamaskLogin;
-exports.tauntSignWithMetamask = tauntSignWithMetamask;
 exports.telegramWithMagic = telegramWithMagic;

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

@@ -1,6 +1,8 @@
-import { AxiosResponse, AxiosRequestConfig, Method } from 'axios';
+import { AxiosResponse, AxiosRequestConfig } from 'axios';
+import * as _magic_ext_oauth2 from '@magic-ext/oauth2';
+import { OAuthExtension } from '@magic-ext/oauth2';
 import * as magic_sdk from 'magic-sdk';
-import { OAuthRedirectResult, OAuthRedirectError } from '@magic-ext/oauth2';
+import * as _magic_sdk_provider from '@magic-sdk/provider';
 import { BaseProvider } from '@metamask/providers';
 declare class ErrorResponse {
@@ -291,7 +293,7 @@ type TauntSigProps = {
     signature: string;
 };
 type TauntExtSigProps = TauntSigProps & {
-    extNonce: string;
+    extNonce?: string;
 };
 type TauntRespType = {
     accessToken: string;
@@ -313,8 +315,9 @@ type ClaimrCampaignData = {
     questComplete: boolean;
 };
 declare class TauntApi {
-    private api;
+    private _axios;
     private refreshToken;
+    private accessToken;
     private claimrToken;
     constructor(endpoint: string);
     onError: (error: {
@@ -323,22 +326,28 @@ 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>;
-    loginWithMagicDid: (did: string) => Promise<TauntRespType>;
     loginWithWeb3WalletSignature: (props: TauntSigProps) => Promise<TauntRespType>;
     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, {}>>;
+    randomTokenString: () => string;
+    withProvider(provider: {
+        getAddress: () => Promise<string | undefined | null>;
+        personalSign: (message: string, address: string) => Promise<string | undefined | null>;
+    }, extNonce?: string): Promise<TauntRespType>;
+    getLoggedInUser: () => Promise<TauntUser>;
     writePlayerEvent(eventName: string, eventData?: unknown, retryIfLoginNeeded?: boolean): Promise<void>;
 }
-declare function emailOTPWithMagic(magicKey: string, email: string): magic_sdk.PromiEvent<string | null, {
+declare const getMagic: (magicKey: string) => _magic_sdk_provider.InstanceWithExtensions<_magic_sdk_provider.SDKBase, OAuthExtension[]>;
+type MagicType = ReturnType<typeof getMagic>;
+declare function emailOTPWithMagic(magicKey: string, email: string, magic?: MagicType): magic_sdk.PromiEvent<string | null, {
     "email-otp-sent": () => void;
     "login-throttled": () => void;
     "invalid-email-otp": () => void;
@@ -367,23 +376,18 @@ declare function emailOTPWithMagic(magicKey: string, email: string): magic_sdk.P
     settled: () => void;
     "closed-by-user": () => void;
 }>;
-declare function telegramWithMagic(magicKey: string): magic_sdk.PromiEvent<OAuthRedirectResult | OAuthRedirectError, {
-    done: (result: OAuthRedirectResult | OAuthRedirectError) => void;
+declare function telegramWithMagic(magicKey: string, magic?: MagicType): magic_sdk.PromiEvent<_magic_ext_oauth2.OAuthRedirectResult | _magic_ext_oauth2.OAuthRedirectError, {
+    done: (result: _magic_ext_oauth2.OAuthRedirectResult | _magic_ext_oauth2.OAuthRedirectError) => void;
     error: (reason: any) => void;
     settled: () => void;
     "closed-by-user": () => void;
 }>;
-declare function tauntMagicTelegramLogin(tauntServiceEndpoint: string, magicKey: string, tauntApi?: TauntApi): Promise<{
+declare function tauntMagicTelegramLogin(tauntServiceEndpoint: string, magicKey: string, tauntApi?: TauntApi, extNonce?: string): Promise<{
     accessToken: string;
     refreshToken: string;
     isNewUser: string;
 }>;
-declare function tauntMagicEmailOTPLogin(tauntServiceEndpoint: string, magicKey: string, email: string, tauntApi?: TauntApi): Promise<{
-    accessToken: string;
-    refreshToken: string;
-    isNewUser: string;
-}>;
-declare function tauntMagicDidLogin(tauntServiceEndpoint: string, did: string, tauntApi?: TauntApi): Promise<{
+declare function tauntMagicEmailOTPLogin(tauntServiceEndpoint: string, magicKey: string, email: string, tauntApi?: TauntApi, extNonce?: string): Promise<{
     accessToken: string;
     refreshToken: string;
     isNewUser: string;
@@ -394,16 +398,11 @@ declare global {
         ethereum?: BaseProvider;
     }
 }
-declare function tauntSignWithMetamask(tauntServiceEndpoint: string, provider?: BaseProvider, tauntApi?: TauntApi): Promise<{
-    walletAddress: string;
-    message: string;
-    signature: string;
-}>;
-declare function tauntMetamaskLogin(tauntServiceEndpoint: string, providerParam?: BaseProvider, tauntApi?: TauntApi): Promise<{
+declare function tauntMetamaskLogin(tauntServiceEndpoint: string, provider?: BaseProvider, tauntApi?: TauntApi, extNonce?: string): Promise<{
     accessToken: string;
     refreshToken: string;
     isNewUser: string;
 }>;
-export { BadGatewayError, BadRequestError, BandwidthLimitExceededError, ConflictError, ErrorFromResponse, ErrorResponse, ExpectationFailedError, FailedDependencyError, ForbiddenError, GatewayTimeoutError, GoneError, HTTPVersionNotSupportedError, ImATeapotError, InsufficientStorageError, InternalServerError, LengthRequiredError, LockedError, LoopDetectedError, MethodNotAllowedError, NetworkAuthenticationRequiredError, NotAcceptableError, NotExtendedError, NotFoundError, NotImplementedError, PaymentRequiredError, PreconditionFailedError, PreconditionRequiredError, ProxyAuthenticationRequiredError, RequestEntityTooLargeError, RequestHeaderFieldsTooLargeError, RequestTimeoutError, RequestUriTooLongError, RequestedRangeNotSatisfiableError, ServiceUnavailableError, TauntApi, TooManyRequestsError, UnauthorizedError, UnknownError, UnprocessableEntityError, UnsupportedMediaTypeError, UpgradeRequiredError, VariantAlsoNegotiatesError, emailOTPWithMagic, tauntMagicDidLogin, tauntMagicEmailOTPLogin, tauntMagicTelegramLogin, tauntMetamaskLogin, tauntSignWithMetamask, telegramWithMagic };
+export { BadGatewayError, BadRequestError, BandwidthLimitExceededError, ConflictError, ErrorFromResponse, ErrorResponse, ExpectationFailedError, FailedDependencyError, ForbiddenError, GatewayTimeoutError, GoneError, HTTPVersionNotSupportedError, ImATeapotError, InsufficientStorageError, InternalServerError, LengthRequiredError, LockedError, LoopDetectedError, MethodNotAllowedError, NetworkAuthenticationRequiredError, NotAcceptableError, NotExtendedError, NotFoundError, NotImplementedError, PaymentRequiredError, PreconditionFailedError, PreconditionRequiredError, ProxyAuthenticationRequiredError, RequestEntityTooLargeError, RequestHeaderFieldsTooLargeError, RequestTimeoutError, RequestUriTooLongError, RequestedRangeNotSatisfiableError, ServiceUnavailableError, TauntApi, TooManyRequestsError, UnauthorizedError, UnknownError, UnprocessableEntityError, UnsupportedMediaTypeError, UpgradeRequiredError, VariantAlsoNegotiatesError, emailOTPWithMagic, tauntMagicEmailOTPLogin, tauntMagicTelegramLogin, tauntMetamaskLogin, telegramWithMagic };
 export type { ClaimrCampaignData, TauntExtSigProps, TauntSigProps, TauntUser };

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

@@ -1,6 +1,8 @@
-import { AxiosResponse, AxiosRequestConfig, Method } from 'axios';
+import { AxiosResponse, AxiosRequestConfig } from 'axios';
+import * as _magic_ext_oauth2 from '@magic-ext/oauth2';
+import { OAuthExtension } from '@magic-ext/oauth2';
 import * as magic_sdk from 'magic-sdk';
-import { OAuthRedirectResult, OAuthRedirectError } from '@magic-ext/oauth2';
+import * as _magic_sdk_provider from '@magic-sdk/provider';
 import { BaseProvider } from '@metamask/providers';
 declare class ErrorResponse {
@@ -291,7 +293,7 @@ type TauntSigProps = {
     signature: string;
 };
 type TauntExtSigProps = TauntSigProps & {
-    extNonce: string;
+    extNonce?: string;
 };
 type TauntRespType = {
     accessToken: string;
@@ -313,8 +315,9 @@ type ClaimrCampaignData = {
     questComplete: boolean;
 };
 declare class TauntApi {
-    private api;
+    private _axios;
     private refreshToken;
+    private accessToken;
     private claimrToken;
     constructor(endpoint: string);
     onError: (error: {
@@ -323,22 +326,28 @@ 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>;
-    loginWithMagicDid: (did: string) => Promise<TauntRespType>;
     loginWithWeb3WalletSignature: (props: TauntSigProps) => Promise<TauntRespType>;
     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, {}>>;
+    randomTokenString: () => string;
+    withProvider(provider: {
+        getAddress: () => Promise<string | undefined | null>;
+        personalSign: (message: string, address: string) => Promise<string | undefined | null>;
+    }, extNonce?: string): Promise<TauntRespType>;
+    getLoggedInUser: () => Promise<TauntUser>;
     writePlayerEvent(eventName: string, eventData?: unknown, retryIfLoginNeeded?: boolean): Promise<void>;
 }
-declare function emailOTPWithMagic(magicKey: string, email: string): magic_sdk.PromiEvent<string | null, {
+declare const getMagic: (magicKey: string) => _magic_sdk_provider.InstanceWithExtensions<_magic_sdk_provider.SDKBase, OAuthExtension[]>;
+type MagicType = ReturnType<typeof getMagic>;
+declare function emailOTPWithMagic(magicKey: string, email: string, magic?: MagicType): magic_sdk.PromiEvent<string | null, {
     "email-otp-sent": () => void;
     "login-throttled": () => void;
     "invalid-email-otp": () => void;
@@ -367,23 +376,18 @@ declare function emailOTPWithMagic(magicKey: string, email: string): magic_sdk.P
     settled: () => void;
     "closed-by-user": () => void;
 }>;
-declare function telegramWithMagic(magicKey: string): magic_sdk.PromiEvent<OAuthRedirectResult | OAuthRedirectError, {
-    done: (result: OAuthRedirectResult | OAuthRedirectError) => void;
+declare function telegramWithMagic(magicKey: string, magic?: MagicType): magic_sdk.PromiEvent<_magic_ext_oauth2.OAuthRedirectResult | _magic_ext_oauth2.OAuthRedirectError, {
+    done: (result: _magic_ext_oauth2.OAuthRedirectResult | _magic_ext_oauth2.OAuthRedirectError) => void;
     error: (reason: any) => void;
     settled: () => void;
     "closed-by-user": () => void;
 }>;
-declare function tauntMagicTelegramLogin(tauntServiceEndpoint: string, magicKey: string, tauntApi?: TauntApi): Promise<{
+declare function tauntMagicTelegramLogin(tauntServiceEndpoint: string, magicKey: string, tauntApi?: TauntApi, extNonce?: string): Promise<{
     accessToken: string;
     refreshToken: string;
     isNewUser: string;
 }>;
-declare function tauntMagicEmailOTPLogin(tauntServiceEndpoint: string, magicKey: string, email: string, tauntApi?: TauntApi): Promise<{
-    accessToken: string;
-    refreshToken: string;
-    isNewUser: string;
-}>;
-declare function tauntMagicDidLogin(tauntServiceEndpoint: string, did: string, tauntApi?: TauntApi): Promise<{
+declare function tauntMagicEmailOTPLogin(tauntServiceEndpoint: string, magicKey: string, email: string, tauntApi?: TauntApi, extNonce?: string): Promise<{
     accessToken: string;
     refreshToken: string;
     isNewUser: string;
@@ -394,16 +398,11 @@ declare global {
         ethereum?: BaseProvider;
     }
 }
-declare function tauntSignWithMetamask(tauntServiceEndpoint: string, provider?: BaseProvider, tauntApi?: TauntApi): Promise<{
-    walletAddress: string;
-    message: string;
-    signature: string;
-}>;
-declare function tauntMetamaskLogin(tauntServiceEndpoint: string, providerParam?: BaseProvider, tauntApi?: TauntApi): Promise<{
+declare function tauntMetamaskLogin(tauntServiceEndpoint: string, provider?: BaseProvider, tauntApi?: TauntApi, extNonce?: string): Promise<{
     accessToken: string;
     refreshToken: string;
     isNewUser: string;
 }>;
-export { BadGatewayError, BadRequestError, BandwidthLimitExceededError, ConflictError, ErrorFromResponse, ErrorResponse, ExpectationFailedError, FailedDependencyError, ForbiddenError, GatewayTimeoutError, GoneError, HTTPVersionNotSupportedError, ImATeapotError, InsufficientStorageError, InternalServerError, LengthRequiredError, LockedError, LoopDetectedError, MethodNotAllowedError, NetworkAuthenticationRequiredError, NotAcceptableError, NotExtendedError, NotFoundError, NotImplementedError, PaymentRequiredError, PreconditionFailedError, PreconditionRequiredError, ProxyAuthenticationRequiredError, RequestEntityTooLargeError, RequestHeaderFieldsTooLargeError, RequestTimeoutError, RequestUriTooLongError, RequestedRangeNotSatisfiableError, ServiceUnavailableError, TauntApi, TooManyRequestsError, UnauthorizedError, UnknownError, UnprocessableEntityError, UnsupportedMediaTypeError, UpgradeRequiredError, VariantAlsoNegotiatesError, emailOTPWithMagic, tauntMagicDidLogin, tauntMagicEmailOTPLogin, tauntMagicTelegramLogin, tauntMetamaskLogin, tauntSignWithMetamask, telegramWithMagic };
+export { BadGatewayError, BadRequestError, BandwidthLimitExceededError, ConflictError, ErrorFromResponse, ErrorResponse, ExpectationFailedError, FailedDependencyError, ForbiddenError, GatewayTimeoutError, GoneError, HTTPVersionNotSupportedError, ImATeapotError, InsufficientStorageError, InternalServerError, LengthRequiredError, LockedError, LoopDetectedError, MethodNotAllowedError, NetworkAuthenticationRequiredError, NotAcceptableError, NotExtendedError, NotFoundError, NotImplementedError, PaymentRequiredError, PreconditionFailedError, PreconditionRequiredError, ProxyAuthenticationRequiredError, RequestEntityTooLargeError, RequestHeaderFieldsTooLargeError, RequestTimeoutError, RequestUriTooLongError, RequestedRangeNotSatisfiableError, ServiceUnavailableError, TauntApi, TooManyRequestsError, UnauthorizedError, UnknownError, UnprocessableEntityError, UnsupportedMediaTypeError, UpgradeRequiredError, VariantAlsoNegotiatesError, emailOTPWithMagic, tauntMagicEmailOTPLogin, tauntMagicTelegramLogin, tauntMetamaskLogin, telegramWithMagic };
 export type { ClaimrCampaignData, TauntExtSigProps, TauntSigProps, TauntUser };

package/dist/es/index.js CHANGED Viewed

@@ -462,28 +462,68 @@ 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);
+    }
+    async withProvider(provider, extNonce) {
+        const walletAddress = await provider.getAddress();
+        if (!walletAddress) {
+            throw new Error("No wallet address found");
+        }
+        const cryptoValuesArray = new Uint32Array(3);
+        const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString();
+        const serverNonce = await this.nonceLogin(walletAddress, clientNonce);
+        const payload = JSON.stringify({
+            clientNonce,
+            serverNonce
+        });
+        const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`;
+        let signature;
+        try {
+            signature = await provider.personalSign(message, walletAddress);
+        } catch (err) {
+            throw new Error("User denied message signature");
+        }
+        if (!signature) {
+            throw new Error("No signature returned");
+        }
+        return this.loginExtWithWeb3WalletSignature({
+            walletAddress,
+            message,
+            signature,
+            extNonce
+        });
     }
     // this.user = data
     // localStorage.setItem("user", JSON.stringify(data))
@@ -593,15 +633,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;
@@ -615,41 +656,48 @@ class TauntApi {
                 walletAddress,
                 clientNonce
             });
-        this.loginWithMagicDid = (did)=>this.post("/v1/auth/login/did", {
-                did
-            });
+        // loginWithMagicDid = (did: string) => this.post("/v1/auth/login/did", { did })
         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.loginExtWithWeb3WalletSignature = (props)=>{
+            props.extNonce = props.extNonce || this.randomTokenString();
+            return this.post("/v1/auth/login/ext-signature", props);
+        };
+        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;
         };
+        this.randomTokenString = ()=>crypto.randomUUID().replace(/-/g, "");
         // 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));
     }
 }
@@ -663,102 +711,67 @@ const getMagic = (magicKey)=>new Magic(magicKey, {
             new OAuthExtension()
         ]
     });
-function emailOTPWithMagic(magicKey, email) {
-    const magic = getMagic(magicKey);
+function emailOTPWithMagic(magicKey, email, magic) {
+    magic = magic || getMagic(magicKey);
     return magic.auth.loginWithEmailOTP({
         email
     });
 }
-function telegramWithMagic(magicKey) {
-    const magic = getMagic(magicKey);
+function telegramWithMagic(magicKey, magic) {
+    magic = magic || getMagic(magicKey);
     return magic.oauth2.loginWithPopup({
         provider: "telegram"
     });
 }
-async function tauntMagicTelegramLogin(tauntServiceEndpoint, magicKey, tauntApi) {
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    try {
-        let result = await telegramWithMagic(magicKey);
-        const errResult = result;
-        if (errResult.error) {
-            throw new Error(`No ID token returned ${errResult.error}`);
-        }
-        result = result;
-        console.log("Magic telegram login", {
-            result
-        });
-        return taunt.loginWithMagicDid(result.magic.idToken);
-    } catch (err) {
-        console.error("Magic login error:", err);
-        throw err;
-    }
+function tauntMagicTelegramLogin(tauntServiceEndpoint, magicKey, tauntApi, extNonce) {
+    return withLoginTry(tauntServiceEndpoint, tauntApi, magicKey, undefined, extNonce, (magic)=>telegramWithMagic(magicKey, magic));
 }
-async function tauntMagicEmailOTPLogin(tauntServiceEndpoint, magicKey, email, tauntApi) {
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
+function tauntMagicEmailOTPLogin(tauntServiceEndpoint, magicKey, email, tauntApi, extNonce) {
+    return withLoginTry(tauntServiceEndpoint, tauntApi, magicKey, undefined, extNonce, (magic)=>emailOTPWithMagic(magicKey, email, magic));
+}
+async function withLoginTry(endpoint, tauntApi, magicKey, magic, extNonce, fn) {
+    tauntApi = tauntApi || new TauntApi(endpoint);
+    magic = magic || getMagic(magicKey);
     try {
-        const did = await emailOTPWithMagic(magicKey, email);
-        if (!did) throw new Error("No DID returned");
-        console.log("Magic email OTP login", {
-            did
-        });
-        return taunt.loginWithMagicDid(did);
+        if (!await magic.user.isLoggedIn()) {
+            await fn(magic, tauntApi);
+        }
+        // check if user is logged in
+        const isLoggedIn = await magic.user.isLoggedIn();
+        if (!isLoggedIn) {
+            throw new Error("User is not logged in");
+        }
+        return tauntApi.withProvider({
+            getAddress: ()=>magic.rpcProvider.send("eth_accounts", []).then((accounts)=>accounts[0]),
+            personalSign: (message, address)=>magic.rpcProvider.send("personal_sign", [
+                    message,
+                    address
+                ]).then((sig)=>sig)
+        }, extNonce);
     } catch (err) {
         console.error("Magic login error:", err);
         throw err;
     }
 }
-async function tauntMagicDidLogin(tauntServiceEndpoint, did, tauntApi) {
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    return taunt.loginWithMagicDid(did);
-}
-async function tauntSignWithMetamask(tauntServiceEndpoint, provider, tauntApi) {
+async function tauntMetamaskLogin(tauntServiceEndpoint, provider, tauntApi, extNonce) {
     provider = provider || window.ethereum;
-    if (!provider) throw new Error("MetaMask provider not found");
-    const accounts = await provider.request({
-        method: "eth_requestAccounts"
-    });
-    if (!accounts.length) throw new Error("No accounts returned");
-    console.log("MetaMask", {
-        accounts
-    });
-    const walletAddress = accounts[0];
-    const cryptoValuesArray = new Uint32Array(3);
-    const clientNonce = crypto.getRandomValues(cryptoValuesArray).toString();
-    const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    const serverNonce = await taunt.nonceLogin(walletAddress, clientNonce);
-    const payload = JSON.stringify({
-        clientNonce,
-        serverNonce
-    });
-    const message = `Sign this message with your wallet to connect to Taunt Battleworld ::: ${payload}`;
-    let signature;
-    try {
-        signature = await provider.request({
-            method: "personal_sign",
-            params: [
-                message,
-                walletAddress
-            ]
-        });
-    } catch (err) {
-        throw new Error("User denied message signature");
+    if (!provider) {
+        throw new Error("MetaMask provider not found");
     }
-    if (!signature) throw new Error("No signature returned");
-    return {
-        walletAddress,
-        message,
-        signature
-    };
-}
-async function tauntMetamaskLogin(tauntServiceEndpoint, providerParam, tauntApi) {
     const taunt = tauntApi || new TauntApi(tauntServiceEndpoint);
-    const { walletAddress, message, signature } = await tauntSignWithMetamask(tauntServiceEndpoint, providerParam, tauntApi);
-    return taunt.loginWithWeb3WalletSignature({
-        walletAddress,
-        message,
-        signature
-    });
+    return taunt.withProvider({
+        getAddress: ()=>provider.request({
+                method: "eth_requestAccounts"
+            }).then((accounts)=>accounts?.[0]),
+        personalSign: (message, address)=>provider.request({
+                method: "personal_sign",
+                params: [
+                    message,
+                    address
+                ]
+            })
+    }, extNonce);
 }
-export { BadGatewayError, BadRequestError, BandwidthLimitExceededError, ConflictError, ErrorFromResponse, ErrorResponse, ExpectationFailedError, FailedDependencyError, ForbiddenError, GatewayTimeoutError, GoneError, HTTPVersionNotSupportedError, ImATeapotError, InsufficientStorageError, InternalServerError, LengthRequiredError, LockedError, LoopDetectedError, MethodNotAllowedError, NetworkAuthenticationRequiredError, NotAcceptableError, NotExtendedError, NotFoundError, NotImplementedError, PaymentRequiredError, PreconditionFailedError, PreconditionRequiredError, ProxyAuthenticationRequiredError, RequestEntityTooLargeError, RequestHeaderFieldsTooLargeError, RequestTimeoutError, RequestUriTooLongError, RequestedRangeNotSatisfiableError, ServiceUnavailableError, TauntApi, TooManyRequestsError, UnauthorizedError, UnknownError, UnprocessableEntityError, UnsupportedMediaTypeError, UpgradeRequiredError, VariantAlsoNegotiatesError, emailOTPWithMagic, tauntMagicDidLogin, tauntMagicEmailOTPLogin, tauntMagicTelegramLogin, tauntMetamaskLogin, tauntSignWithMetamask, telegramWithMagic };
+export { BadGatewayError, BadRequestError, BandwidthLimitExceededError, ConflictError, ErrorFromResponse, ErrorResponse, ExpectationFailedError, FailedDependencyError, ForbiddenError, GatewayTimeoutError, GoneError, HTTPVersionNotSupportedError, ImATeapotError, InsufficientStorageError, InternalServerError, LengthRequiredError, LockedError, LoopDetectedError, MethodNotAllowedError, NetworkAuthenticationRequiredError, NotAcceptableError, NotExtendedError, NotFoundError, NotImplementedError, PaymentRequiredError, PreconditionFailedError, PreconditionRequiredError, ProxyAuthenticationRequiredError, RequestEntityTooLargeError, RequestHeaderFieldsTooLargeError, RequestTimeoutError, RequestUriTooLongError, RequestedRangeNotSatisfiableError, ServiceUnavailableError, TauntApi, TooManyRequestsError, UnauthorizedError, UnknownError, UnprocessableEntityError, UnsupportedMediaTypeError, UpgradeRequiredError, VariantAlsoNegotiatesError, emailOTPWithMagic, tauntMagicEmailOTPLogin, tauntMagicTelegramLogin, tauntMetamaskLogin, telegramWithMagic };

package/package.json CHANGED Viewed

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