login-authorization-v2 2.2.1 → 2.2.2

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 (7) hide show
  1. package/dist/index.esm.js +16 -42
  2. package/dist/index.umd.js +16 -42
  3. package/dist/src/compatible.d.ts +1 -1
  4. package/dist/src/compatible.d.ts.map +1 -1
  5. package/dist/src/cookie.d.ts +2 -2
  6. package/dist/src/cookie.d.ts.map +1 -1
  7. package/package.json +1 -1
package/dist/index.esm.js CHANGED
@@ -34,14 +34,6 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
34
34
  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
35
35
  };
36
36
 
37
- const NO_ACCESS_TOKEN = 'Access token not found';
38
- const INVALID_ACCESS_TOKEN = 'Invalid access token';
39
- const INVALID_REFRESH_TOKEN = 'Invalid refresh token';
40
- const NO_REFRESH_TOKEN = 'Refresh token not found';
41
- const NO_MODULE_BASE_URL = 'Module base URL is required';
42
- const INVALID_TENANT_ID = 'Invalid tenant ID';
43
- const INVALID_BRAND = 'Invalid brand';
44
-
45
37
  const isHttps = window.location.protocol === 'https:';
46
38
  const makeSetCookieFn = (key, options) => {
47
39
  const index = window.location.hostname.indexOf('.');
@@ -57,55 +49,31 @@ const makeSetCookieFn = (key, options) => {
57
49
  };
58
50
  const setIdTokenFront = makeSetCookieFn('idTokenFront', { secure: isHttps, sameSite: 'Lax' });
59
51
  const setIdTokenBack = makeSetCookieFn('idTokenBack', { secure: isHttps, sameSite: 'Lax' });
60
- const getIdTokenFront = () => Cookie.get('idTokenFront');
61
- const getIdTokenBack = () => Cookie.get('idTokenBack');
62
52
  const setRefreshTokenFront = makeSetCookieFn('refreshTokenFront', { secure: isHttps, sameSite: 'Lax' });
63
53
  const setRefreshTokenBack = makeSetCookieFn('refreshTokenBack', { secure: isHttps, sameSite: 'Lax' });
64
- const getRefreshTokenFront = () => Cookie.get('refreshTokenFront');
65
- const getRefreshTokenBack = () => Cookie.get('refreshTokenBack');
66
54
  const setRefreshToken = (token) => {
55
+ setRefreshTokenFront(null);
56
+ setRefreshTokenBack(null);
67
57
  if (!token) {
68
- setIdTokenBack(null);
69
- setIdTokenFront(null);
70
- makeSetCookieFn('refresh_token')(null);
58
+ makeSetCookieFn('refresh_token', { secure: isHttps })(null);
71
59
  return;
72
60
  }
73
- const splits = token.split('.');
74
- if (splits.length < 5)
75
- throw new Error(INVALID_REFRESH_TOKEN);
76
- const refreshTokenFront = splits[0] + '.' + splits[1];
77
- const refreshTokenBack = splits[2] + '.' + splits[3] + '.' + splits[4];
78
- setRefreshTokenFront(refreshTokenFront);
79
- setRefreshTokenBack(refreshTokenBack);
80
- makeSetCookieFn('refresh_token')(null);
81
- // makeSetCookieFn('refresh_token')(token)
61
+ makeSetCookieFn('refresh_token', { secure: isHttps })(token);
82
62
  };
83
63
  const setAccessToken = (token) => {
64
+ setIdTokenFront(null);
65
+ setIdTokenBack(null);
84
66
  if (!token) {
85
- setIdTokenBack(null);
86
- setIdTokenFront(null);
87
- makeSetCookieFn('access_token')(null);
67
+ makeSetCookieFn('access_token', { secure: isHttps })(null);
88
68
  return;
89
69
  }
90
- const splits = token.split('.');
91
- if (splits.length < 3)
92
- throw new Error(INVALID_ACCESS_TOKEN);
93
- const idTokenFront = splits[0] + '.' + splits[1];
94
- const idTokenBack = splits[2] || '';
95
- setIdTokenFront(idTokenFront);
96
- setIdTokenBack(idTokenBack);
97
- makeSetCookieFn('access_token')(null);
98
- // makeSetCookieFn('access_token')(token)
70
+ makeSetCookieFn('access_token', { secure: isHttps })(token);
99
71
  };
100
72
  const getAccessToken = () => {
101
- if (!getIdTokenFront() || !getIdTokenBack())
102
- return '';
103
- return getIdTokenFront() + '.' + getIdTokenBack();
73
+ return Cookie.get('access_token');
104
74
  };
105
75
  const getRefreshToken = () => {
106
- if (!getRefreshTokenFront() || !getRefreshTokenBack())
107
- return '';
108
- return getRefreshTokenFront() + '.' + getRefreshTokenBack();
76
+ return Cookie.get('refresh_token');
109
77
  };
110
78
  const setSystemType = makeSetCookieFn('currentSystemType');
111
79
  const getSystemType = () => Cookie.get('currentSystemType');
@@ -142,6 +110,12 @@ const getUrlParam = (key, href) => {
142
110
  return searchParams.get(key);
143
111
  };
144
112
 
113
+ const NO_ACCESS_TOKEN = 'Access token not found';
114
+ const NO_REFRESH_TOKEN = 'Refresh token not found';
115
+ const NO_MODULE_BASE_URL = 'Module base URL is required';
116
+ const INVALID_TENANT_ID = 'Invalid tenant ID';
117
+ const INVALID_BRAND = 'Invalid brand';
118
+
145
119
  const isMobile = () => {
146
120
  const ua = navigator.userAgent;
147
121
  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua);
package/dist/index.umd.js CHANGED
@@ -36,14 +36,6 @@
36
36
  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
37
37
  };
38
38
 
39
- const NO_ACCESS_TOKEN = 'Access token not found';
40
- const INVALID_ACCESS_TOKEN = 'Invalid access token';
41
- const INVALID_REFRESH_TOKEN = 'Invalid refresh token';
42
- const NO_REFRESH_TOKEN = 'Refresh token not found';
43
- const NO_MODULE_BASE_URL = 'Module base URL is required';
44
- const INVALID_TENANT_ID = 'Invalid tenant ID';
45
- const INVALID_BRAND = 'Invalid brand';
46
-
47
39
  const isHttps = window.location.protocol === 'https:';
48
40
  const makeSetCookieFn = (key, options) => {
49
41
  const index = window.location.hostname.indexOf('.');
@@ -59,55 +51,31 @@
59
51
  };
60
52
  const setIdTokenFront = makeSetCookieFn('idTokenFront', { secure: isHttps, sameSite: 'Lax' });
61
53
  const setIdTokenBack = makeSetCookieFn('idTokenBack', { secure: isHttps, sameSite: 'Lax' });
62
- const getIdTokenFront = () => Cookie.get('idTokenFront');
63
- const getIdTokenBack = () => Cookie.get('idTokenBack');
64
54
  const setRefreshTokenFront = makeSetCookieFn('refreshTokenFront', { secure: isHttps, sameSite: 'Lax' });
65
55
  const setRefreshTokenBack = makeSetCookieFn('refreshTokenBack', { secure: isHttps, sameSite: 'Lax' });
66
- const getRefreshTokenFront = () => Cookie.get('refreshTokenFront');
67
- const getRefreshTokenBack = () => Cookie.get('refreshTokenBack');
68
56
  const setRefreshToken = (token) => {
57
+ setRefreshTokenFront(null);
58
+ setRefreshTokenBack(null);
69
59
  if (!token) {
70
- setIdTokenBack(null);
71
- setIdTokenFront(null);
72
- makeSetCookieFn('refresh_token')(null);
60
+ makeSetCookieFn('refresh_token', { secure: isHttps })(null);
73
61
  return;
74
62
  }
75
- const splits = token.split('.');
76
- if (splits.length < 5)
77
- throw new Error(INVALID_REFRESH_TOKEN);
78
- const refreshTokenFront = splits[0] + '.' + splits[1];
79
- const refreshTokenBack = splits[2] + '.' + splits[3] + '.' + splits[4];
80
- setRefreshTokenFront(refreshTokenFront);
81
- setRefreshTokenBack(refreshTokenBack);
82
- makeSetCookieFn('refresh_token')(null);
83
- // makeSetCookieFn('refresh_token')(token)
63
+ makeSetCookieFn('refresh_token', { secure: isHttps })(token);
84
64
  };
85
65
  const setAccessToken = (token) => {
66
+ setIdTokenFront(null);
67
+ setIdTokenBack(null);
86
68
  if (!token) {
87
- setIdTokenBack(null);
88
- setIdTokenFront(null);
89
- makeSetCookieFn('access_token')(null);
69
+ makeSetCookieFn('access_token', { secure: isHttps })(null);
90
70
  return;
91
71
  }
92
- const splits = token.split('.');
93
- if (splits.length < 3)
94
- throw new Error(INVALID_ACCESS_TOKEN);
95
- const idTokenFront = splits[0] + '.' + splits[1];
96
- const idTokenBack = splits[2] || '';
97
- setIdTokenFront(idTokenFront);
98
- setIdTokenBack(idTokenBack);
99
- makeSetCookieFn('access_token')(null);
100
- // makeSetCookieFn('access_token')(token)
72
+ makeSetCookieFn('access_token', { secure: isHttps })(token);
101
73
  };
102
74
  const getAccessToken = () => {
103
- if (!getIdTokenFront() || !getIdTokenBack())
104
- return '';
105
- return getIdTokenFront() + '.' + getIdTokenBack();
75
+ return Cookie.get('access_token');
106
76
  };
107
77
  const getRefreshToken = () => {
108
- if (!getRefreshTokenFront() || !getRefreshTokenBack())
109
- return '';
110
- return getRefreshTokenFront() + '.' + getRefreshTokenBack();
78
+ return Cookie.get('refresh_token');
111
79
  };
112
80
  const setSystemType = makeSetCookieFn('currentSystemType');
113
81
  const getSystemType = () => Cookie.get('currentSystemType');
@@ -144,6 +112,12 @@
144
112
  return searchParams.get(key);
145
113
  };
146
114
 
115
+ const NO_ACCESS_TOKEN = 'Access token not found';
116
+ const NO_REFRESH_TOKEN = 'Refresh token not found';
117
+ const NO_MODULE_BASE_URL = 'Module base URL is required';
118
+ const INVALID_TENANT_ID = 'Invalid tenant ID';
119
+ const INVALID_BRAND = 'Invalid brand';
120
+
147
121
  const isMobile = () => {
148
122
  const ua = navigator.userAgent;
149
123
  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua);
package/dist/src/compatible.d.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * 这个文件是写一些兼容的方法，避免各个项目做出大量调整
3
3
  */
4
4
  export declare const setIdToken: (token: string | null) => void;
5
- export declare const getIdToken: () => string;
5
+ export declare const getIdToken: () => string | undefined;
6
6
  export declare const setCookie: (name: string, value: string | undefined | null, domain: string, path?: string, time?: number) => void;
7
7
  export declare const clearLoginCookie: () => void;
8
8
  export declare const getCookie: (c_name: string) => string | null;
package/dist/src/compatible.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"compatible.d.ts","sourceRoot":"","sources":["../../src/compatible.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,eAAO,MAAM,UAAU,gCAAiB,CAAA;AACxC,eAAO,MAAM,UAAU,cAAiB,CAAA;AAExC,eAAO,MAAM,SAAS,GACpB,MAAM,MAAM,EACZ,OAAO,MAAM,GAAG,SAAS,GAAG,IAAI,EAChC,QAAQ,MAAM,EACd,OAAM,MAAY,EAClB,aAA+B,SAUhC,CAAA;AACD,eAAO,MAAM,gBAAgB,YAG5B,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,kBAKvC,CAAA;AAGD,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,kBAMrD,CAAA"}
1
+ {"version":3,"file":"compatible.d.ts","sourceRoot":"","sources":["../../src/compatible.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,eAAO,MAAM,UAAU,gCAAiB,CAAA;AACxC,eAAO,MAAM,UAAU,0BAAiB,CAAA;AAExC,eAAO,MAAM,SAAS,GACpB,MAAM,MAAM,EACZ,OAAO,MAAM,GAAG,SAAS,GAAG,IAAI,EAChC,QAAQ,MAAM,EACd,OAAM,MAAY,EAClB,aAA+B,SAUhC,CAAA;AACD,eAAO,MAAM,gBAAgB,YAG5B,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,kBAKvC,CAAA;AAGD,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,kBAMrD,CAAA"}
package/dist/src/cookie.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  export type CookieKeys = 'access_token' | 'refresh_token' | 'idTokenFront' | 'idTokenBack' | 'refreshTokenFront' | 'refreshTokenBack' | 'currentSystemType';
2
2
  export declare const setRefreshToken: (token: string | null) => void;
3
3
  export declare const setAccessToken: (token: string | null) => void;
4
- export declare const getAccessToken: () => string;
5
- export declare const getRefreshToken: () => string;
4
+ export declare const getAccessToken: () => string | undefined;
5
+ export declare const getRefreshToken: () => string | undefined;
6
6
  export declare const setSystemType: (value: string | null) => void;
7
7
  export declare const getSystemType: () => string | undefined;
8
8
  //# sourceMappingURL=cookie.d.ts.map
package/dist/src/cookie.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../src/cookie.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,GACpB,cAAc,GACZ,eAAe,GACf,cAAc,GACd,aAAa,GACb,mBAAmB,GACnB,kBAAkB,GAClB,mBAAmB,CAAA;AAkCvB,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,GAAG,IAAI,SAiBnD,CAAA;AACD,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,GAAG,IAAI,SAiBlD,CAAA;AAED,eAAO,MAAM,cAAc,cAG1B,CAAA;AACD,eAAO,MAAM,eAAe,cAG3B,CAAA;AAED,eAAO,MAAM,aAAa,UArET,MAAM,GAAG,IAAI,SAqEmC,CAAA;AACjE,eAAO,MAAM,aAAa,0BAAwC,CAAA"}
1
+ {"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../src/cookie.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GACpB,cAAc,GACZ,eAAe,GACf,cAAc,GACd,aAAa,GACb,mBAAmB,GACnB,kBAAkB,GAClB,mBAAmB,CAAA;AA6BvB,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,GAAG,IAAI,SAQnD,CAAA;AACD,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,GAAG,IAAI,SAQlD,CAAA;AAED,eAAO,MAAM,cAAc,0BAE1B,CAAA;AACD,eAAO,MAAM,eAAe,0BAE3B,CAAA;AAED,eAAO,MAAM,aAAa,UA5CT,MAAM,GAAG,IAAI,SA4CmC,CAAA;AACjE,eAAO,MAAM,aAAa,0BAAwC,CAAA"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "type": "module",
3
3
  "name": "login-authorization-v2",
4
- "version": "2.2.1",
4
+ "version": "2.2.2",
5
5
  "engines": {
6
6
  "node": ">=20"
7
7
  },