@aws-amplify/core 5.0.9 → 5.0.10-unstableV5.4
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/lib/Platform/version.d.ts +1 -1
- package/lib/Platform/version.js +1 -1
- package/lib/UniversalStorage/index.d.ts +2 -2
- package/lib/UniversalStorage/index.js +16 -21
- package/lib/UniversalStorage/index.js.map +1 -1
- package/lib-esm/Platform/version.d.ts +1 -1
- package/lib-esm/Platform/version.js +1 -1
- package/lib-esm/UniversalStorage/index.d.ts +2 -2
- package/lib-esm/UniversalStorage/index.js +17 -21
- package/lib-esm/UniversalStorage/index.js.map +1 -1
- package/package.json +36 -3
- package/src/Platform/version.ts +1 -1
- package/src/UniversalStorage/index.ts +21 -18
- package/typings.d.ts +0 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "5.0.
|
|
1
|
+
export declare const version = "5.0.9";
|
package/lib/Platform/version.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Cookies from 'universal-cookie';
|
|
1
|
+
import Cookies, { CookieSetOptions } from 'universal-cookie';
|
|
2
2
|
declare type Store = Record<string, string>;
|
|
3
3
|
declare type Context = {
|
|
4
4
|
req?: any;
|
|
@@ -18,6 +18,6 @@ export declare class UniversalStorage implements Storage {
|
|
|
18
18
|
protected removeUniversalItem(key: keyof Store): void;
|
|
19
19
|
setItem(key: keyof Store, value: string): void;
|
|
20
20
|
protected setLocalItem(key: keyof Store, value: string): void;
|
|
21
|
-
protected setUniversalItem(key: keyof Store, value: string): void;
|
|
21
|
+
protected setUniversalItem(key: keyof Store, value: string, options?: CookieSetOptions): void;
|
|
22
22
|
}
|
|
23
23
|
export {};
|
|
@@ -4,6 +4,7 @@ var tslib_1 = require("tslib");
|
|
|
4
4
|
var universal_cookie_1 = tslib_1.__importDefault(require("universal-cookie"));
|
|
5
5
|
var JS_1 = require("../JS");
|
|
6
6
|
var isBrowser = JS_1.browserOrNode().isBrowser;
|
|
7
|
+
var ONE_YEAR_IN_MS = 365 * 24 * 60 * 60 * 1000;
|
|
7
8
|
var UniversalStorage = /** @class */ (function () {
|
|
8
9
|
function UniversalStorage(context) {
|
|
9
10
|
if (context === void 0) { context = {}; }
|
|
@@ -59,37 +60,31 @@ var UniversalStorage = /** @class */ (function () {
|
|
|
59
60
|
// 1. `${ProviderPrefix}.${userPoolClientId}.${username}.${tokenType}
|
|
60
61
|
// 2. `${ProviderPrefix}.${userPoolClientId}.LastAuthUser
|
|
61
62
|
var tokenType = key.split('.').pop();
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
// accessToken is required for CognitoUserSession
|
|
66
|
-
case 'accessToken':
|
|
63
|
+
var sessionTokenTypes = [
|
|
64
|
+
'LastAuthUser',
|
|
65
|
+
'accessToken',
|
|
67
66
|
// refreshToken originates on the client, but SSR pages won't fail when this expires
|
|
68
67
|
// Note: the new `accessToken` will also be refreshed on the client (since Amplify doesn't set server-side cookies)
|
|
69
|
-
|
|
68
|
+
'refreshToken',
|
|
70
69
|
// Required for CognitoUserSession
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
// case 'userData':
|
|
78
|
-
// Ignoring clockDrift on the server for now, but needs testing
|
|
79
|
-
// case 'clockDrift':
|
|
70
|
+
'idToken',
|
|
71
|
+
];
|
|
72
|
+
if (sessionTokenTypes.includes(tokenType !== null && tokenType !== void 0 ? tokenType : '')) {
|
|
73
|
+
this.setUniversalItem(key, value, {
|
|
74
|
+
expires: new Date(Date.now() + ONE_YEAR_IN_MS),
|
|
75
|
+
});
|
|
80
76
|
}
|
|
81
77
|
};
|
|
82
78
|
UniversalStorage.prototype.setLocalItem = function (key, value) {
|
|
83
79
|
this.store[key] = value;
|
|
84
80
|
};
|
|
85
|
-
UniversalStorage.prototype.setUniversalItem = function (key, value) {
|
|
86
|
-
|
|
87
|
-
|
|
81
|
+
UniversalStorage.prototype.setUniversalItem = function (key, value, options) {
|
|
82
|
+
if (options === void 0) { options = {}; }
|
|
83
|
+
this.cookies.set(key, value, tslib_1.__assign(tslib_1.__assign({}, options), { path: '/',
|
|
88
84
|
// `httpOnly` cannot be set via JavaScript: https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#JavaScript_access_using_Document.cookie
|
|
89
|
-
sameSite: true,
|
|
85
|
+
sameSite: true,
|
|
90
86
|
// Allow unsecure requests to http://localhost:3000/ when in development.
|
|
91
|
-
secure: window.location.hostname === 'localhost' ? false : true
|
|
92
|
-
});
|
|
87
|
+
secure: window.location.hostname === 'localhost' ? false : true }));
|
|
93
88
|
};
|
|
94
89
|
return UniversalStorage;
|
|
95
90
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/UniversalStorage/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/UniversalStorage/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "5.0.
|
|
1
|
+
export declare const version = "5.0.9";
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Cookies from 'universal-cookie';
|
|
1
|
+
import Cookies, { CookieSetOptions } from 'universal-cookie';
|
|
2
2
|
declare type Store = Record<string, string>;
|
|
3
3
|
declare type Context = {
|
|
4
4
|
req?: any;
|
|
@@ -18,6 +18,6 @@ export declare class UniversalStorage implements Storage {
|
|
|
18
18
|
protected removeUniversalItem(key: keyof Store): void;
|
|
19
19
|
setItem(key: keyof Store, value: string): void;
|
|
20
20
|
protected setLocalItem(key: keyof Store, value: string): void;
|
|
21
|
-
protected setUniversalItem(key: keyof Store, value: string): void;
|
|
21
|
+
protected setUniversalItem(key: keyof Store, value: string, options?: CookieSetOptions): void;
|
|
22
22
|
}
|
|
23
23
|
export {};
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { __assign } from "tslib";
|
|
1
2
|
import Cookies from 'universal-cookie';
|
|
2
3
|
import { browserOrNode } from '../JS';
|
|
3
4
|
var isBrowser = browserOrNode().isBrowser;
|
|
5
|
+
var ONE_YEAR_IN_MS = 365 * 24 * 60 * 60 * 1000;
|
|
4
6
|
var UniversalStorage = /** @class */ (function () {
|
|
5
7
|
function UniversalStorage(context) {
|
|
6
8
|
if (context === void 0) { context = {}; }
|
|
@@ -56,37 +58,31 @@ var UniversalStorage = /** @class */ (function () {
|
|
|
56
58
|
// 1. `${ProviderPrefix}.${userPoolClientId}.${username}.${tokenType}
|
|
57
59
|
// 2. `${ProviderPrefix}.${userPoolClientId}.LastAuthUser
|
|
58
60
|
var tokenType = key.split('.').pop();
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
// accessToken is required for CognitoUserSession
|
|
63
|
-
case 'accessToken':
|
|
61
|
+
var sessionTokenTypes = [
|
|
62
|
+
'LastAuthUser',
|
|
63
|
+
'accessToken',
|
|
64
64
|
// refreshToken originates on the client, but SSR pages won't fail when this expires
|
|
65
65
|
// Note: the new `accessToken` will also be refreshed on the client (since Amplify doesn't set server-side cookies)
|
|
66
|
-
|
|
66
|
+
'refreshToken',
|
|
67
67
|
// Required for CognitoUserSession
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
// case 'userData':
|
|
75
|
-
// Ignoring clockDrift on the server for now, but needs testing
|
|
76
|
-
// case 'clockDrift':
|
|
68
|
+
'idToken',
|
|
69
|
+
];
|
|
70
|
+
if (sessionTokenTypes.includes(tokenType !== null && tokenType !== void 0 ? tokenType : '')) {
|
|
71
|
+
this.setUniversalItem(key, value, {
|
|
72
|
+
expires: new Date(Date.now() + ONE_YEAR_IN_MS),
|
|
73
|
+
});
|
|
77
74
|
}
|
|
78
75
|
};
|
|
79
76
|
UniversalStorage.prototype.setLocalItem = function (key, value) {
|
|
80
77
|
this.store[key] = value;
|
|
81
78
|
};
|
|
82
|
-
UniversalStorage.prototype.setUniversalItem = function (key, value) {
|
|
83
|
-
|
|
84
|
-
|
|
79
|
+
UniversalStorage.prototype.setUniversalItem = function (key, value, options) {
|
|
80
|
+
if (options === void 0) { options = {}; }
|
|
81
|
+
this.cookies.set(key, value, __assign(__assign({}, options), { path: '/',
|
|
85
82
|
// `httpOnly` cannot be set via JavaScript: https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#JavaScript_access_using_Document.cookie
|
|
86
|
-
sameSite: true,
|
|
83
|
+
sameSite: true,
|
|
87
84
|
// Allow unsecure requests to http://localhost:3000/ when in development.
|
|
88
|
-
secure: window.location.hostname === 'localhost' ? false : true
|
|
89
|
-
});
|
|
85
|
+
secure: window.location.hostname === 'localhost' ? false : true }));
|
|
90
86
|
};
|
|
91
87
|
return UniversalStorage;
|
|
92
88
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/UniversalStorage/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/UniversalStorage/index.ts"],"names":[],"mappings":";AAAA,OAAO,OAA6B,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI9B,IAAA,qCAAS,CAAqB;AAKtC,IAAM,cAAc,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEjD;IAIC,0BAAY,OAAqB;QAArB,wBAAA,EAAA,YAAqB;QAHjC,YAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QACxB,UAAK,GAAU,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAGpE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG;YACzB,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YACzC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;QAEjB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,sBAAI,oCAAM;aAAV;YACC,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;QAC1C,CAAC;;;OAAA;IAED,gCAAK,GAAL;QAAA,iBAIC;QAHA,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAChC,GAAG,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,KAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC;aAC1B,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,KAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAApB,CAAoB,CAAC,CAAC;IACxC,CAAC;IAED,kCAAO,GAAP,UAAQ,GAAgB;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAES,uCAAY,GAAtB,UAAuB,GAAgB;QACtC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC;YAC3D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YACjB,CAAC,CAAC,IAAI,CAAC;IACT,CAAC;IAES,2CAAgB,GAA1B,UAA2B,GAAgB;QAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,8BAAG,GAAH,UAAI,KAAa;QAChB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,qCAAU,GAAV,UAAW,GAAW;QACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAES,0CAAe,GAAzB,UAA0B,GAAgB;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAES,8CAAmB,GAA7B,UAA8B,GAAgB;QAC7C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YACxB,IAAI,EAAE,GAAG;SACT,CAAC,CAAC;IACJ,CAAC;IAED,kCAAO,GAAP,UAAQ,GAAgB,EAAE,KAAa;QACtC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAE9B,uBAAuB;QACvB,sEAAsE;QACtE,0DAA0D;QAC1D,IAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAEvC,IAAM,iBAAiB,GAAG;YACzB,cAAc;YACd,aAAa;YACb,oFAAoF;YACpF,mHAAmH;YACnH,cAAc;YACd,kCAAkC;YAClC,SAAS;SAOT,CAAC;QACF,IAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,EAAE;YAChD,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE;gBACjC,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;aAC9C,CAAC,CAAC;SACH;IACF,CAAC;IAES,uCAAY,GAAtB,UAAuB,GAAgB,EAAE,KAAa;QACrD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACzB,CAAC;IAES,2CAAgB,GAA1B,UACC,GAAgB,EAChB,KAAa,EACb,OAA8B;QAA9B,wBAAA,EAAA,YAA8B;QAE9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,wBACvB,OAAO,KACV,IAAI,EAAE,GAAG;YACT,6IAA6I;YAC7I,QAAQ,EAAE,IAAI;YACd,yEAAyE;YACzE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAC9D,CAAC;IACJ,CAAC;IACF,uBAAC;AAAD,CAAC,AAvGD,IAuGC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/core",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.10-unstableV5.4+d34c01aa0",
|
|
4
4
|
"description": "Core category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
],
|
|
17
17
|
"scripts": {
|
|
18
18
|
"test": "tslint 'src/**/*.ts' && jest -w 1 --coverage",
|
|
19
|
+
"test:size": "size-limit",
|
|
19
20
|
"build-with-test": "npm test && npm run build",
|
|
20
21
|
"build:cjs": "node ./build es5 && webpack && webpack --config ./webpack.config.dev.js",
|
|
21
22
|
"build:esm": "rimraf lib-esm && node ./build es6",
|
|
@@ -23,7 +24,7 @@
|
|
|
23
24
|
"build:esm:watch": "rimraf lib-esm && node ./build es6 --watch",
|
|
24
25
|
"build": "npm run clean && npm run generate-version && npm run build:esm && npm run build:cjs",
|
|
25
26
|
"generate-version": "genversion src/Platform/version.ts --es6 --semi",
|
|
26
|
-
"clean": "rimraf lib-esm lib dist",
|
|
27
|
+
"clean": "rimraf lib-esm lib dist dual-publish-tmp",
|
|
27
28
|
"format": "echo \"Not implemented\"",
|
|
28
29
|
"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
|
|
29
30
|
"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 76.41"
|
|
@@ -68,6 +69,38 @@
|
|
|
68
69
|
"universal-cookie": "^4.0.4",
|
|
69
70
|
"zen-observable-ts": "0.8.19"
|
|
70
71
|
},
|
|
72
|
+
"size-limit": [
|
|
73
|
+
{
|
|
74
|
+
"name": "Core (ServiceWorker)",
|
|
75
|
+
"path": "./lib-esm/index.js",
|
|
76
|
+
"import": "{ ServiceWorker }",
|
|
77
|
+
"limit": "2.4 kB"
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
"name": "Core (Hub)",
|
|
81
|
+
"path": "./lib-esm/index.js",
|
|
82
|
+
"import": "{ Hub }",
|
|
83
|
+
"limit": "2 kB"
|
|
84
|
+
},
|
|
85
|
+
{
|
|
86
|
+
"name": "Core (I18n)",
|
|
87
|
+
"path": "./lib-esm/index.js",
|
|
88
|
+
"import": "{ I18n }",
|
|
89
|
+
"limit": "2 kB"
|
|
90
|
+
},
|
|
91
|
+
{
|
|
92
|
+
"name": "Core (Logger)",
|
|
93
|
+
"path": "./lib-esm/index.js",
|
|
94
|
+
"import": "{ Logger }",
|
|
95
|
+
"limit": "1.2 kB"
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
"name": "Core (Credentials)",
|
|
99
|
+
"path": "./lib-esm/index.js",
|
|
100
|
+
"import": "{ Credentials }",
|
|
101
|
+
"limit": "34.5 kB"
|
|
102
|
+
}
|
|
103
|
+
],
|
|
71
104
|
"jest": {
|
|
72
105
|
"globals": {
|
|
73
106
|
"ts-jest": {
|
|
@@ -112,5 +145,5 @@
|
|
|
112
145
|
"lib-esm"
|
|
113
146
|
]
|
|
114
147
|
},
|
|
115
|
-
"gitHead": "
|
|
148
|
+
"gitHead": "d34c01aa04599508e9473d128779bc8212343ece"
|
|
116
149
|
}
|
package/src/Platform/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// generated by genversion
|
|
2
|
-
export const version = '5.0.
|
|
2
|
+
export const version = '5.0.9';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Cookies from 'universal-cookie';
|
|
1
|
+
import Cookies, { CookieSetOptions } from 'universal-cookie';
|
|
2
2
|
import { browserOrNode } from '../JS';
|
|
3
3
|
|
|
4
4
|
type Store = Record<string, string>;
|
|
@@ -8,6 +8,8 @@ const { isBrowser } = browserOrNode();
|
|
|
8
8
|
// Avoid using @types/next because @aws-amplify/ui-angular's version of TypeScript is too old to support it
|
|
9
9
|
type Context = { req?: any };
|
|
10
10
|
|
|
11
|
+
const ONE_YEAR_IN_MS = 365 * 24 * 60 * 60 * 1000;
|
|
12
|
+
|
|
11
13
|
export class UniversalStorage implements Storage {
|
|
12
14
|
cookies = new Cookies();
|
|
13
15
|
store: Store = isBrowser ? window.localStorage : Object.create(null);
|
|
@@ -71,29 +73,25 @@ export class UniversalStorage implements Storage {
|
|
|
71
73
|
// 2. `${ProviderPrefix}.${userPoolClientId}.LastAuthUser
|
|
72
74
|
const tokenType = key.split('.').pop();
|
|
73
75
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
// accessToken is required for CognitoUserSession
|
|
79
|
-
case 'accessToken':
|
|
80
|
-
|
|
76
|
+
const sessionTokenTypes = [
|
|
77
|
+
'LastAuthUser',
|
|
78
|
+
'accessToken',
|
|
81
79
|
// refreshToken originates on the client, but SSR pages won't fail when this expires
|
|
82
80
|
// Note: the new `accessToken` will also be refreshed on the client (since Amplify doesn't set server-side cookies)
|
|
83
|
-
|
|
84
|
-
|
|
81
|
+
'refreshToken',
|
|
85
82
|
// Required for CognitoUserSession
|
|
86
|
-
|
|
87
|
-
isBrowser
|
|
88
|
-
? this.setUniversalItem(key, value)
|
|
89
|
-
: this.setLocalItem(key, value);
|
|
90
|
-
|
|
83
|
+
'idToken',
|
|
91
84
|
// userData is used when `Auth.currentAuthenticatedUser({ bypassCache: false })`.
|
|
92
85
|
// Can be persisted to speed up calls to `Auth.currentAuthenticatedUser()`
|
|
93
|
-
//
|
|
86
|
+
// 'userData',
|
|
94
87
|
|
|
95
88
|
// Ignoring clockDrift on the server for now, but needs testing
|
|
96
|
-
//
|
|
89
|
+
// 'clockDrift',
|
|
90
|
+
];
|
|
91
|
+
if (sessionTokenTypes.includes(tokenType ?? '')) {
|
|
92
|
+
this.setUniversalItem(key, value, {
|
|
93
|
+
expires: new Date(Date.now() + ONE_YEAR_IN_MS),
|
|
94
|
+
});
|
|
97
95
|
}
|
|
98
96
|
}
|
|
99
97
|
|
|
@@ -101,8 +99,13 @@ export class UniversalStorage implements Storage {
|
|
|
101
99
|
this.store[key] = value;
|
|
102
100
|
}
|
|
103
101
|
|
|
104
|
-
protected setUniversalItem(
|
|
102
|
+
protected setUniversalItem(
|
|
103
|
+
key: keyof Store,
|
|
104
|
+
value: string,
|
|
105
|
+
options: CookieSetOptions = {}
|
|
106
|
+
) {
|
|
105
107
|
this.cookies.set(key, value, {
|
|
108
|
+
...options,
|
|
106
109
|
path: '/',
|
|
107
110
|
// `httpOnly` cannot be set via JavaScript: https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#JavaScript_access_using_Document.cookie
|
|
108
111
|
sameSite: true,
|
package/typings.d.ts
DELETED