squarefi-bff-api-module 1.25.6 → 1.26.1

package/dist/api/auth.js

@@ -23,33 +23,38 @@ exports.auth = {
         verify: {
             email: (email, token) => apiClientFactory_1.apiClientV2.postRequest('/auth/verify/email/otp', {
                 data: { email, token, type: 'email' },
+                context: { bypassUnauthorizedHandler: true },
             }),
             phone: (phone, token) => apiClientFactory_1.apiClientV2.postRequest('/auth/verify/phone/otp', {
                 data: { phone: (0, converters_1.convertPhoneToSupabaseFormat)(phone), token, type: 'sms' },
+                context: { bypassUnauthorizedHandler: true },
             }),
         },
     },
     signin: {
         omni: {
-            email: (data) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-in/omni/email/otp', { data }),
+            email: (data) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-in/omni/email/otp', { data, context: { bypassUnauthorizedHandler: true } }),
             phone: (_a) => {
                 var { phone } = _a, data = __rest(_a, ["phone"]);
                 return apiClientFactory_1.apiClientV2.postRequest('/auth/sign-in/omni/phone/otp', {
                     data: Object.assign({ phone: (0, converters_1.convertPhoneToSupabaseFormat)(phone) }, data),
+                    context: { bypassUnauthorizedHandler: true },
                 });
             },
         },
-        byType: (data) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-in', { data }),
+        byType: (data) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-in', { data, context: { bypassUnauthorizedHandler: true } }),
         telegram: (data) => apiClientFactory_1.apiClientV2.postRequest(exports.telegramSignInPath, { data }),
         password: (email, password // check on backend V2
         ) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-in/password/email', {
             data: { email, password },
+            context: { bypassUnauthorizedHandler: true },
         }),
     },
     signup: {
-        byType: (data) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-up', { data }),
+        byType: (data) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-up', { data, context: { bypassUnauthorizedHandler: true } }),
         password: (email, password) => apiClientFactory_1.apiClientV2.postRequest('/auth/sign-up/password/email', {
             data: { email, password },
+            context: { bypassUnauthorizedHandler: true },
         }),
         telegram: (data) => apiClientFactory_1.apiClientV2.postRequest(exports.telegramSignUpPath, { data }),
     },

package/dist/utils/apiClientFactory.js

@@ -30,43 +30,44 @@ const sdk_react_1 = require("@telegram-apps/sdk-react");
 const axios_1 = __importDefault(require("axios"));
 const auth_1 = require("../api/auth");
 const constants_1 = require("../constants");
-const storage_1 = require("../utils/storage");
-const tokensFactory_1 = require("../utils/tokensFactory");
+const tokensFactory_1 = require("./tokensFactory");
 // eslint-disable-next-line no-constant-condition
 const apiV1BaseURL = (_a = process.env.API_URL) !== null && _a !== void 0 ? _a : 'ENV variable API_URL is not defined';
 const apiV2BaseURL = (_b = process.env.API_V2_URL) !== null && _b !== void 0 ? _b : 'ENV variable API_V2_URL is not defined';
 const apiTOTPBaseURL = (_c = process.env.API_TOTP_URL) !== null && _c !== void 0 ? _c : 'ENV variable API_TOTP_URL is not defined';
 const envTenantId = (_d = process.env.TENANT_ID) !== null && _d !== void 0 ? _d : 'ENV variable TENANT_ID is not defined';
 const envLogoutURL = (_e = process.env.LOGOUT_URL) !== null && _e !== void 0 ? _e : '/auth/logout';
+let isTokenRefreshing = false;
+let requestQueue = [];
 const createApiClient = ({ baseURL, isBearerToken, tenantId }) => {
     const instance = axios_1.default.create({
         baseURL,
         timeout: 60000,
     });
     instance.interceptors.request.use((config) => {
-        const access_token = (0, storage_1.getFromLocalStorage)('access_token');
-        const modifiedHeaders = Object.assign(Object.assign({}, config.headers), { 'App-Enviroment': (0, sdk_react_1.isTMA)() ? constants_1.AppEnviroment.TELEGRAM : constants_1.AppEnviroment.WEB, 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*', 'x-tenant-id': tenantId });
+        const { access_token } = (0, tokensFactory_1.getTokens)();
+        const modifiedHeaders = Object.assign(Object.assign({}, config.headers), { 'Content-Type': 'application/json', 'x-tenant-id': tenantId });
         if (access_token) {
             const authHeader = isBearerToken ? `Bearer ${access_token}` : access_token;
             modifiedHeaders.Authorization = authHeader;
         }
+        config.context = Object.assign(Object.assign({}, config.context), { appEnvironment: (0, sdk_react_1.isTMA)() ? constants_1.AppEnviroment.TELEGRAM : constants_1.AppEnviroment.WEB });
         return Object.assign(Object.assign({}, config), { headers: modifiedHeaders });
     });
-    let isTokenRefreshing = false;
-    let requestQueue = [];
     instance.interceptors.response.use((response) => response, (error) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (typeof window === 'undefined') {
             return Promise.reject(error);
         }
-        if (((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === constants_1.ResponseStatus.UNAUTHORIZED) {
-            const { response, config: failedRequest } = error;
-            const refreshToken = (0, storage_1.getFromLocalStorage)('refresh_token');
-            const isRetryRequest = failedRequest.headers['X-Retry-Request'];
-            const isRefreshTokenRequest = (_b = response === null || response === void 0 ? void 0 : response.config) === null || _b === void 0 ? void 0 : _b.url.includes(auth_1.refreshTokenPath);
-            const isTelegramSignInRequest = (_c = response === null || response === void 0 ? void 0 : response.config) === null || _c === void 0 ? void 0 : _c.url.includes(auth_1.telegramSignInPath);
-            const isTelegramSignUpRequest = (_d = response === null || response === void 0 ? void 0 : response.config) === null || _d === void 0 ? void 0 : _d.url.includes(auth_1.telegramSignUpPath);
-            const isRefreshNotRequired = !refreshToken && !(0, sdk_react_1.isTMA)();
+        if (((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === constants_1.ResponseStatus.UNAUTHORIZED &&
+            !((_c = (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.config.context) === null || _c === void 0 ? void 0 : _c.bypassUnauthorizedHandler)) {
+            const { response, config: failedRequestConfig } = error;
+            const { refresh_token } = (0, tokensFactory_1.getTokens)();
+            const isRetryRequest = (_d = failedRequestConfig.context) === null || _d === void 0 ? void 0 : _d.isRetryRequest;
+            const isRefreshTokenRequest = (_e = failedRequestConfig.url) === null || _e === void 0 ? void 0 : _e.includes(auth_1.refreshTokenPath);
+            const isTelegramSignInRequest = (_f = failedRequestConfig.url) === null || _f === void 0 ? void 0 : _f.includes(auth_1.telegramSignInPath);
+            const isTelegramSignUpRequest = (_g = failedRequestConfig.url) === null || _g === void 0 ? void 0 : _g.includes(auth_1.telegramSignUpPath);
+            const isRefreshNotRequired = !refresh_token && !(0, sdk_react_1.isTMA)();
             const isLogoutNeccesary = isRefreshNotRequired ||
                 isTelegramSignInRequest ||
                 isTelegramSignUpRequest ||
@@ -105,10 +106,10 @@ const createApiClient = ({ baseURL, isBearerToken, tenantId }) => {
             return new Promise((res, rej) => {
                 requestQueue.push({
                     resolve: () => {
-                        failedRequest.headers['X-Retry-Request'] = 'true';
-                        return res(instance(failedRequest));
+                        failedRequestConfig.context = Object.assign(Object.assign({}, failedRequestConfig.context), { isRetryRequest: true });
+                        return res(instance(failedRequestConfig));
                     },
-                    reject: () => rej(instance(failedRequest)),
+                    reject: () => rej(instance(failedRequestConfig)),
                 });
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squarefi-bff-api-module",
-  "version": "1.25.6",
+  "version": "1.26.1",
   "description": "Squarefi BFF API client module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/api/auth.ts

@@ -15,24 +15,27 @@ export const auth = {
       email: (email: string, token: string): Promise<API.Auth.VerifyOtp.Response> =>
         apiClientV2.postRequest<API.Auth.VerifyOtp.Response>('/auth/verify/email/otp', {
           data: { email, token, type: 'email' },
+          context: { bypassUnauthorizedHandler: true },
         }),
       phone: (phone: string, token: string): Promise<API.Auth.VerifyOtp.Response> =>
         apiClientV2.postRequest<API.Auth.VerifyOtp.Response>('/auth/verify/phone/otp', {
           data: { phone: convertPhoneToSupabaseFormat(phone), token, type: 'sms' },
+          context: { bypassUnauthorizedHandler: true },
         }),
     },
   },
   signin: {
     omni: {
       email: (data: API.Auth.SignIn.Omni.Email.OTP.Request): Promise<API.Auth.Tokens> =>
-        apiClientV2.postRequest('/auth/sign-in/omni/email/otp', { data }),
+        apiClientV2.postRequest('/auth/sign-in/omni/email/otp', { data, context: { bypassUnauthorizedHandler: true } }),
       phone: ({ phone, ...data }: API.Auth.SignIn.Omni.Phone.OTP.Request): Promise<API.Auth.Tokens> =>
         apiClientV2.postRequest('/auth/sign-in/omni/phone/otp', {
           data: { phone: convertPhoneToSupabaseFormat(phone), ...data },
+          context: { bypassUnauthorizedHandler: true },
         }),
     },
     byType: (data: API.Auth.SignIn.ByType.Request): Promise<API.Auth.Tokens> =>
-      apiClientV2.postRequest('/auth/sign-in', { data }),
+      apiClientV2.postRequest('/auth/sign-in', { data, context: { bypassUnauthorizedHandler: true } }),
     telegram: (data: API.Auth.Telegram.Signin.Request): Promise<API.Auth.Telegram.Signin.Response> =>
       apiClientV2.postRequest<API.Auth.Telegram.Signin.Response>(telegramSignInPath, { data }),
     password: (
@@ -41,14 +44,16 @@ export const auth = {
     ): Promise<API.Auth.Tokens> =>
       apiClientV2.postRequest<API.Auth.Tokens>('/auth/sign-in/password/email', {
         data: { email, password },
+        context: { bypassUnauthorizedHandler: true },
       }),
   },
   signup: {
     byType: (data: API.Auth.SignUp.ByType.Request): Promise<API.Auth.Tokens> =>
-      apiClientV2.postRequest('/auth/sign-up', { data }),
+      apiClientV2.postRequest('/auth/sign-up', { data, context: { bypassUnauthorizedHandler: true } }),
     password: (email: string, password: string): Promise<API.Auth.Tokens> =>
       apiClientV2.postRequest<API.Auth.Tokens>('/auth/sign-up/password/email', {
         data: { email, password },
+        context: { bypassUnauthorizedHandler: true },
       }),
     telegram: (data: API.Auth.Telegram.Signup.Request): Promise<API.Auth.Telegram.Signup.Response> =>
       apiClientV2.postRequest<API.Auth.Telegram.Signup.Response>(telegramSignUpPath, { data }),

package/src/utils/apiClientFactory.ts

@@ -1,12 +1,12 @@
 /* eslint-disable no-console */
 import { isTMA } from '@telegram-apps/sdk-react';
-import axios, { AxiosRequestConfig, InternalAxiosRequestConfig } from 'axios';
+import axios, { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 
 import { telegramSignUpPath, telegramSignInPath, refreshTokenPath } from '../api/auth';
 
 import { AppEnviroment, ResponseStatus } from '../constants';
-import { getFromLocalStorage } from '../utils/storage';
-import { deleteTokens, refreshTokens } from '../utils/tokensFactory';
+
+import { deleteTokens, getTokens, refreshTokens } from './tokensFactory';
 
 // eslint-disable-next-line no-constant-condition
 
@@ -16,31 +16,37 @@ const apiTOTPBaseURL = process.env.API_TOTP_URL ?? 'ENV variable API_TOTP_URL is
 const envTenantId = process.env.TENANT_ID ?? 'ENV variable TENANT_ID is not defined';
 const envLogoutURL = process.env.LOGOUT_URL ?? '/auth/logout';
 
+type AxiosError = {
+  response: AxiosResponse;
+  config: InternalAxiosRequestConfig;
+};
+
 type CreateApiClientOptions = {
   baseURL: string;
   tenantId: string;
   isBearerToken?: boolean;
 };
 
-export const createApiClient = ({ baseURL, isBearerToken, tenantId }: CreateApiClientOptions) => {
-  type RequestQueueItem = {
-    resolve: Function;
-    reject: Function;
-  };
+type RequestQueueItem = {
+  resolve: Function;
+  reject: Function;
+};
+
+let isTokenRefreshing = false;
+let requestQueue: RequestQueueItem[] = [];
 
+export const createApiClient = ({ baseURL, isBearerToken, tenantId }: CreateApiClientOptions) => {
   const instance = axios.create({
     baseURL,
     timeout: 60000,
   });
 
   instance.interceptors.request.use((config) => {
-    const access_token = getFromLocalStorage('access_token');
+    const { access_token } = getTokens();
 
     const modifiedHeaders = {
       ...config.headers,
-      'App-Enviroment': isTMA() ? AppEnviroment.TELEGRAM : AppEnviroment.WEB,
       'Content-Type': 'application/json',
-      'Access-Control-Allow-Origin': '*',
       'x-tenant-id': tenantId,
     };
 
@@ -49,27 +55,29 @@ export const createApiClient = ({ baseURL, isBearerToken, tenantId }: CreateApiC
       modifiedHeaders.Authorization = authHeader;
     }
 
+    config.context = { ...config.context, appEnvironment: isTMA() ? AppEnviroment.TELEGRAM : AppEnviroment.WEB };
+
     return { ...config, headers: modifiedHeaders } as unknown as InternalAxiosRequestConfig;
   });
 
-  let isTokenRefreshing = false;
-  let requestQueue: RequestQueueItem[] = [];
-
   instance.interceptors.response.use(
     (response) => response,
-    (error) => {
+    (error: AxiosError) => {
       if (typeof window === 'undefined') {
         return Promise.reject(error);
       }
-      if (error?.response?.status === ResponseStatus.UNAUTHORIZED) {
-        const { response, config: failedRequest } = error;
-        const refreshToken = getFromLocalStorage('refresh_token');
-        const isRetryRequest = failedRequest.headers['X-Retry-Request'];
-
-        const isRefreshTokenRequest = response?.config?.url.includes(refreshTokenPath);
-        const isTelegramSignInRequest = response?.config?.url.includes(telegramSignInPath);
-        const isTelegramSignUpRequest = response?.config?.url.includes(telegramSignUpPath);
-        const isRefreshNotRequired = !refreshToken && !isTMA();
+      if (
+        error?.response?.status === ResponseStatus.UNAUTHORIZED &&
+        !error?.response?.config.context?.bypassUnauthorizedHandler
+      ) {
+        const { response, config: failedRequestConfig } = error;
+        const { refresh_token } = getTokens();
+        const isRetryRequest = failedRequestConfig.context?.isRetryRequest;
+
+        const isRefreshTokenRequest = failedRequestConfig.url?.includes(refreshTokenPath);
+        const isTelegramSignInRequest = failedRequestConfig.url?.includes(telegramSignInPath);
+        const isTelegramSignUpRequest = failedRequestConfig.url?.includes(telegramSignUpPath);
+        const isRefreshNotRequired = !refresh_token && !isTMA();
         const isLogoutNeccesary =
           isRefreshNotRequired ||
           isTelegramSignInRequest ||
@@ -111,10 +119,10 @@ export const createApiClient = ({ baseURL, isBearerToken, tenantId }: CreateApiC
         return new Promise((res, rej) => {
           requestQueue.push({
             resolve: () => {
-              failedRequest.headers['X-Retry-Request'] = 'true';
-              return res(instance(failedRequest));
+              failedRequestConfig.context = { ...failedRequestConfig.context, isRetryRequest: true };
+              return res(instance(failedRequestConfig));
             },
-            reject: () => rej(instance(failedRequest)),
+            reject: () => rej(instance(failedRequestConfig)),
           });
         });
       }

package/src/utils/tokensFactory.ts

@@ -1,4 +1,4 @@
-import { initData, isTMA, miniApp, init as initTelegramSDK } from '@telegram-apps/sdk-react';
+import { initData, isTMA } from '@telegram-apps/sdk-react';
 
 import { deleteFromLocalStorage, getFromLocalStorage, setToLocalStorage } from './storage';
 

package/tsconfig.json

@@ -10,6 +10,6 @@
     "forceConsistentCasingInFileNames": true,
     "moduleResolution": "node"
   },
-  "include": ["src"],
+  "include": ["src", "types.d.ts"],
   "exclude": ["node_modules", "dist", "**/__tests__/*"]
 }

package/types.d.ts

@@ -0,0 +1,11 @@
+import 'axios';
+
+declare module 'axios' {
+  export interface AxiosRequestConfig {
+    context?: {
+      isRetryRequest?: boolean;
+      bypassUnauthorizedHandler?: boolean;
+      appEnvironment?: AppEnviroment;
+    };
+  }
+}