@sunggang/ui-lib 0.3.52 → 0.3.54

package/index.esm2.js

@@ -78640,6 +78640,30 @@ var LiffProvider = function(param) {
     var _useState4 = _sliced_to_array(useState(null), 2), userInfo = _useState4[0], setUserInfo = _useState4[1];
     var _useState5 = _sliced_to_array(useState(null), 2), isFriendship = _useState5[0], setFriendship = _useState5[1];
     var _useState6 = _sliced_to_array(useState(null), 2), loginType = _useState6[0], setLoginType = _useState6[1];
+    // userInfo 的 localStorage key
+    var userInfoStorageKey = "".concat(localStorageKey, "-userInfo");
+    // 從 localStorage 載入 userInfo
+    var loadUserInfoFromStorage = function() {
+        try {
+            var storedUserInfo = window.localStorage.getItem(userInfoStorageKey);
+            if (storedUserInfo) {
+                var parsedUserInfo = JSON.parse(storedUserInfo);
+                setUserInfo(parsedUserInfo);
+                return parsedUserInfo;
+            }
+        } catch (err) {
+            console.error("載入 userInfo 失敗:", err);
+        }
+        return null;
+    };
+    // 儲存 userInfo 到 localStorage
+    var saveUserInfoToStorage = function(info) {
+        try {
+            window.localStorage.setItem(userInfoStorageKey, JSON.stringify(info));
+        } catch (err) {
+            console.error("儲存 userInfo 失敗:", err);
+        }
+    };
     var fetchMemberInfo = function() {
         var _ref = _async_to_generator(function(token) {
             var response, err;
@@ -78665,7 +78689,9 @@ var LiffProvider = function(param) {
                         ];
                     case 2:
                         response = _state.sent();
+                        console.log("provider fetch member");
                         setUserInfo(response);
+                        saveUserInfoToStorage(response);
                         return [
                             3,
                             4
@@ -78695,6 +78721,7 @@ var LiffProvider = function(param) {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
+                        console.log(checkTokenUrl, memberInfoUrl);
                         if (!checkTokenUrl) return [
                             2
                         ];
@@ -78702,9 +78729,9 @@ var LiffProvider = function(param) {
                     case 1:
                         _state.trys.push([
                             1,
-                            3,
+                            6,
                             ,
-                            4
+                            7
                         ]);
                         return [
                             4,
@@ -78714,26 +78741,43 @@ var LiffProvider = function(param) {
                         ];
                     case 2:
                         response = _state.sent();
-                        if ((response === null || response === void 0 ? void 0 : response.status) && (response === null || response === void 0 ? void 0 : response.data)) {
-                            setAccessToken(token);
-                            if (memberInfoUrl) fetchMemberInfo(token);
-                            return [
-                                2,
-                                true
-                            ];
-                        }
-                        return [
+                        if (!((response === null || response === void 0 ? void 0 : response.status) && (response === null || response === void 0 ? void 0 : response.data))) return [
+                            3,
+                            5
+                        ];
+                        setAccessToken(token);
+                        if (!memberInfoUrl) return [
                             3,
                             4
                         ];
+                        return [
+                            4,
+                            fetchMemberInfo(token)
+                        ];
                     case 3:
+                        _state.sent();
+                        _state.label = 4;
+                    case 4:
+                        return [
+                            2,
+                            true
+                        ];
+                    case 5:
+                        return [
+                            3,
+                            7
+                        ];
+                    case 6:
                         err = _state.sent();
                         console.error(err);
+                        // token 無效時清除 userInfo
+                        setUserInfo(null);
+                        window.localStorage.removeItem(userInfoStorageKey);
                         return [
                             3,
-                            4
+                            7
                         ];
-                    case 4:
+                    case 7:
                         return [
                             2,
                             false
@@ -78759,9 +78803,9 @@ var LiffProvider = function(param) {
                     case 1:
                         _state.trys.push([
                             1,
-                            3,
+                            7,
                             ,
-                            4
+                            8
                         ]);
                         return [
                             4,
@@ -78785,26 +78829,46 @@ var LiffProvider = function(param) {
                         }
                         window.localStorage.setItem(localStorageKey, JSON.stringify(resData));
                         loginToken = resData === null || resData === void 0 ? void 0 : (_resData_data1 = resData.data) === null || _resData_data1 === void 0 ? void 0 : _resData_data1.access_token;
-                        if (loginToken) {
-                            setAccessToken(loginToken);
-                            setLoginType("line");
-                            if (memberInfoUrl) fetchMemberInfo(loginToken);
-                        } else {
-                            setUserInfo(response);
-                            if (handleLoginError) handleLoginError();
-                        }
-                        return [
+                        if (!loginToken) return [
+                            3,
+                            5
+                        ];
+                        setAccessToken(loginToken);
+                        setLoginType("line");
+                        if (!memberInfoUrl) return [
                             3,
                             4
                         ];
+                        return [
+                            4,
+                            fetchMemberInfo(loginToken)
+                        ];
                     case 3:
+                        _state.sent();
+                        _state.label = 4;
+                    case 4:
+                        return [
+                            3,
+                            6
+                        ];
+                    case 5:
+                        setUserInfo(response);
+                        saveUserInfoToStorage(response);
+                        if (handleLoginError) handleLoginError();
+                        _state.label = 6;
+                    case 6:
+                        return [
+                            3,
+                            8
+                        ];
+                    case 7:
                         err = _state.sent();
                         console.error(err.toString());
                         return [
                             3,
-                            4
+                            8
                         ];
-                    case 4:
+                    case 8:
                         return [
                             2
                         ];
@@ -79072,6 +79136,9 @@ var LiffProvider = function(param) {
                     if (!isValid) {
                         console.warn("JWT token 驗證失敗");
                         setLoginType(null);
+                        // 清除 userInfo
+                        setUserInfo(null);
+                        window.localStorage.removeItem(userInfoStorageKey);
                         return [
                             2,
                             false
@@ -79086,6 +79153,8 @@ var LiffProvider = function(param) {
                     err = _state.sent();
                     // token 失效或其他問題
                     setLoginType(null);
+                    setUserInfo(null);
+                    window.localStorage.removeItem(userInfoStorageKey);
                     console.warn("LIFF token 驗證失敗，需重新登入", err);
                     return [
                         2,
@@ -79098,13 +79167,18 @@ var LiffProvider = function(param) {
             }
         });
     }), [
-        liffObject
+        liffObject,
+        userInfoStorageKey
     ]);
     var normalizeToken = function(token) {
         var trimmed = token.trim();
         return trimmed.toLowerCase().startsWith("bearer ") ? trimmed : "Bearer ".concat(trimmed);
     };
     var searchParams = typeof window !== "undefined" ? new URLSearchParams(window.location.search) : null;
+    // 初始載入時從 localStorage 載入 userInfo
+    useEffect(function() {
+        loadUserInfoFromStorage();
+    }, []);
     // 客戶端初始化 LIFF
     useEffect(function() {
         var checkAndInitialize = function() {
@@ -79144,6 +79218,8 @@ var LiffProvider = function(param) {
                                     console.error("LocalStorage 解析失敗:", err);
                                 }
                             }
+                            console.log("checkTokenUrl", checkTokenUrl);
+                            console.log("memberInfoUrl", memberInfoUrl);
                             if (!jwtToken) return [
                                 3,
                                 4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sunggang/ui-lib",
-  "version": "0.3.52",
+  "version": "0.3.54",
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",