tek-wallet 0.0.27 → 0.0.29

package/dist/components/ui/RequireConnect/index.js

@@ -52,11 +52,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var DrawerComponent_1 = __importStar(require("../DrawerComponent"));
 var AuthView_1 = __importDefault(require("../../../components/views/AuthView"));
 var cn_1 = __importDefault(require("../../../utils/cn"));
-var useTekWallet_1 = __importDefault(require("../../../hooks/useTekWallet"));
+var hooks_1 = require("../../../store/hooks");
 function RequireConnect(_a) {
     var children = _a.children, props = __rest(_a, ["children"]);
     var className = props.className;
-    var isAuthenticated = (0, useTekWallet_1.default)().isAuthenticated;
+    var isAuthenticated = (0, hooks_1.useAppSelector)(function (state) { return state.auth; }).isAuthenticated;
     if (!isAuthenticated) {
         return ((0, jsx_runtime_1.jsx)(DrawerComponent_1.default, { direction: DrawerComponent_1.DRAWER_DIRECTION.RIGHT, trigger: (0, jsx_runtime_1.jsxs)("button", { className: (0, cn_1.default)("relative", className), children: [children, " ", (0, jsx_runtime_1.jsx)("div", { className: "absolute inset-0 z-10" })] }), children: (0, jsx_runtime_1.jsx)(AuthView_1.default, {}) }));
     }

package/dist/components/views/CreateWalletView/index.js

@@ -88,7 +88,8 @@ var Text_1 = __importDefault(require("../../../components/ui/Text"));
 var createWalletService_1 = __importDefault(require("../../../services/axios/create-wallet-service/createWalletService"));
 // import { signIn } from "next-auth/react";
 var importWalletIntenalService_1 = __importDefault(require("../../../services/axios/import-wallet-service/importWalletIntenalService"));
-var useLogin_1 = __importDefault(require("../../../hooks/useLogin"));
+var hooks_1 = require("../../../store/hooks");
+var authThunk_1 = require("../../../store/auth/authThunk");
 var ImportWalletViewStep;
 (function (ImportWalletViewStep) {
     ImportWalletViewStep[ImportWalletViewStep["CREATE_PASSCODE"] = 0] = "CREATE_PASSCODE";
@@ -101,7 +102,7 @@ var ImportWalletView = function (props) {
     var swiperControlledRef = (0, react_2.useRef)(null);
     var childPageLayoutRef = (0, react_2.useRef)(null);
     var _c = (0, react_2.useState)(ImportWalletViewStep.CREATE_PASSCODE), currentStep = _c[0], setCurrentStep = _c[1];
-    var update = (0, useLogin_1.default)().update;
+    var dispatch = (0, hooks_1.useAppDispatch)();
     var gotoStep = function (step) {
         var _a;
         setCurrentStep(step);
@@ -174,7 +175,7 @@ var ImportWalletView = function (props) {
                             console.warn("🚀 ~ Promise.allSettled ~ importInternalResponse:", importInternalResponse);
                             if (importInternalResponse === null || importInternalResponse === void 0 ? void 0 : importInternalResponse.success) {
                                 (_a = childPageLayoutRef.current) === null || _a === void 0 ? void 0 : _a.showSuccess();
-                                update();
+                                dispatch((0, authThunk_1.update)());
                             }
                             else {
                                 (_b = childPageLayoutRef.current) === null || _b === void 0 ? void 0 : _b.showError();

package/dist/hooks/{useLogin.d.ts → useLogin_bk.d.ts}

@@ -1,10 +1,9 @@
 import { LoginInfoResponse } from "../app/api/tek-wallet/type";
-import { LoginStatus } from "./type";
 declare function useLogin(): {
     session: LoginInfoResponse | undefined;
     isLoading: boolean;
-    status: LoginStatus | undefined;
-    setStatus: import("react").Dispatch<import("react").SetStateAction<LoginStatus | undefined>>;
     update: () => Promise<void>;
+    disconnect: () => Promise<void>;
+    isAuthenticated: boolean;
 };
 export default useLogin;

package/dist/hooks/{useLogin.js → useLogin_bk.js}

@@ -41,12 +41,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var loginIntenalService_1 = __importDefault(require("../services/axios/login-internal/loginIntenalService"));
-var type_1 = require("./type");
+var authSlice_1 = require("../store/auth/authSlice");
+var loginIntenalService_2 = __importDefault(require("../services/axios/sign-out-internal/loginIntenalService"));
+var hooks_1 = require("../store/hooks");
 function useLogin() {
     var _this = this;
     var _a = (0, react_1.useState)(), session = _a[0], setSession = _a[1];
     var _b = (0, react_1.useState)(false), isLoading = _b[0], setIsLoading = _b[1];
-    var _c = (0, react_1.useState)(), status = _c[0], setStatus = _c[1];
+    var _c = (0, react_1.useState)(false), isAuthenticated = _c[0], setIsAuthenticated = _c[1];
+    var dispatch = (0, hooks_1.useAppDispatch)();
     var update = function () { return __awaiter(_this, void 0, void 0, function () {
         var response;
         return __generator(this, function (_a) {
@@ -60,22 +63,37 @@ function useLogin() {
                     if (response.success) {
                         console.warn("🚀 ~ update ~ response:", response.message);
                         setSession(response.data);
-                        setStatus(type_1.LoginStatus.AUTHENTICATED);
+                        setIsAuthenticated(true);
                     }
                     else {
-                        setStatus(type_1.LoginStatus.UNAUTHENTICATED);
+                        setIsAuthenticated(false);
                     }
                     setIsLoading(false);
                     return [2 /*return*/];
             }
         });
     }); };
+    var disconnect = function () { return __awaiter(_this, void 0, void 0, function () {
+        var response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, loginIntenalService_2.default)()];
+                case 1:
+                    response = _a.sent();
+                    if (response.success) {
+                        dispatch((0, authSlice_1.setAccessToken)(undefined));
+                        setIsAuthenticated(false);
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     return {
         session: session,
         isLoading: isLoading,
-        status: status,
-        setStatus: setStatus,
         update: update,
+        disconnect: disconnect,
+        isAuthenticated: isAuthenticated,
     };
 }
 exports.default = useLogin;

package/dist/hooks/useTekWallet.d.ts

@@ -1,7 +1,7 @@
 declare function useTekWallet(): {
     tokens: import("../services/axios/get-balance-service/type").Balance[] | undefined;
     updateTokens: () => void;
-    disconnect: () => Promise<void>;
-    isAuthenticated: boolean;
+    disconnect: () => void;
+    isAuthenticated: boolean | undefined;
 };
 export default useTekWallet;

package/dist/hooks/useTekWallet.js

@@ -1,79 +1,25 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+var authThunk_1 = require("./../store/auth/authThunk");
 var react_redux_1 = require("react-redux");
 var react_redux_2 = require("react-redux");
 var tokenThunk_1 = require("../store/tokens/tokenThunk");
-var useLogin_1 = __importDefault(require("./useLogin"));
-var type_1 = require("./type");
-var loginIntenalService_1 = __importDefault(require("../services/axios/sign-out-internal/loginIntenalService"));
-var authSlice_1 = require("../store/auth/authSlice");
+var hooks_1 = require("../store/hooks");
 function useTekWallet() {
-    var _this = this;
     var dispatch = (0, react_redux_2.useDispatch)();
     var tokens = (0, react_redux_1.useSelector)(function (state) { return state.tokens; }).tokens;
-    var _a = (0, useLogin_1.default)(), status = _a.status, setStatus = _a.setStatus;
+    var isAuthenticated = (0, hooks_1.useAppSelector)(function (state) { return state.auth; }).isAuthenticated;
+    var disconnect = function () {
+        dispatch((0, authThunk_1.disconnectWallet)());
+    };
     var updateTokens = function () {
         dispatch((0, tokenThunk_1.getBalanceThunk)());
     };
-    var disconnect = function () { return __awaiter(_this, void 0, void 0, function () {
-        var response;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, loginIntenalService_1.default)()];
-                case 1:
-                    response = _a.sent();
-                    if (response.success) {
-                        dispatch((0, authSlice_1.setAccessToken)(undefined));
-                        setStatus(type_1.LoginStatus.UNAUTHENTICATED);
-                    }
-                    return [2 /*return*/];
-            }
-        });
-    }); };
     return {
         tokens: tokens,
         updateTokens: updateTokens,
         disconnect: disconnect,
-        isAuthenticated: status === type_1.LoginStatus.AUTHENTICATED,
+        isAuthenticated: isAuthenticated,
     };
 }
 exports.default = useTekWallet;

package/dist/providers/AuthProvider/index.js

@@ -9,13 +9,12 @@ var hooks_1 = require("../../store/hooks");
 var react_1 = __importDefault(require("react"));
 var authSlice_1 = require("../../store/auth/authSlice");
 var tokenThunk_1 = require("../../store/tokens/tokenThunk");
-var useLogin_1 = __importDefault(require("../../hooks/useLogin"));
-var type_1 = require("../../hooks/type");
+var authThunk_1 = require("../../store/auth/authThunk");
 var AuthContext = react_1.default.createContext(null);
 function AuthProvider(_a) {
     var children = _a.children;
     var timeout = react_1.default.useRef(undefined);
-    var _b = (0, useLogin_1.default)(), session = _b.session, update = _b.update, status = _b.status;
+    var _b = (0, hooks_1.useAppSelector)(function (state) { return state.auth; }), session = _b.session, isAuthenticated = _b.isAuthenticated;
     var dispatch = (0, hooks_1.useAppDispatch)();
     react_1.default.useEffect(function () {
         if (session) {
@@ -26,10 +25,10 @@ function AuthProvider(_a) {
         }
     }, [session]);
     react_1.default.useEffect(function () {
-        if (status === type_1.LoginStatus.AUTHENTICATED) {
+        if (isAuthenticated) {
             dispatch((0, tokenThunk_1.getBalanceThunk)());
         }
-    }, [status]);
+    }, [isAuthenticated]);
     react_1.default.useEffect(function () {
         var _a;
         !!timeout.current && clearTimeout(timeout.current);
@@ -39,7 +38,7 @@ function AuthProvider(_a) {
         var timeDiff = Math.max(expiredTime - currentTime, 0);
         console.warn("🚀 ~ React.useEffect ~ timeDiff:", timeDiff);
         timeout.current = setTimeout(function () {
-            update();
+            dispatch((0, authThunk_1.update)());
         }, timeDiff);
         return function () { return clearTimeout(timeout.current); };
     }, [session === null || session === void 0 ? void 0 : session.expiresAt]);

package/dist/store/auth/authSlice.d.ts

@@ -1,4 +1,5 @@
 import { AuthState } from "./type";
-export declare const setAccessToken: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, "auth/setAccessToken">, setIsAuthenticated: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "auth/setIsAuthenticated">;
+import { LoginInfoResponse } from "../../app/api/tek-wallet/type";
+export declare const setAccessToken: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, "auth/setAccessToken">, setIsAuthenticated: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "auth/setIsAuthenticated">, setIsLoading: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "auth/setIsLoading">, setSession: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<LoginInfoResponse | undefined, "auth/setSession">;
 declare const _default: import("redux").Reducer<AuthState>;
 export default _default;

package/dist/store/auth/authSlice.js

@@ -1,12 +1,15 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setIsAuthenticated = exports.setAccessToken = void 0;
+exports.setSession = exports.setIsLoading = exports.setIsAuthenticated = exports.setAccessToken = void 0;
 var toolkit_1 = require("@reduxjs/toolkit");
 var userClientRequest_1 = require("../../services/axios/clients/userClientRequest");
+var authThunk_1 = require("./authThunk");
 var initialState = {
     accessToken: undefined,
     isAuthenticated: false,
+    session: undefined,
+    isLoading: false,
 };
 var authSlice = (0, toolkit_1.createSlice)({
     name: "auth",
@@ -17,10 +20,43 @@ var authSlice = (0, toolkit_1.createSlice)({
             state.accessToken = token;
             (0, userClientRequest_1.setAuthToken)(token);
         },
+        setSession: function (state, action) {
+            state.session = action.payload;
+        },
         setIsAuthenticated: function (state, action) {
             state.isAuthenticated = action.payload;
         },
+        setIsLoading: function (state, action) {
+            state.isLoading = action.payload;
+        },
+    },
+    extraReducers: function (builder) {
+        builder.addCase(authThunk_1.update.pending, function (state) {
+            state.isLoading = true;
+        });
+        builder.addCase(authThunk_1.update.fulfilled, function (state, action) {
+            var _a, _b;
+            state.isLoading = false;
+            state.session = (_a = action.payload) === null || _a === void 0 ? void 0 : _a.data;
+            console.warn("🚀 ~ builder.addCase ~ action:", (_b = action.payload) === null || _b === void 0 ? void 0 : _b.data);
+            state.isAuthenticated = true;
+        });
+        builder.addCase(authThunk_1.update.rejected, function (state) {
+            state.isLoading = false;
+            state.isAuthenticated = false;
+        });
+        builder.addCase(authThunk_1.disconnectWallet.pending, function (state) {
+            state.isLoading = true;
+        });
+        builder.addCase(authThunk_1.disconnectWallet.fulfilled, function (state, action) {
+            state.isLoading = false;
+            state.isAuthenticated = false;
+            console.warn("🚀 ~ builder.addCase ~ action:", action);
+        });
+        builder.addCase(authThunk_1.disconnectWallet.rejected, function (state) {
+            state.isLoading = false;
+        });
     },
 });
-exports.setAccessToken = (_a = authSlice.actions, _a.setAccessToken), exports.setIsAuthenticated = _a.setIsAuthenticated;
+exports.setAccessToken = (_a = authSlice.actions, _a.setAccessToken), exports.setIsAuthenticated = _a.setIsAuthenticated, exports.setIsLoading = _a.setIsLoading, exports.setSession = _a.setSession;
 exports.default = authSlice.reducer;

package/dist/store/auth/authThunk.d.ts

@@ -1,4 +1,14 @@
-export declare const createWallet: import("@reduxjs/toolkit").AsyncThunk<import("../../services/axios/create-wallet-service/type").CreateWalletServiceResponse, any, {
+export declare const update: import("@reduxjs/toolkit").AsyncThunk<import("../../app/api/tek-wallet/auth/login/route").LoginResponse | undefined, void, {
+    state?: unknown;
+    dispatch?: import("redux-thunk").ThunkDispatch<unknown, unknown, import("redux").UnknownAction>;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
+export declare const disconnectWallet: import("@reduxjs/toolkit").AsyncThunk<import("../../app/api/tek-wallet/auth/signout/route").SignOutResponse, void, {
     state?: unknown;
     dispatch?: import("redux-thunk").ThunkDispatch<unknown, unknown, import("redux").UnknownAction>;
     extra?: unknown;

package/dist/store/auth/authThunk.js

@@ -39,24 +39,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWallet = void 0;
+exports.disconnectWallet = exports.update = void 0;
 var toolkit_1 = require("@reduxjs/toolkit");
-var createWalletService_1 = __importDefault(require("../../services/axios/create-wallet-service/createWalletService"));
-exports.createWallet = (0, toolkit_1.createAsyncThunk)("auth/createWallet", function (payload_1, _a) { return __awaiter(void 0, [payload_1, _a], void 0, function (payload, _b) {
+var loginIntenalService_1 = __importDefault(require("../../services/axios/login-internal/loginIntenalService"));
+var loginIntenalService_2 = __importDefault(require("../../services/axios/sign-out-internal/loginIntenalService"));
+exports.update = (0, toolkit_1.createAsyncThunk)("auth/update", function () { return __awaiter(void 0, void 0, void 0, function () {
     var response, error_1;
-    var rejectWithValue = _b.rejectWithValue;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
-                _c.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, (0, createWalletService_1.default)(payload)];
+                _a.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, (0, loginIntenalService_1.default)()];
             case 1:
-                response = _c.sent();
+                response = _a.sent();
                 return [2 /*return*/, response];
             case 2:
-                error_1 = _c.sent();
-                return [2 /*return*/, rejectWithValue(error_1)];
+                error_1 = _a.sent();
+                console.error("🚀 ~ error:", error_1);
+                return [3 /*break*/, 3];
             case 3: return [2 /*return*/];
         }
     });
 }); });
+exports.disconnectWallet = (0, toolkit_1.createAsyncThunk)("auth/disconnect", function () { return __awaiter(void 0, void 0, void 0, function () {
+    var response;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, (0, loginIntenalService_2.default)()];
+            case 1:
+                response = _a.sent();
+                return [2 /*return*/, response];
+        }
+    });
+}); });

package/dist/store/auth/type.d.ts

@@ -1,4 +1,7 @@
+import { LoginInfoResponse } from "../../app/api/tek-wallet/type";
 export interface AuthState {
     accessToken?: string;
     isAuthenticated?: boolean;
+    session?: LoginInfoResponse;
+    isLoading?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tek-wallet",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "A custom React provider with TypeScript support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",