@sunggang/ui-lib 0.2.69 → 0.2.71

package/index.esm2.js

@@ -58923,7 +58923,7 @@ var LiffProvider = function(param) {
     // 登入初始化函數
     var loginInit = function() {
         var _ref = _async_to_generator(function(token) {
-            var _resData_data, _resData_data1, _resData_data2, response, resData, _resData_data3, loginToken, err;
+            var _resData_data, _resData_data1, _resData_data2, response, resData, loginToken, err;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -58956,8 +58956,8 @@ var LiffProvider = function(param) {
                         resData = response;
                         console.log("login response", response);
                         setLoginData(resData);
-                        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 "))) {
-                            resData.data.access_token = "Bearer ".concat(resData === null || resData === void 0 ? void 0 : (_resData_data3 = resData.data) === null || _resData_data3 === void 0 ? void 0 : _resData_data3.access_token);
+                        if ((resData === null || resData === void 0 ? void 0 : (_resData_data = resData.data) === null || _resData_data === void 0 ? void 0 : _resData_data.access_token) && typeof resData.data.access_token === "string" && resData.data.access_token.trim() !== "" && !resData.data.access_token.startsWith("Bearer ")) {
+                            resData.data.access_token = "Bearer ".concat(resData.data.access_token);
                         }
                         console.log("has token", !!(resData === null || resData === void 0 ? void 0 : (_resData_data1 = resData.data) === null || _resData_data1 === void 0 ? void 0 : _resData_data1.access_token));
                         window.localStorage.setItem(localStorageKey, JSON.stringify(resData));
@@ -58995,15 +58995,15 @@ var LiffProvider = function(param) {
     // 初始化 LIFF
     var initializeLiff = function() {
         var _ref = _async_to_generator(function(isValid) {
-            var customFetch, liff, originalFetch, lineToken, redirectUri, err;
+            var customFetch, liff, originalFetch, getFriendship, lineToken, redirectUri, err;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         _state.trys.push([
                             0,
-                            5,
+                            6,
                             ,
-                            6
+                            7
                         ]);
                         customFetch = // 自訂 fetch 函數，避免每次請求都改變 URL
                         // eslint-disable-next-line no-inner-declarations
@@ -59032,12 +59032,18 @@ var LiffProvider = function(param) {
                     case 2:
                         _state.sent();
                         console.log("LIFF init succeeded.");
+                        return [
+                            4,
+                            liff.getFriendship()
+                        ];
+                    case 3:
+                        getFriendship = _state.sent();
+                        console.log("isFriendship", getFriendship === null || getFriendship === void 0 ? void 0 : getFriendship.friendFlag);
                         setLiffObject(liff);
-                        if (isValid) return [
+                        if ((getFriendship === null || getFriendship === void 0 ? void 0 : getFriendship.friendFlag) && isValid) return [
                             2
                         ];
                         lineToken = liff === null || liff === void 0 ? void 0 : liff.getAccessToken();
-                        console.log("liff.isLoggedIn()", liff.isLoggedIn());
                         // 未登入先進行登入
                         if (!liff.isLoggedIn()) {
                             redirectUri = customerRedirectUrl || "".concat(window.location.href);
@@ -59050,29 +59056,29 @@ var LiffProvider = function(param) {
                         }
                         if (!lineToken) return [
                             3,
-                            4
+                            5
                         ];
                         return [
                             4,
                             loginInit(lineToken)
                         ];
-                    case 3:
-                        _state.sent();
-                        _state.label = 4;
                     case 4:
+                        _state.sent();
+                        _state.label = 5;
+                    case 5:
                         return [
                             3,
-                            6
+                            7
                         ];
-                    case 5:
+                    case 6:
                         err = _state.sent();
                         setLiffError(err.toString());
                         console.log("LIFF init failed.", err);
                         return [
                             3,
-                            6
+                            7
                         ];
-                    case 6:
+                    case 7:
                         return [
                             2
                         ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sunggang/ui-lib",
-  "version": "0.2.69",
+  "version": "0.2.71",
   "dependencies": {
     "@iconify/react": "^4.1.1",
     "@material-ui/core": "^4.12.4",