@sunggang/ui-lib 0.2.80 → 0.2.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.esm2.js +31 -29
  2. package/package.json +1 -1
package/index.esm2.js CHANGED
@@ -58827,11 +58827,16 @@ var LiffProvider = function(param) {
58827
58827
  return _ts_generator(this, function(_state) {
58828
58828
  switch(_state.label){
58829
58829
  case 0:
58830
+ if (!token) return [
58831
+ 2
58832
+ ];
58833
+ _state.label = 1;
58834
+ case 1:
58830
58835
  _state.trys.push([
58831
- 0,
58832
- 2,
58836
+ 1,
58837
+ 3,
58833
58838
  ,
58834
- 3
58839
+ 4
58835
58840
  ]);
58836
58841
  return [
58837
58842
  4,
@@ -58839,21 +58844,21 @@ var LiffProvider = function(param) {
58839
58844
  token: token
58840
58845
  })
58841
58846
  ];
58842
- case 1:
58847
+ case 2:
58843
58848
  response = _state.sent();
58844
58849
  setUserInfo(response);
58845
58850
  return [
58846
58851
  3,
58847
- 3
58852
+ 4
58848
58853
  ];
58849
- case 2:
58854
+ case 3:
58850
58855
  err = _state.sent();
58851
58856
  console.error(err);
58852
58857
  return [
58853
58858
  3,
58854
- 3
58859
+ 4
58855
58860
  ];
58856
- case 3:
58861
+ case 4:
58857
58862
  return [
58858
58863
  2
58859
58864
  ];
@@ -58924,7 +58929,7 @@ var LiffProvider = function(param) {
58924
58929
  // 登入初始化函數
58925
58930
  var loginInit = function() {
58926
58931
  var _ref = _async_to_generator(function(token) {
58927
- var _resData_data, _resData_data1, _resData_data2, response, resData, loginToken, err;
58932
+ var _resData_data, _resData_data1, response, resData, loginToken, err;
58928
58933
  return _ts_generator(this, function(_state) {
58929
58934
  switch(_state.label){
58930
58935
  case 0:
@@ -58955,19 +58960,16 @@ var LiffProvider = function(param) {
58955
58960
  case 2:
58956
58961
  response = _state.sent();
58957
58962
  resData = response;
58958
- console.log("login response", response);
58959
58963
  setLoginData(resData);
58960
58964
  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 ")) {
58961
58965
  resData.data.access_token = "Bearer ".concat(resData.data.access_token);
58962
58966
  }
58963
- 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));
58964
58967
  window.localStorage.setItem(localStorageKey, JSON.stringify(resData));
58965
- loginToken = resData === null || resData === void 0 ? void 0 : (_resData_data2 = resData.data) === null || _resData_data2 === void 0 ? void 0 : _resData_data2.access_token;
58968
+ loginToken = resData === null || resData === void 0 ? void 0 : (_resData_data1 = resData.data) === null || _resData_data1 === void 0 ? void 0 : _resData_data1.access_token;
58966
58969
  if (loginToken) {
58967
58970
  setAccessToken(loginToken);
58968
58971
  if (memberInfoUrl) fetchMemberInfo(loginToken);
58969
58972
  } else {
58970
- console.log(response);
58971
58973
  setUserInfo(response);
58972
58974
  if (handleLoginError) handleLoginError();
58973
58975
  }
@@ -58996,7 +58998,7 @@ var LiffProvider = function(param) {
58996
58998
  // 初始化 LIFF
58997
58999
  var initializeLiff = function() {
58998
59000
  var _ref = _async_to_generator(function(isValid) {
58999
- var customFetch, liff, originalFetch, friendship, error, lineToken, redirectUri, err;
59001
+ var customFetch, liff, originalFetch, lineToken, redirectUri, friendship, error, err;
59000
59002
  return _ts_generator(this, function(_state) {
59001
59003
  switch(_state.label){
59002
59004
  case 0:
@@ -59034,6 +59036,21 @@ var LiffProvider = function(param) {
59034
59036
  _state.sent();
59035
59037
  console.log("LIFF init succeeded.");
59036
59038
  setLiffObject(liff);
59039
+ lineToken = liff === null || liff === void 0 ? void 0 : liff.getAccessToken();
59040
+ // 未登入先進行登入
59041
+ if (!liff.isLoggedIn()) {
59042
+ redirectUri = customerRedirectUrl || "".concat(window.location.href);
59043
+ if (loginByUser || ignoreRoute) return [
59044
+ 2
59045
+ ];
59046
+ liff.login({
59047
+ redirectUri: redirectUri
59048
+ });
59049
+ }
59050
+ if (!lineToken) return [
59051
+ 3,
59052
+ 8
59053
+ ];
59037
59054
  _state.label = 3;
59038
59055
  case 3:
59039
59056
  _state.trys.push([
@@ -59065,21 +59082,6 @@ var LiffProvider = function(param) {
59065
59082
  if (isFriendship && isValid) return [
59066
59083
  2
59067
59084
  ];
59068
- lineToken = liff === null || liff === void 0 ? void 0 : liff.getAccessToken();
59069
- // 未登入先進行登入
59070
- if (!liff.isLoggedIn()) {
59071
- redirectUri = customerRedirectUrl || "".concat(window.location.href);
59072
- if (loginByUser || ignoreRoute) return [
59073
- 2
59074
- ];
59075
- liff.login({
59076
- redirectUri: redirectUri
59077
- });
59078
- }
59079
- if (!lineToken) return [
59080
- 3,
59081
- 8
59082
- ];
59083
59085
  return [
59084
59086
  4,
59085
59087
  loginInit(lineToken)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sunggang/ui-lib",
3
- "version": "0.2.80",
3
+ "version": "0.2.82",
4
4
  "dependencies": {
5
5
  "@iconify/react": "^4.1.1",
6
6
  "@material-ui/core": "^4.12.4",