@sunggang/ui-lib 0.2.42 → 0.2.44

package/index.esm2.js

@@ -43561,7 +43561,7 @@ function _ts_generator(thisArg, body) {
 }
 var LiffContext = /*#__PURE__*/ createContext(undefined);
 var LiffProvider = function(param) {
-    var children = param.children, liffId = param.liffId, _param_localStorageKey = param.localStorageKey, localStorageKey = _param_localStorageKey === void 0 ? "one-gobo-global-login" : _param_localStorageKey, checkTokenUrl = param.checkTokenUrl, loginUrl = param.loginUrl, memberInfoUrl = param.memberInfoUrl, _param_openInApp = param.openInApp, openInApp = _param_openInApp === void 0 ? false : _param_openInApp, _param_ignoreCheckAddFriend = param.ignoreCheckAddFriend, ignoreCheckAddFriend = _param_ignoreCheckAddFriend === void 0 ? false : _param_ignoreCheckAddFriend, _param_ignoreRoute = param.ignoreRoute, ignoreRoute = _param_ignoreRoute === void 0 ? false : _param_ignoreRoute, customerRedirectUrl = param.customerRedirectUrl, inviteCode = param.inviteCode, handleLoginError = param.handleLoginError;
+    var children = param.children, liffId = param.liffId, _param_localStorageKey = param.localStorageKey, localStorageKey = _param_localStorageKey === void 0 ? "one-gobo-global-login" : _param_localStorageKey, checkTokenUrl = param.checkTokenUrl, loginUrl = param.loginUrl, memberInfoUrl = param.memberInfoUrl, _param_openInApp = param.openInApp, openInApp = _param_openInApp === void 0 ? false : _param_openInApp, _param_ignoreCheckAddFriend = param.ignoreCheckAddFriend, ignoreCheckAddFriend = _param_ignoreCheckAddFriend === void 0 ? false : _param_ignoreCheckAddFriend, _param_ignoreRoute = param.ignoreRoute, ignoreRoute = _param_ignoreRoute === void 0 ? false : _param_ignoreRoute, _param_loginByUser = param.loginByUser, loginByUser = _param_loginByUser === void 0 ? false : _param_loginByUser, customerRedirectUrl = param.customerRedirectUrl, inviteCode = param.inviteCode, handleLoginError = param.handleLoginError;
     var _useState = _sliced_to_array(useState(null), 2), liffObject = _useState[0], setLiffObject = _useState[1];
     var _useState1 = _sliced_to_array(useState(""), 2), accessToken = _useState1[0], setAccessToken = _useState1[1];
     var _useState2 = _sliced_to_array(useState(null), 2), liffError = _useState2[0], setLiffError = _useState2[1];
@@ -43651,11 +43651,16 @@ var LiffProvider = function(param) {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
+                        if (!loginUrl) return [
+                            2
+                        ];
+                        _state.label = 1;
+                    case 1:
                         _state.trys.push([
-                            0,
-                            2,
+                            1,
+                            3,
                             ,
-                            3
+                            4
                         ]);
                         return [
                             4,
@@ -43670,7 +43675,7 @@ var LiffProvider = function(param) {
                                 })
                             })
                         ];
-                    case 1:
+                    case 2:
                         response = _state.sent();
                         resData = response;
                         if (!(resData === null || resData === void 0 ? void 0 : (_resData_data = resData.data) === null || _resData_data === void 0 ? void 0 : _resData_data.access_token.startsWith("Bearer "))) {
@@ -43687,16 +43692,16 @@ var LiffProvider = function(param) {
                         }
                         return [
                             3,
-                            3
+                            4
                         ];
-                    case 2:
+                    case 3:
                         err = _state.sent();
                         console.error(err.toString());
                         return [
                             3,
-                            3
+                            4
                         ];
-                    case 3:
+                    case 4:
                         return [
                             2
                         ];
@@ -43755,7 +43760,7 @@ var LiffProvider = function(param) {
                         // 未登入先進行登入
                         if (!liff.isLoggedIn()) {
                             redirectUri = customerRedirectUrl || "".concat(window.location.href);
-                            if (ignoreRoute) return [
+                            if (loginByUser || ignoreRoute) return [
                                 2
                             ];
                             liff.login({
@@ -43801,18 +43806,18 @@ var LiffProvider = function(param) {
     useEffect(function() {
         var checkAndInitialize = function() {
             var _ref = _async_to_generator(function() {
-                var loginStore, jwtToken, _parsedStore_data, parsedStore, _parsedStore_data_access_token, isValid, _tmp;
+                var loginStore, jwtToken, _parsedStore_data, parsedStore, isValid, _tmp, testIsValid;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
                             loginStore = window.localStorage.getItem(localStorageKey);
-                            jwtToken = null;
+                            jwtToken = "";
                             if (loginStore) {
                                 try {
                                     ;
                                     parsedStore = JSON.parse(loginStore);
-                                    ;
-                                    jwtToken = (_parsedStore_data_access_token = parsedStore === null || parsedStore === void 0 ? void 0 : (_parsedStore_data = parsedStore.data) === null || _parsedStore_data === void 0 ? void 0 : _parsedStore_data.access_token) !== null && _parsedStore_data_access_token !== void 0 ? _parsedStore_data_access_token : null;
+                                    console.log("parsedStore: ", parsedStore);
+                                    jwtToken = (parsedStore === null || parsedStore === void 0 ? void 0 : (_parsedStore_data = parsedStore.data) === null || _parsedStore_data === void 0 ? void 0 : _parsedStore_data.access_token) || "";
                                 } catch (err) {
                                     console.error("LocalStorage 解析失敗:", err);
                                 }
@@ -43836,12 +43841,19 @@ var LiffProvider = function(param) {
                             _state.label = 3;
                         case 3:
                             isValid = _tmp;
-                            console.log("token isValid: ", isValid);
                             return [
                                 4,
-                                initializeLiff(isValid)
+                                checkTokenFunc(jwtToken)
                             ];
                         case 4:
+                            testIsValid = _state.sent();
+                            console.log("token valid: ", isValid);
+                            console.log("test Valid: ", testIsValid);
+                            return [
+                                4,
+                                initializeLiff(isValid)
+                            ];
+                        case 5:
                             _state.sent();
                             return [
                                 2
@@ -43872,6 +43884,9 @@ var LiffProvider = function(param) {
             liffError: liffError,
             initializeLiff: function() {
                 return initializeLiff(false);
+            },
+            loginInit: function(lineToken) {
+                return loginInit(lineToken);
             }
         };
     }, [
@@ -43879,7 +43894,8 @@ var LiffProvider = function(param) {
         loginData,
         userInfo,
         accessToken,
-        liffError
+        liffError,
+        loginInit
     ]);
     // 只在 liffObject 有值且已登入時渲染子組件
     return /*#__PURE__*/ jsx(LiffContext.Provider, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sunggang/ui-lib",
-  "version": "0.2.42",
+  "version": "0.2.44",
   "dependencies": {
     "@iconify/react": "^4.1.1",
     "@mdx-js/react": "^3.0.1",

package/src/lib/Provider/LiffProvider.d.ts

@@ -8,16 +8,17 @@ type LiffContextType = {
     initializeLiff: () => Promise<void>;
 };
 export declare const LiffContext: React.Context<LiffContextType | undefined>;
-export declare const LiffProvider: ({ children, liffId, localStorageKey, checkTokenUrl, loginUrl, memberInfoUrl, openInApp, ignoreCheckAddFriend, ignoreRoute, customerRedirectUrl, inviteCode, handleLoginError, }: {
+export declare const LiffProvider: ({ children, liffId, localStorageKey, checkTokenUrl, loginUrl, memberInfoUrl, openInApp, ignoreCheckAddFriend, ignoreRoute, loginByUser, customerRedirectUrl, inviteCode, handleLoginError, }: {
     children: React.ReactNode;
     liffId: string;
     localStorageKey: string;
     checkTokenUrl: string;
-    loginUrl: string;
+    loginUrl?: string | undefined;
     memberInfoUrl: string;
     openInApp?: boolean | undefined;
     ignoreCheckAddFriend?: boolean | undefined;
     ignoreRoute?: boolean | undefined;
+    loginByUser?: boolean | undefined;
     customerRedirectUrl?: string | undefined;
     inviteCode?: string | undefined;
     handleLoginError?: (() => void) | undefined;