@unchainedshop/api 2.16.2 → 2.16.3
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/express/createSingleSignOnMiddleware.d.ts.map +1 -1
- package/lib/express/createSingleSignOnMiddleware.js +2 -4
- package/lib/express/createSingleSignOnMiddleware.js.map +1 -1
- package/lib/user-context.d.ts.map +1 -1
- package/lib/user-context.js +12 -4
- package/lib/user-context.js.map +1 -1
- package/package.json +1 -1
- package/src/express/createSingleSignOnMiddleware.ts +1 -5
- package/src/user-context.ts +13 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSingleSignOnMiddleware.d.ts","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createSingleSignOnMiddleware.d.ts","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAmEvC,wBAA8B,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG;IAAE,KAAK,CAAC,EAAE,GAAG,CAAA;CAAE,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA,iBAoBrG"}
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
2
|
import cookie from 'cookie';
|
|
3
3
|
import { getCurrentContextResolver } from '../context.js';
|
|
4
|
-
const {
|
|
4
|
+
const { 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 = UNCHAINED_COOKIE_DOMAIN
|
|
7
|
+
const domain = UNCHAINED_COOKIE_DOMAIN;
|
|
8
8
|
const result = await fetch(UNCHAINED_CLOUD_ENDPOINT, {
|
|
9
9
|
method: 'POST',
|
|
10
10
|
headers: {
|
|
11
11
|
'content-type': 'application/json',
|
|
12
12
|
},
|
|
13
|
-
// eslint-disable-next-line
|
|
14
|
-
// @ts-ignore
|
|
15
13
|
duplex: 'half',
|
|
16
14
|
body: JSON.stringify({
|
|
17
15
|
operationName: 'consume',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,EACJ,QAAQ,EACR,wBAAwB,EACxB,qBAAqB,GAAG,iBAAiB,EACzC,uBAAuB,GACxB,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,MAAM,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAC;AAE7D,MAAM,qBAAqB,GAAG,KAAK,EAAE,WAAW,EAAE,OAAsB,EAAE,EAAE;IAC1E,MAAM,MAAM,GAAG,uBAAuB,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,wBAAwB,EAAE;QACnD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;QACD,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,aAAa,EAAE,SAAS;YACxB,SAAS,EAAE;gBACT,KAAK,EAAE,WAAW;aACnB;YACD,KAAK,EACH,6FAA6F;SAChG,CAAC;KACH,CAAC,CAAC;IACH,MAAM,IAAI,GAAQ,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,IAAI,EAAE,IAAI,EAAE,+BAA+B,EAAE,MAAM,EAAE,CAAC;QAC7F,yCAAyC;QACzC,MAAM,SAAS,GACb,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG;YAChE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CACxC;gBACE,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,CAAC,OAAO,CAAC;gBAChB,KAAK,EAAE,qBAAqB;gBAC5B,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,KAAK;aACb,EACD,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC,CAAC;QACL,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpG,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,qBAAqB,EAAE,KAAK,EAAE;YAChE,MAAM;YACN,QAAQ,EAAE,IAAI;YACd,OAAO;YACP,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,QAAQ,KAAK,YAAY;SAClC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAAC,GAAsC,EAAE,GAAG,EAAE,IAAI;IACpG,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,IAAI,wBAAwB,EAAE,CAAC;YACjD,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;YACpD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAEzE,IAAI,UAAU,EAAE,CAAC;gBACf,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;oBACjB,YAAY,EAAE,UAAU;oBACxB,QAAQ,EAAE,GAAG;iBACd,CAAC,CAAC;gBACH,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IACD,IAAI,EAAE,CAAC;AACT,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-context.d.ts","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"user-context.d.ts","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AA0C7D,eAAO,MAAM,cAAc,QACpB,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,OACnC,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,oBAAoB,CAsD9B,CAAC"}
|
package/lib/user-context.js
CHANGED
|
@@ -2,12 +2,20 @@ import cookie from 'cookie';
|
|
|
2
2
|
function isString(input) {
|
|
3
3
|
return typeof input === 'string' && Object.prototype.toString.call(input) === '[object String]';
|
|
4
4
|
}
|
|
5
|
-
const { UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN,
|
|
5
|
+
const { UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, UNCHAINED_COOKIE_SAMESITE, UNCHAINED_COOKIE_INSECURE, } = process.env;
|
|
6
6
|
function setLoginToken(res, token, expires) {
|
|
7
7
|
const cookieName = UNCHAINED_COOKIE_NAME;
|
|
8
8
|
const domain = UNCHAINED_COOKIE_DOMAIN;
|
|
9
9
|
const path = UNCHAINED_COOKIE_PATH;
|
|
10
|
-
|
|
10
|
+
const secure = UNCHAINED_COOKIE_INSECURE ? false : true;
|
|
11
|
+
const sameSite = ({
|
|
12
|
+
none: 'none',
|
|
13
|
+
lax: 'lax',
|
|
14
|
+
strict: 'strict',
|
|
15
|
+
'1': true,
|
|
16
|
+
'0': false,
|
|
17
|
+
}[UNCHAINED_COOKIE_SAMESITE?.trim()?.toLowerCase()] || false);
|
|
18
|
+
if (!cookieName)
|
|
11
19
|
return;
|
|
12
20
|
const authCookie = cookie.serialize(cookieName, token || null, {
|
|
13
21
|
domain,
|
|
@@ -15,8 +23,8 @@ function setLoginToken(res, token, expires) {
|
|
|
15
23
|
path,
|
|
16
24
|
expires: token && expires ? expires : undefined,
|
|
17
25
|
maxAge: token ? undefined : -1,
|
|
18
|
-
sameSite
|
|
19
|
-
secure
|
|
26
|
+
sameSite,
|
|
27
|
+
secure,
|
|
20
28
|
});
|
|
21
29
|
res.setHeader('Set-Cookie', authCookie);
|
|
22
30
|
}
|
package/lib/user-context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-context.js","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,SAAS,QAAQ,CAAC,KAAK;IACrB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,iBAAiB,CAAC;AAClG,CAAC;AAED,MAAM,EACJ,qBAAqB,GAAG,iBAAiB,EACzC,qBAAqB,GAAG,GAAG,EAC3B,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"user-context.js","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference lib="dom" />
|
|
2
1
|
import { IncomingMessage } from 'http';
|
|
3
2
|
import { createLogger } from '@unchainedshop/logger';
|
|
4
3
|
import { UnchainedCore } from '@unchainedshop/types/core.js';
|
|
@@ -6,7 +5,6 @@ import cookie from 'cookie';
|
|
|
6
5
|
import { getCurrentContextResolver } from '../context.js';
|
|
7
6
|
|
|
8
7
|
const {
|
|
9
|
-
ROOT_URL,
|
|
10
8
|
NODE_ENV,
|
|
11
9
|
UNCHAINED_CLOUD_ENDPOINT,
|
|
12
10
|
UNCHAINED_COOKIE_NAME = 'unchained_token',
|
|
@@ -16,14 +14,12 @@ const {
|
|
|
16
14
|
const logger = createLogger('unchained:unchained-cloud-sso');
|
|
17
15
|
|
|
18
16
|
const loginWithSingleSignOn = async (remoteToken, context: UnchainedCore) => {
|
|
19
|
-
const domain = UNCHAINED_COOKIE_DOMAIN
|
|
17
|
+
const domain = UNCHAINED_COOKIE_DOMAIN;
|
|
20
18
|
const result = await fetch(UNCHAINED_CLOUD_ENDPOINT, {
|
|
21
19
|
method: 'POST',
|
|
22
20
|
headers: {
|
|
23
21
|
'content-type': 'application/json',
|
|
24
22
|
},
|
|
25
|
-
// eslint-disable-next-line
|
|
26
|
-
// @ts-ignore
|
|
27
23
|
duplex: 'half',
|
|
28
24
|
body: JSON.stringify({
|
|
29
25
|
operationName: 'consume',
|
package/src/user-context.ts
CHANGED
|
@@ -11,15 +11,24 @@ const {
|
|
|
11
11
|
UNCHAINED_COOKIE_NAME = 'unchained_token',
|
|
12
12
|
UNCHAINED_COOKIE_PATH = '/',
|
|
13
13
|
UNCHAINED_COOKIE_DOMAIN,
|
|
14
|
-
|
|
14
|
+
UNCHAINED_COOKIE_SAMESITE,
|
|
15
|
+
UNCHAINED_COOKIE_INSECURE,
|
|
15
16
|
} = process.env;
|
|
16
17
|
|
|
17
18
|
function setLoginToken(res: OutgoingMessage, token: string | null, expires?: Date) {
|
|
18
19
|
const cookieName = UNCHAINED_COOKIE_NAME;
|
|
19
20
|
const domain = UNCHAINED_COOKIE_DOMAIN;
|
|
20
21
|
const path = UNCHAINED_COOKIE_PATH;
|
|
22
|
+
const secure = UNCHAINED_COOKIE_INSECURE ? false : true;
|
|
23
|
+
const sameSite = ({
|
|
24
|
+
none: 'none',
|
|
25
|
+
lax: 'lax',
|
|
26
|
+
strict: 'strict',
|
|
27
|
+
'1': true,
|
|
28
|
+
'0': false,
|
|
29
|
+
}[UNCHAINED_COOKIE_SAMESITE?.trim()?.toLowerCase()] || false) as boolean | 'none' | 'lax' | 'strict';
|
|
21
30
|
|
|
22
|
-
if (!
|
|
31
|
+
if (!cookieName) return;
|
|
23
32
|
|
|
24
33
|
const authCookie = cookie.serialize(cookieName, token || null, {
|
|
25
34
|
domain,
|
|
@@ -27,8 +36,8 @@ function setLoginToken(res: OutgoingMessage, token: string | null, expires?: Dat
|
|
|
27
36
|
path,
|
|
28
37
|
expires: token && expires ? expires : undefined,
|
|
29
38
|
maxAge: token ? undefined : -1,
|
|
30
|
-
sameSite
|
|
31
|
-
secure
|
|
39
|
+
sameSite,
|
|
40
|
+
secure,
|
|
32
41
|
});
|
|
33
42
|
res.setHeader('Set-Cookie', authCookie);
|
|
34
43
|
}
|