phx-uikit 1.0.138 → 1.0.140
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.d.ts +2 -2
- package/dist/cjs/components/Func/axiosInstance.js +49 -18
- package/dist/cjs/components/Func/axiosInstance.js.map +1 -1
- package/dist/cjs/components/Func/saveCookiesClient.js +24 -3
- package/dist/cjs/components/Func/saveCookiesClient.js.map +1 -1
- package/dist/esm/components/Func/axiosInstance.d.ts +2 -2
- package/dist/esm/components/Func/axiosInstance.js +49 -18
- package/dist/esm/components/Func/axiosInstance.js.map +1 -1
- package/dist/esm/components/Func/saveCookiesClient.js +24 -3
- package/dist/esm/components/Func/saveCookiesClient.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const
|
|
2
|
-
export default
|
|
1
|
+
declare const PHXApi: import("axios").AxiosInstance;
|
|
2
|
+
export default PHXApi;
|
|
@@ -7,9 +7,11 @@ var read_env_config_1 = require("../../read-env-config");
|
|
|
7
7
|
var constants_1 = require("../../utils/constants");
|
|
8
8
|
var saveCookiesClient_1 = tslib_1.__importDefault(require("./saveCookiesClient"));
|
|
9
9
|
var getCookieSession_1 = tslib_1.__importDefault(require("./getCookieSession"));
|
|
10
|
+
var headers_1 = require("next/headers");
|
|
10
11
|
var isRefreshing = false;
|
|
11
12
|
var failedQueue = [];
|
|
12
13
|
var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
14
|
+
var isServer = typeof window === 'undefined';
|
|
13
15
|
var processQueue = function (error, token) {
|
|
14
16
|
if (token === void 0) { token = null; }
|
|
15
17
|
failedQueue.forEach(function (prom) {
|
|
@@ -22,22 +24,47 @@ var processQueue = function (error, token) {
|
|
|
22
24
|
});
|
|
23
25
|
failedQueue = [];
|
|
24
26
|
};
|
|
25
|
-
var
|
|
27
|
+
var PHXApi = axios_1["default"].create({
|
|
26
28
|
baseURL: publicUrl
|
|
27
29
|
});
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
var getAuthHeaders = function () {
|
|
31
|
+
if (isServer) {
|
|
32
|
+
// Server-side
|
|
33
|
+
var cookieStore = (0, headers_1.cookies)();
|
|
34
|
+
var cookieHeader = cookieStore
|
|
35
|
+
.getAll()
|
|
36
|
+
.map(function (_a) {
|
|
37
|
+
var name = _a.name, value = _a.value;
|
|
38
|
+
return "".concat(name, "=").concat(value);
|
|
39
|
+
})
|
|
40
|
+
.join('; ');
|
|
41
|
+
return {
|
|
42
|
+
Cookie: cookieHeader,
|
|
43
|
+
Host: (0, headers_1.headers)().get('host') || 'localhost'
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
return {};
|
|
47
|
+
};
|
|
48
|
+
PHXApi.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
49
|
+
var currentSession, authTokenCookie, _a, _b;
|
|
50
|
+
return tslib_1.__generator(this, function (_c) {
|
|
51
|
+
switch (_c.label) {
|
|
32
52
|
case 0:
|
|
33
53
|
currentSession = (0, getCookieSession_1["default"])();
|
|
34
54
|
_a = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token);
|
|
35
|
-
if (_a) return [3 /*break*/,
|
|
55
|
+
if (_a) return [3 /*break*/, 4];
|
|
56
|
+
if (!!isServer) return [3 /*break*/, 2];
|
|
36
57
|
return [4 /*yield*/, convertAuthToken()];
|
|
37
58
|
case 1:
|
|
38
|
-
|
|
39
|
-
|
|
59
|
+
_b = _c.sent();
|
|
60
|
+
return [3 /*break*/, 3];
|
|
40
61
|
case 2:
|
|
62
|
+
_b = null;
|
|
63
|
+
_c.label = 3;
|
|
64
|
+
case 3:
|
|
65
|
+
_a = (_b);
|
|
66
|
+
_c.label = 4;
|
|
67
|
+
case 4:
|
|
41
68
|
authTokenCookie = _a;
|
|
42
69
|
if (authTokenCookie) {
|
|
43
70
|
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
@@ -46,7 +73,7 @@ api.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0
|
|
|
46
73
|
}
|
|
47
74
|
});
|
|
48
75
|
}); });
|
|
49
|
-
|
|
76
|
+
PHXApi.interceptors.response.use(function (response) { return response; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
50
77
|
var originalRequest, data, newToken, currentSession, err_1;
|
|
51
78
|
var _a;
|
|
52
79
|
return tslib_1.__generator(this, function (_b) {
|
|
@@ -59,7 +86,7 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
59
86
|
failedQueue.push({
|
|
60
87
|
resolve: function (token) {
|
|
61
88
|
originalRequest.headers.Authorization = 'Bearer ' + token;
|
|
62
|
-
resolve(
|
|
89
|
+
resolve(PHXApi(originalRequest));
|
|
63
90
|
},
|
|
64
91
|
reject: function (err) { return reject(err); }
|
|
65
92
|
});
|
|
@@ -71,6 +98,7 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
71
98
|
case 1:
|
|
72
99
|
_b.trys.push([1, 3, 4, 5]);
|
|
73
100
|
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
101
|
+
headers: getAuthHeaders(),
|
|
74
102
|
withCredentials: true
|
|
75
103
|
})];
|
|
76
104
|
case 2:
|
|
@@ -79,16 +107,20 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
79
107
|
currentSession = (0, getCookieSession_1["default"])();
|
|
80
108
|
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
81
109
|
// delete auth token old(v1)
|
|
82
|
-
|
|
83
|
-
|
|
110
|
+
if (isServer) {
|
|
111
|
+
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
112
|
+
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
113
|
+
}
|
|
84
114
|
processQueue(null, newToken);
|
|
85
115
|
originalRequest.headers.Authorization = 'Bearer ' + newToken;
|
|
86
|
-
return [2 /*return*/,
|
|
116
|
+
return [2 /*return*/, PHXApi(originalRequest)];
|
|
87
117
|
case 3:
|
|
88
118
|
err_1 = _b.sent();
|
|
89
119
|
processQueue(err_1, null);
|
|
90
|
-
|
|
91
|
-
|
|
120
|
+
if (isServer) {
|
|
121
|
+
js_cookie_1["default"].remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
122
|
+
window.location.href = constants_1.loginPage;
|
|
123
|
+
}
|
|
92
124
|
return [2 /*return*/, Promise.reject(err_1)];
|
|
93
125
|
case 4:
|
|
94
126
|
isRefreshing = false;
|
|
@@ -104,8 +136,7 @@ var convertAuthToken = function () { return tslib_1.__awaiter(void 0, void 0, vo
|
|
|
104
136
|
switch (_a.label) {
|
|
105
137
|
case 0:
|
|
106
138
|
_a.trys.push([0, 2, , 3]);
|
|
107
|
-
|
|
108
|
-
authToken = typeof window !== 'undefined' && JSON.parse(js_cookie_1["default"].get(constants_1.AUTH_TOKEN)).token;
|
|
139
|
+
authToken = isServer && JSON.parse(js_cookie_1["default"].get(constants_1.AUTH_TOKEN)).token;
|
|
109
140
|
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/convert", { authToken: authToken }, {
|
|
110
141
|
withCredentials: true
|
|
111
142
|
})];
|
|
@@ -124,5 +155,5 @@ var convertAuthToken = function () { return tslib_1.__awaiter(void 0, void 0, vo
|
|
|
124
155
|
}
|
|
125
156
|
});
|
|
126
157
|
}); };
|
|
127
|
-
exports["default"] =
|
|
158
|
+
exports["default"] = PHXApi;
|
|
128
159
|
//# sourceMappingURL=axiosInstance.js.map
|
|
@@ -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,mDAAqG;AACrG,kFAAmD;AACnD,gFAAwD;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
'use client';
|
|
2
3
|
exports.__esModule = true;
|
|
3
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var headers_1 = require("next/headers");
|
|
4
6
|
var js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
|
|
5
7
|
var constants_1 = require("../../utils/constants");
|
|
6
8
|
var helpers_1 = require("../../helpers/helpers");
|
|
7
9
|
function saveCookiesClient(_a) {
|
|
8
10
|
var value = _a.value, _b = _a.remember, remember = _b === void 0 ? true : _b;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
+
var encrypted = (0, helpers_1.encryptDataSync)(value);
|
|
12
|
+
var isServer = typeof window === 'undefined';
|
|
13
|
+
if (isServer) {
|
|
14
|
+
// Server-side
|
|
15
|
+
try {
|
|
16
|
+
(0, headers_1.cookies)().set(constants_1.COOKIE_SESSION_SIGN_IN, encrypted, {
|
|
17
|
+
path: '/',
|
|
18
|
+
httpOnly: false,
|
|
19
|
+
secure: false,
|
|
20
|
+
sameSite: 'lax',
|
|
21
|
+
expires: remember ? new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) : undefined
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
catch (err) {
|
|
25
|
+
console.warn('Cannot set cookies on server outside of server context');
|
|
26
|
+
}
|
|
11
27
|
}
|
|
12
28
|
else {
|
|
13
|
-
|
|
29
|
+
// Client-side
|
|
30
|
+
js_cookie_1["default"].set(constants_1.COOKIE_SESSION_SIGN_IN, encrypted, {
|
|
31
|
+
expires: remember ? 365 * 100 : undefined,
|
|
32
|
+
path: '/',
|
|
33
|
+
sameSite: 'lax'
|
|
34
|
+
});
|
|
14
35
|
}
|
|
15
36
|
}
|
|
16
37
|
exports["default"] = saveCookiesClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":";AAAA,YAAY,CAAA;;;AACZ,wCAAsC;AACtC,gEAA+B;AAC/B,mDAA8D;AAE9D,iDAAuD;AAEvD,SAAwB,iBAAiB,CAAC,EAAwE;QAAtE,KAAK,WAAA,EAAE,gBAAe,EAAf,QAAQ,mBAAG,IAAI,KAAA;IAChE,IAAM,SAAS,GAAG,IAAA,yBAAe,EAAC,KAAK,CAAC,CAAA;IACxC,IAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAA;IAE9C,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAI;YACF,IAAA,iBAAO,GAAE,CAAC,GAAG,CAAC,kCAAsB,EAAE,SAAS,EAAE;gBAC/C,IAAI,EAAE,GAAG;gBACT,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAA;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;SACvE;KACF;SAAM;QACL,cAAc;QACd,sBAAO,CAAC,GAAG,CAAC,kCAAsB,EAAE,SAAS,EAAE;YAC7C,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS;YACzC,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAA;KACH;AACH,CAAC;AAzBD,uCAyBC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const
|
|
2
|
-
export default
|
|
1
|
+
declare const PHXApi: import("axios").AxiosInstance;
|
|
2
|
+
export default PHXApi;
|
|
@@ -5,9 +5,11 @@ import { getEnv } from '../../read-env-config';
|
|
|
5
5
|
import { AUTH_TOKEN, COOKIE_SESSION_SIGN_IN, isLoggedCookie, loginPage } from '../../utils/constants';
|
|
6
6
|
import saveCookiesClient from './saveCookiesClient';
|
|
7
7
|
import PHXFuncGetCookieSession from './getCookieSession';
|
|
8
|
+
import { cookies, headers } from 'next/headers';
|
|
8
9
|
var isRefreshing = false;
|
|
9
10
|
var failedQueue = [];
|
|
10
11
|
var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
12
|
+
var isServer = typeof window === 'undefined';
|
|
11
13
|
var processQueue = function (error, token) {
|
|
12
14
|
if (token === void 0) { token = null; }
|
|
13
15
|
failedQueue.forEach(function (prom) {
|
|
@@ -20,22 +22,47 @@ var processQueue = function (error, token) {
|
|
|
20
22
|
});
|
|
21
23
|
failedQueue = [];
|
|
22
24
|
};
|
|
23
|
-
var
|
|
25
|
+
var PHXApi = axios.create({
|
|
24
26
|
baseURL: publicUrl
|
|
25
27
|
});
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
var getAuthHeaders = function () {
|
|
29
|
+
if (isServer) {
|
|
30
|
+
// Server-side
|
|
31
|
+
var cookieStore = cookies();
|
|
32
|
+
var cookieHeader = cookieStore
|
|
33
|
+
.getAll()
|
|
34
|
+
.map(function (_a) {
|
|
35
|
+
var name = _a.name, value = _a.value;
|
|
36
|
+
return "".concat(name, "=").concat(value);
|
|
37
|
+
})
|
|
38
|
+
.join('; ');
|
|
39
|
+
return {
|
|
40
|
+
Cookie: cookieHeader,
|
|
41
|
+
Host: headers().get('host') || 'localhost'
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
return {};
|
|
45
|
+
};
|
|
46
|
+
PHXApi.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
|
+
var currentSession, authTokenCookie, _a, _b;
|
|
48
|
+
return __generator(this, function (_c) {
|
|
49
|
+
switch (_c.label) {
|
|
30
50
|
case 0:
|
|
31
51
|
currentSession = PHXFuncGetCookieSession();
|
|
32
52
|
_a = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token);
|
|
33
|
-
if (_a) return [3 /*break*/,
|
|
53
|
+
if (_a) return [3 /*break*/, 4];
|
|
54
|
+
if (!!isServer) return [3 /*break*/, 2];
|
|
34
55
|
return [4 /*yield*/, convertAuthToken()];
|
|
35
56
|
case 1:
|
|
36
|
-
|
|
37
|
-
|
|
57
|
+
_b = _c.sent();
|
|
58
|
+
return [3 /*break*/, 3];
|
|
38
59
|
case 2:
|
|
60
|
+
_b = null;
|
|
61
|
+
_c.label = 3;
|
|
62
|
+
case 3:
|
|
63
|
+
_a = (_b);
|
|
64
|
+
_c.label = 4;
|
|
65
|
+
case 4:
|
|
39
66
|
authTokenCookie = _a;
|
|
40
67
|
if (authTokenCookie) {
|
|
41
68
|
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
@@ -44,7 +71,7 @@ api.interceptors.request.use(function (config) { return __awaiter(void 0, void 0
|
|
|
44
71
|
}
|
|
45
72
|
});
|
|
46
73
|
}); });
|
|
47
|
-
|
|
74
|
+
PHXApi.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
|
|
48
75
|
var originalRequest, data, newToken, currentSession, err_1;
|
|
49
76
|
var _a;
|
|
50
77
|
return __generator(this, function (_b) {
|
|
@@ -57,7 +84,7 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
57
84
|
failedQueue.push({
|
|
58
85
|
resolve: function (token) {
|
|
59
86
|
originalRequest.headers.Authorization = 'Bearer ' + token;
|
|
60
|
-
resolve(
|
|
87
|
+
resolve(PHXApi(originalRequest));
|
|
61
88
|
},
|
|
62
89
|
reject: function (err) { return reject(err); }
|
|
63
90
|
});
|
|
@@ -69,6 +96,7 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
69
96
|
case 1:
|
|
70
97
|
_b.trys.push([1, 3, 4, 5]);
|
|
71
98
|
return [4 /*yield*/, axios.post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
99
|
+
headers: getAuthHeaders(),
|
|
72
100
|
withCredentials: true
|
|
73
101
|
})];
|
|
74
102
|
case 2:
|
|
@@ -77,16 +105,20 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
77
105
|
currentSession = PHXFuncGetCookieSession();
|
|
78
106
|
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
79
107
|
// delete auth token old(v1)
|
|
80
|
-
|
|
81
|
-
|
|
108
|
+
if (isServer) {
|
|
109
|
+
Cookies.remove(AUTH_TOKEN);
|
|
110
|
+
localStorage.removeItem(isLoggedCookie);
|
|
111
|
+
}
|
|
82
112
|
processQueue(null, newToken);
|
|
83
113
|
originalRequest.headers.Authorization = 'Bearer ' + newToken;
|
|
84
|
-
return [2 /*return*/,
|
|
114
|
+
return [2 /*return*/, PHXApi(originalRequest)];
|
|
85
115
|
case 3:
|
|
86
116
|
err_1 = _b.sent();
|
|
87
117
|
processQueue(err_1, null);
|
|
88
|
-
|
|
89
|
-
|
|
118
|
+
if (isServer) {
|
|
119
|
+
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
120
|
+
window.location.href = loginPage;
|
|
121
|
+
}
|
|
90
122
|
return [2 /*return*/, Promise.reject(err_1)];
|
|
91
123
|
case 4:
|
|
92
124
|
isRefreshing = false;
|
|
@@ -102,8 +134,7 @@ var convertAuthToken = function () { return __awaiter(void 0, void 0, void 0, fu
|
|
|
102
134
|
switch (_a.label) {
|
|
103
135
|
case 0:
|
|
104
136
|
_a.trys.push([0, 2, , 3]);
|
|
105
|
-
|
|
106
|
-
authToken = typeof window !== 'undefined' && JSON.parse(Cookies.get(AUTH_TOKEN)).token;
|
|
137
|
+
authToken = isServer && JSON.parse(Cookies.get(AUTH_TOKEN)).token;
|
|
107
138
|
return [4 /*yield*/, axios.post("http://localhost:8100/authen/convert", { authToken: authToken }, {
|
|
108
139
|
withCredentials: true
|
|
109
140
|
})];
|
|
@@ -122,5 +153,5 @@ var convertAuthToken = function () { return __awaiter(void 0, void 0, void 0, fu
|
|
|
122
153
|
}
|
|
123
154
|
});
|
|
124
155
|
}); };
|
|
125
|
-
export default
|
|
156
|
+
export default PHXApi;
|
|
126
157
|
//# sourceMappingURL=axiosInstance.js.map
|
|
@@ -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,UAAU,EAAE,sBAAsB,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACrG,OAAO,iBAAiB,MAAM,qBAAqB,CAAA;AACnD,OAAO,uBAAuB,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,34 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
import { cookies } from 'next/headers';
|
|
1
3
|
import Cookies from 'js-cookie';
|
|
2
4
|
import { COOKIE_SESSION_SIGN_IN } from '../../utils/constants';
|
|
3
5
|
import { encryptDataSync } from '../../helpers/helpers';
|
|
4
6
|
export default function saveCookiesClient(_a) {
|
|
5
7
|
var value = _a.value, _b = _a.remember, remember = _b === void 0 ? true : _b;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
var encrypted = encryptDataSync(value);
|
|
9
|
+
var isServer = typeof window === 'undefined';
|
|
10
|
+
if (isServer) {
|
|
11
|
+
// Server-side
|
|
12
|
+
try {
|
|
13
|
+
cookies().set(COOKIE_SESSION_SIGN_IN, encrypted, {
|
|
14
|
+
path: '/',
|
|
15
|
+
httpOnly: false,
|
|
16
|
+
secure: false,
|
|
17
|
+
sameSite: 'lax',
|
|
18
|
+
expires: remember ? new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) : undefined
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
catch (err) {
|
|
22
|
+
console.warn('Cannot set cookies on server outside of server context');
|
|
23
|
+
}
|
|
8
24
|
}
|
|
9
25
|
else {
|
|
10
|
-
|
|
26
|
+
// Client-side
|
|
27
|
+
Cookies.set(COOKIE_SESSION_SIGN_IN, encrypted, {
|
|
28
|
+
expires: remember ? 365 * 100 : undefined,
|
|
29
|
+
path: '/',
|
|
30
|
+
sameSite: 'lax'
|
|
31
|
+
});
|
|
11
32
|
}
|
|
12
33
|
}
|
|
13
34
|
//# sourceMappingURL=saveCookiesClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAwE;QAAtE,KAAK,WAAA,EAAE,gBAAe,EAAf,QAAQ,mBAAG,IAAI,KAAA;IAChE,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"saveCookiesClient.js","sourceRoot":"","sources":["../../../../src/components/Func/saveCookiesClient.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAwE;QAAtE,KAAK,WAAA,EAAE,gBAAe,EAAf,QAAQ,mBAAG,IAAI,KAAA;IAChE,IAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACxC,IAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAA;IAE9C,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAI;YACF,OAAO,EAAE,CAAC,GAAG,CAAC,sBAAsB,EAAE,SAAS,EAAE;gBAC/C,IAAI,EAAE,GAAG;gBACT,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAA;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;SACvE;KACF;SAAM;QACL,cAAc;QACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,SAAS,EAAE;YAC7C,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS;YACzC,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAA;KACH;AACH,CAAC"}
|