@sunggang/ui-lib 0.3.41 → 0.3.43

package/index.esm2.js

@@ -78388,7 +78388,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, accountLoginUrl = param.accountLoginUrl, 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, accountLoginUrl = param.accountLoginUrl, 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, _param_liffLogin = param.liffLogin, liffLogin = _param_liffLogin === void 0 ? false : _param_liffLogin, 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];
@@ -78616,6 +78616,14 @@ var LiffProvider = function(param) {
                         // 未登入先進行登入
                         if (!liff.isLoggedIn()) {
                             redirectUri = customerRedirectUrl || "".concat(window.location.href);
+                            if (liffLogin) {
+                                liff.login({
+                                    redirectUri: redirectUri
+                                });
+                                return [
+                                    2
+                                ];
+                            }
                             if (loginByUser || ignoreRoute) return [
                                 2
                             ];
@@ -78695,7 +78703,7 @@ var LiffProvider = function(param) {
     }();
     var accountLogin = function() {
         var _ref = _async_to_generator(function(username, password) {
-            var response, _response_data, _response_data1, token, tokenType, finalToken, err;
+            var response, token, tokenType, finalToken, err;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -78724,8 +78732,8 @@ var LiffProvider = function(param) {
                             3,
                             3
                         ];
-                        token = response === null || response === void 0 ? void 0 : (_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.access_token;
-                        tokenType = response === null || response === void 0 ? void 0 : (_response_data1 = response.data) === null || _response_data1 === void 0 ? void 0 : _response_data1.token_type;
+                        token = response === null || response === void 0 ? void 0 : response.access_token;
+                        tokenType = response === null || response === void 0 ? void 0 : response.token_type;
                         finalToken = "".concat(tokenType, " ").concat(token);
                         setAccessToken(finalToken);
                         setLoginType("account");

package/package.json

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

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

@@ -12,7 +12,7 @@ type LiffContextType = {
     accountLogin: (username: string, password: string) => Promise<void>;
 };
 export declare const LiffContext: React.Context<LiffContextType | undefined>;
-export declare const LiffProvider: ({ children, liffId, localStorageKey, checkTokenUrl, loginUrl, accountLoginUrl, memberInfoUrl, openInApp, ignoreCheckAddFriend, ignoreRoute, loginByUser, customerRedirectUrl, inviteCode, handleLoginError, }: {
+export declare const LiffProvider: ({ children, liffId, localStorageKey, checkTokenUrl, loginUrl, accountLoginUrl, memberInfoUrl, openInApp, ignoreCheckAddFriend, ignoreRoute, loginByUser, liffLogin, customerRedirectUrl, inviteCode, handleLoginError, }: {
     children: React.ReactNode;
     liffId: string;
     localStorageKey: string;
@@ -24,6 +24,7 @@ export declare const LiffProvider: ({ children, liffId, localStorageKey, checkTo
     ignoreCheckAddFriend?: boolean | undefined;
     ignoreRoute?: boolean | undefined;
     loginByUser?: boolean | undefined;
+    liffLogin?: boolean | undefined;
     customerRedirectUrl?: string | undefined;
     inviteCode?: string | undefined;
     handleLoginError?: (() => void) | undefined;