@sunggang/ui-lib 0.3.33 → 0.3.35

package/index.esm2.js

@@ -78338,7 +78338,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, _param_loginByUser = param.loginByUser, loginByUser = _param_loginByUser === void 0 ? false : _param_loginByUser, 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.loginByUser; var 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];
@@ -78522,7 +78522,7 @@ var LiffProvider = function(param) {
     // 初始化 LIFF
     var initializeLiff = function() {
         var _ref = _async_to_generator(function(isValid) {
-            var customFetch, liff, originalFetch, lineToken, currentPath, origin, redirectUri, tempFriendship, friendship, friendFlag, error, err;
+            var customFetch, liff, originalFetch, lineToken, urlParams, liffState, currentPath, origin, redirectUri, tempFriendship, friendship, friendFlag, error, err;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -78561,15 +78561,19 @@ var LiffProvider = function(param) {
                         console.log("LIFF init succeeded.");
                         setLiffObject(liff);
                         lineToken = liff === null || liff === void 0 ? void 0 : liff.getAccessToken();
-                        // 未登入先進行登入
-                        if (!liff.isLoggedIn()) {
-                            // const redirectUri = customerRedirectUrl || `${window.location.href}`;
-                            currentPath = window.location.pathname + window.location.search || customerRedirectUrl || "";
+                        if (liff.isLoggedIn()) {
+                            // 檢查是否有 liff.state 參數
+                            urlParams = new URLSearchParams(window.location.search);
+                            liffState = urlParams.get("liff.state");
+                            if (liffState) {
+                                // 重定向到原始頁面
+                                window.location.replace(decodeURIComponent(liffState));
+                            }
+                        } else {
+                            // 處理登入邏輯
+                            currentPath = customerRedirectUrl || window.location.pathname + window.location.search || "";
                             origin = window.location.origin;
-                            redirectUri = "".concat(origin).concat(encodeURIComponent(currentPath));
-                            if (loginByUser || ignoreRoute) return [
-                                2
-                            ];
+                            redirectUri = "".concat(origin).concat(currentPath);
                             liff.login({
                                 redirectUri: redirectUri
                             });

package/package.json

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