@unchainedshop/api 2.12.0 → 2.12.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSingleSignOnMiddleware.d.ts","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"createSingleSignOnMiddleware.d.ts","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAsEvC,wBAA8B,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG;IAAE,KAAK,CAAC,EAAE,GAAG,CAAA;CAAE,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA,iBAoBrG"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
2
|
import cookie from 'cookie';
|
|
3
3
|
import { getCurrentContextResolver } from '../context.js';
|
|
4
|
-
const { ROOT_URL, NODE_ENV, UNCHAINED_CLOUD_ENDPOINT } = process.env;
|
|
4
|
+
const { ROOT_URL, NODE_ENV, UNCHAINED_CLOUD_ENDPOINT, UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_DOMAIN, } = process.env;
|
|
5
5
|
const logger = createLogger('unchained:unchained-cloud-sso');
|
|
6
6
|
const loginWithSingleSignOn = async (remoteToken, context) => {
|
|
7
|
-
const domain =
|
|
7
|
+
const domain = UNCHAINED_COOKIE_DOMAIN || new URL(ROOT_URL).hostname || 'localhost';
|
|
8
8
|
const result = await fetch(UNCHAINED_CLOUD_ENDPOINT, {
|
|
9
9
|
method: 'POST',
|
|
10
10
|
headers: {
|
|
@@ -37,7 +37,7 @@ const loginWithSingleSignOn = async (remoteToken, context) => {
|
|
|
37
37
|
}, { skipMessaging: true }));
|
|
38
38
|
const { tokenExpires, token } = await context.modules.accounts.createLoginToken(ssoUserId, context);
|
|
39
39
|
const expires = new Date(tokenExpires || new Date().getTime() + 100000);
|
|
40
|
-
const authCookie = cookie.serialize(
|
|
40
|
+
const authCookie = cookie.serialize(UNCHAINED_COOKIE_NAME, token, {
|
|
41
41
|
domain,
|
|
42
42
|
httpOnly: true,
|
|
43
43
|
expires,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,
|
|
1
|
+
{"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/api",
|
|
3
|
-
"version": "2.12.
|
|
3
|
+
"version": "2.12.2",
|
|
4
4
|
"main": "lib/api-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/api-index.js",
|
|
@@ -48,27 +48,27 @@
|
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@metamask/eth-sig-util": "^7.0.2",
|
|
51
|
-
"@unchainedshop/core": "^2.12.
|
|
52
|
-
"@unchainedshop/events": "^2.12.
|
|
53
|
-
"@unchainedshop/logger": "^2.12.
|
|
54
|
-
"@unchainedshop/roles": "^2.12.
|
|
55
|
-
"@unchainedshop/utils": "^2.12.
|
|
51
|
+
"@unchainedshop/core": "^2.12.2",
|
|
52
|
+
"@unchainedshop/events": "^2.12.2",
|
|
53
|
+
"@unchainedshop/logger": "^2.12.2",
|
|
54
|
+
"@unchainedshop/roles": "^2.12.2",
|
|
55
|
+
"@unchainedshop/utils": "^2.12.2",
|
|
56
56
|
"accounting": "0.4.1",
|
|
57
57
|
"dataloader": "^2.2.2",
|
|
58
58
|
"graphql-scalars": "^1.23.0",
|
|
59
59
|
"graphql-upload": "^16.0.2",
|
|
60
60
|
"locale": "0.1.0",
|
|
61
61
|
"lodash.isnumber": "3.0.3",
|
|
62
|
-
"lru-cache": "^
|
|
62
|
+
"lru-cache": "^11.0.0"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"@types/graphql-upload": "^16.0.7",
|
|
66
66
|
"@types/locale": "^0.1.4",
|
|
67
|
-
"@types/node": "^20.14.
|
|
68
|
-
"@unchainedshop/types": "^2.12.
|
|
67
|
+
"@types/node": "^20.14.10",
|
|
68
|
+
"@unchainedshop/types": "^2.12.2",
|
|
69
69
|
"express": "^4.19.2",
|
|
70
70
|
"jest": "^29.7.0",
|
|
71
|
-
"ts-jest": "^29.
|
|
71
|
+
"ts-jest": "^29.2.2",
|
|
72
72
|
"typescript": "^5.5.3"
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -5,12 +5,18 @@ import { UnchainedCore } from '@unchainedshop/types/core.js';
|
|
|
5
5
|
import cookie from 'cookie';
|
|
6
6
|
import { getCurrentContextResolver } from '../context.js';
|
|
7
7
|
|
|
8
|
-
const {
|
|
8
|
+
const {
|
|
9
|
+
ROOT_URL,
|
|
10
|
+
NODE_ENV,
|
|
11
|
+
UNCHAINED_CLOUD_ENDPOINT,
|
|
12
|
+
UNCHAINED_COOKIE_NAME = 'unchained_token',
|
|
13
|
+
UNCHAINED_COOKIE_DOMAIN,
|
|
14
|
+
} = process.env;
|
|
9
15
|
|
|
10
16
|
const logger = createLogger('unchained:unchained-cloud-sso');
|
|
11
17
|
|
|
12
18
|
const loginWithSingleSignOn = async (remoteToken, context: UnchainedCore) => {
|
|
13
|
-
const domain =
|
|
19
|
+
const domain = UNCHAINED_COOKIE_DOMAIN || new URL(ROOT_URL).hostname || 'localhost';
|
|
14
20
|
const result = await fetch(UNCHAINED_CLOUD_ENDPOINT, {
|
|
15
21
|
method: 'POST',
|
|
16
22
|
headers: {
|
|
@@ -49,7 +55,7 @@ const loginWithSingleSignOn = async (remoteToken, context: UnchainedCore) => {
|
|
|
49
55
|
));
|
|
50
56
|
const { tokenExpires, token } = await context.modules.accounts.createLoginToken(ssoUserId, context);
|
|
51
57
|
const expires = new Date(tokenExpires || new Date().getTime() + 100000);
|
|
52
|
-
const authCookie = cookie.serialize(
|
|
58
|
+
const authCookie = cookie.serialize(UNCHAINED_COOKIE_NAME, token, {
|
|
53
59
|
domain,
|
|
54
60
|
httpOnly: true,
|
|
55
61
|
expires,
|