phx-uikit 1.0.104 → 1.0.106
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.
- package/dist/cjs/components/Func/axiosInstance.js +7 -2
- package/dist/cjs/components/Func/axiosInstance.js.map +1 -1
- package/dist/cjs/components/LoginV3/LoginV3.js +3 -2
- package/dist/cjs/components/LoginV3/LoginV3.js.map +1 -1
- package/dist/esm/components/Func/axiosInstance.js +7 -2
- package/dist/esm/components/Func/axiosInstance.js.map +1 -1
- package/dist/esm/components/LoginV3/LoginV3.js +4 -3
- package/dist/esm/components/LoginV3/LoginV3.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,6 +5,7 @@ var axios_1 = tslib_1.__importDefault(require("axios"));
|
|
|
5
5
|
var js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
|
|
6
6
|
var read_env_config_1 = require("../../read-env-config");
|
|
7
7
|
var constants_1 = require("../../utils/constants");
|
|
8
|
+
var saveCookiesClient_1 = tslib_1.__importDefault(require("./saveCookiesClient"));
|
|
8
9
|
var isRefreshing = false;
|
|
9
10
|
var failedQueue = [];
|
|
10
11
|
var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
@@ -24,7 +25,10 @@ var api = axios_1["default"].create({
|
|
|
24
25
|
baseURL: publicUrl
|
|
25
26
|
});
|
|
26
27
|
api.interceptors.request.use(function (config) {
|
|
27
|
-
|
|
28
|
+
var authTokenCookie = js_cookie_1["default"].get(constants_1.COOKIE_ACCESS_TOKEN);
|
|
29
|
+
if (authTokenCookie) {
|
|
30
|
+
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
31
|
+
}
|
|
28
32
|
return config;
|
|
29
33
|
});
|
|
30
34
|
api.interceptors.response.use(function (response) { return response; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
@@ -57,8 +61,9 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
57
61
|
case 2:
|
|
58
62
|
data = (_b.sent()).data;
|
|
59
63
|
newToken = data.token;
|
|
64
|
+
(0, saveCookiesClient_1["default"])(constants_1.COOKIE_ACCESS_TOKEN, newToken, true);
|
|
60
65
|
processQueue(null, newToken);
|
|
61
|
-
originalRequest.
|
|
66
|
+
originalRequest.headers.Authorization = 'Bearer ' + newToken;
|
|
62
67
|
return [2 /*return*/, api(originalRequest)];
|
|
63
68
|
case 3:
|
|
64
69
|
err_1 = _b.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":";;;AAAA,wDAAyB;AACzB,gEAA+B;AAC/B,yDAA8C;AAC9C,mDAA4F;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ var PHXLoginV3 = function (props) {
|
|
|
54
54
|
});
|
|
55
55
|
}); };
|
|
56
56
|
var onSubmitForm = function (values) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
57
|
-
var email, password, response, userInfo;
|
|
57
|
+
var email, password, response, userInfo, token;
|
|
58
58
|
return tslib_1.__generator(this, function (_a) {
|
|
59
59
|
switch (_a.label) {
|
|
60
60
|
case 0:
|
|
@@ -72,8 +72,9 @@ var PHXLoginV3 = function (props) {
|
|
|
72
72
|
setLoading(false);
|
|
73
73
|
return [2 /*return*/];
|
|
74
74
|
}
|
|
75
|
-
userInfo = response.userInfo;
|
|
75
|
+
userInfo = response.userInfo, token = response.token;
|
|
76
76
|
(0, saveCookiesClient_1["default"])(constants_1.COOKIE_USER_INFO, (0, helpers_1.encryptDataSync)(userInfo), true);
|
|
77
|
+
(0, saveCookiesClient_1["default"])(constants_1.COOKIE_ACCESS_TOKEN, token, true);
|
|
77
78
|
if (userInfo && userInfo.user_roles[0].role.role_code) {
|
|
78
79
|
setLoading(false);
|
|
79
80
|
setLoginError(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":";;;;AAAA,qDAAkD;AAClD,mDAAyC;AACzC,kCAAmC;AACnC,oCAAqC;AACrC,oCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import axios from 'axios';
|
|
|
3
3
|
import Cookies from 'js-cookie';
|
|
4
4
|
import { getEnv } from '../../read-env-config';
|
|
5
5
|
import { COOKIE_ACCESS_TOKEN, COOKIE_REFRESH_TOKEN, loginPage } from '../../utils/constants';
|
|
6
|
+
import saveCookiesClient from './saveCookiesClient';
|
|
6
7
|
var isRefreshing = false;
|
|
7
8
|
var failedQueue = [];
|
|
8
9
|
var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
@@ -22,7 +23,10 @@ var api = axios.create({
|
|
|
22
23
|
baseURL: publicUrl
|
|
23
24
|
});
|
|
24
25
|
api.interceptors.request.use(function (config) {
|
|
25
|
-
|
|
26
|
+
var authTokenCookie = Cookies.get(COOKIE_ACCESS_TOKEN);
|
|
27
|
+
if (authTokenCookie) {
|
|
28
|
+
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
29
|
+
}
|
|
26
30
|
return config;
|
|
27
31
|
});
|
|
28
32
|
api.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -55,8 +59,9 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
55
59
|
case 2:
|
|
56
60
|
data = (_b.sent()).data;
|
|
57
61
|
newToken = data.token;
|
|
62
|
+
saveCookiesClient(COOKIE_ACCESS_TOKEN, newToken, true);
|
|
58
63
|
processQueue(null, newToken);
|
|
59
|
-
originalRequest.
|
|
64
|
+
originalRequest.headers.Authorization = 'Bearer ' + newToken;
|
|
60
65
|
return [2 /*return*/, api(originalRequest)];
|
|
61
66
|
case 3:
|
|
62
67
|
err_1 = _b.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { useForm } from 'react-hook-form';
|
|
|
4
4
|
import { PHXInput } from '../Input';
|
|
5
5
|
import { PHXButton } from '../Button';
|
|
6
6
|
import { PHXBanner } from '../Banner';
|
|
7
|
-
import { COOKIE_USER_INFO } from '../../utils/constants';
|
|
7
|
+
import { COOKIE_ACCESS_TOKEN, COOKIE_USER_INFO } from '../../utils/constants';
|
|
8
8
|
import { getEnv } from '../../read-env-config';
|
|
9
9
|
import saveCookiesClient from '../Func/saveCookiesClient';
|
|
10
10
|
import { PHXCheckbox } from '../Checkbox';
|
|
@@ -51,7 +51,7 @@ export var PHXLoginV3 = function (props) {
|
|
|
51
51
|
});
|
|
52
52
|
}); };
|
|
53
53
|
var onSubmitForm = function (values) { return __awaiter(void 0, void 0, void 0, function () {
|
|
54
|
-
var email, password, response, userInfo;
|
|
54
|
+
var email, password, response, userInfo, token;
|
|
55
55
|
return __generator(this, function (_a) {
|
|
56
56
|
switch (_a.label) {
|
|
57
57
|
case 0:
|
|
@@ -69,8 +69,9 @@ export var PHXLoginV3 = function (props) {
|
|
|
69
69
|
setLoading(false);
|
|
70
70
|
return [2 /*return*/];
|
|
71
71
|
}
|
|
72
|
-
userInfo = response.userInfo;
|
|
72
|
+
userInfo = response.userInfo, token = response.token;
|
|
73
73
|
saveCookiesClient(COOKIE_USER_INFO, encryptDataSync(userInfo), true);
|
|
74
|
+
saveCookiesClient(COOKIE_ACCESS_TOKEN, token, true);
|
|
74
75
|
if (userInfo && userInfo.user_roles[0].role.role_code) {
|
|
75
76
|
setLoading(false);
|
|
76
77
|
setLoginError(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,iBAAiB,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,UAAU,MAAM,eAAe,CAAA;AACtC,OAAO,uBAAuB,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAUvD,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,KAAsB;IACvC,IAAA,IAAI,GAAgD,KAAK,KAArD,EAAE,MAAM,GAAwC,KAAK,OAA7C,EAAE,MAAM,GAAgC,KAAK,OAArC,EAAE,YAAY,GAAkB,KAAK,aAAvB,EAAE,WAAW,GAAK,KAAK,YAAV,CAAU;IAC3D,IAAA,KAA0B,QAAQ,CAAU,IAAI,CAAC,EAAhD,QAAQ,QAAA,EAAE,WAAW,QAA2B,CAAA;IACjD,IAAA,KAA8B,QAAQ,CAAU,KAAK,CAAC,EAArD,UAAU,QAAA,EAAE,aAAa,QAA4B,CAAA;IACtD,IAAA,KAAwB,QAAQ,CAAU,KAAK,CAAC,EAA/C,OAAO,QAAA,EAAE,UAAU,QAA4B,CAAA;IACtD,IAAM,UAAU,GAAG,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IAEzF,IAAA,KAIF,OAAO,EAAE,EAHX,YAAY,kBAAA,EACZ,QAAQ,cAAA,EACK,MAAM,sBACR,CAAA;IAEb,qFAAqF;IAErF,IAAM,WAAW,GAAG,UAAO,KAAa,EAAE,QAAgB;;;;;;oBAErC,qBAAM,KAAK,CAAC,oCAAoC,EAAE;4BACjE,OAAO,EAAE;gCACP,cAAc,EAAE,kBAAkB;6BACnC;4BACD,MAAM,EAAE,MAAM;4BACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACnB,KAAK,OAAA;gCACL,QAAQ,UAAA;6BACT,CAAC;4BACF,WAAW,EAAE,SAAS;yBACvB,CAAC,EAAA;;oBAVI,QAAQ,GAAG,SAUf;oBACF,IAAI,CAAC,QAAQ,CAAC,EAAE;wBAAE,sBAAM;oBAEjB,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;wBAA5B,sBAAO,SAAqB,EAAA;;;oBAE5B,OAAO,CAAC,KAAK,CAAC,OAAK,CAAC,CAAA;oBACpB,sBAAO,IAAI,EAAA;;;;SAEd,CAAA;IAED,IAAM,YAAY,GAAG,UAAO,MAAW;;;;;oBAC7B,KAAK,GAAe,MAAM,MAArB,EAAE,QAAQ,GAAK,MAAM,SAAX,CAAW;oBAClC,UAAU,CAAC,IAAI,CAAC,CAAA;oBAEC,qBAAM,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC;wBACnD,0BAA0B;sBADyB;;oBAA7C,QAAQ,GAAG,SAAkC;oBACnD,0BAA0B;oBAC1B,IAAI,CAAC,QAAQ,KAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAA,EAAE;wBAClC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;wBACxB,aAAa,CAAC,IAAI,CAAC,CAAA;wBACnB,UAAU,CAAC,KAAK,CAAC,CAAA;wBACjB,sBAAM;qBACP;oBAEO,QAAQ,GAAY,QAAQ,SAApB,EAAE,KAAK,GAAK,QAAQ,MAAb,CAAa;oBACpC,iBAAiB,CAAC,gBAAgB,EAAE,eAAe,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAA;oBACpE,iBAAiB,CAAC,mBAAmB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;oBAEnD,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE;wBACrD,UAAU,CAAC,KAAK,CAAC,CAAA;wBACjB,aAAa,CAAC,KAAK,CAAC,CAAA;wBACpB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;qBAC1B;yBAAM;wBACL,aAAa,CAAC,IAAI,CAAC,CAAA;wBACnB,UAAU,CAAC,KAAK,CAAC,CAAA;qBAClB;;;;SACF,CAAA;IAED,IAAM,eAAe,GAAG,uBAAuB,EAAE,CAAA;IAEjD,6CAA6C;IAC7C,SAAS,CAAC;QACR,IAAI,eAAe,EAAE;YACnB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;SACtC;IACH,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;IAErB,OAAO,CACL;QACE,oBAAC,UAAU,IAAC,WAAW,EAAE,WAAW,GAAI;QACxC,8BAAM,SAAS,EAAC,iBAAiB;YAC/B,6BAAK,SAAS,EAAC,2DAA2D;gBACxE,6BAAK,SAAS,EAAC,uFAAuF;oBACpG,6BAAK,SAAS,EAAC,wBAAwB;wBACrC,6BAAK,SAAS,EAAC,eAAe;4BAC5B,6BAAK,SAAS,EAAC,oBAAoB,EAAC,GAAG,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,UAAG,UAAU,CAAE,EAAE,GAAG,EAAC,MAAM,GAAG;4BAC/E,4BAAI,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,SAAS,EAAC,sDAAsD,kDAE7F;4BACJ,UAAU,IAAI,CACb,6BAAK,SAAS,EAAC,QAAQ;gCACrB,oBAAC,SAAS,IACR,IAAI,EAAE,UAAU,EAChB,SAAS,EAAC,WAAW,EACrB,OAAO,EAAE,cAAM,OAAA,aAAa,CAAC,KAAK,CAAC,EAApB,CAAoB,EACnC,IAAI,EAAC,QAAQ,EACb,KAAK,EAAC,6CAAoB,EAC1B,WAAW,EAAC,oEAAsC,GAClD,CACE,CACP;4BACD,8BAAM,QAAQ,EAAE,YAAY,CAAC,YAAY,CAAC;gCACxC,6BAAK,SAAS,EAAC,WAAW;oCACxB,6BAAK,SAAS,EAAC,MAAM;wCACnB,oBAAC,QAAQ,IACP,SAAS,EAAC,gBAAgB,EAC1B,KAAK,EAAC,OAAO;4CACb,YAAY;4CACZ,KAAK,EAAE,MAAM,CAAC,KAAK,EACnB,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE;gDAC1B,QAAQ,EAAE,IAAI;6CACf,CAAC,EACF,kBAAkB,EAAC,+BAAqB,GACxC,CACE;oCACN,oBAAC,QAAQ,IACP,SAAS,EAAC,gBAAgB;wCAC1B,YAAY;wCACZ,KAAK,EAAE,MAAM,CAAC,QAAQ,EACtB,kBAAkB,EAAC,4CAAwB,EAC3C,QAAQ,EAAE,QAAQ,CAAC,UAAU,EAAE;4CAC7B,QAAQ,EAAE,IAAI;yCACf,CAAC,EACF,KAAK,EAAC,UAAU,EAChB,IAAI,EAAC,UAAU,EACf,EAAE,EAAC,UAAU,GACb;oCACF,oBAAC,WAAW,IACV,cAAc,EAAE,QAAQ,EACxB,KAAK,EAAC,kCAAmB,EACzB,QAAQ,EAAE,UAAC,CAAM,IAAK,OAAA,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAA7B,CAA6B,GACnD;oCACF,oBAAC,SAAS,IAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAC,QAAQ,EAAC,OAAO,QAAC,MAAM,QAAC,IAAI,EAAC,OAAO,+BAE/D,CACR,CACD,CACH,CACF,CACF;gBACN,6BAAK,SAAS,EAAC,+CAA+C;oBAC5D,6BACE,SAAS,EAAC,6CAA6C,EACvD,GAAG,EACD,MAAM,aAAN,MAAM,cAAN,MAAM,GACN,wIAAwI,EAE1I,GAAG,EAAC,QAAQ,GACZ,CACE,CACF,CACD,CACN,CACJ,CAAA;AACH,CAAC,CAAA;AAED,eAAe,UAAU,CAAA"}
|