@restorecommerce/facade 1.4.1 → 1.4.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/CHANGELOG.md +22 -0
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/modules/fulfillment/gql/schema.generated.d.ts +8 -7
- package/dist/modules/fulfillment/gql/schema.generated.d.ts.map +1 -1
- package/dist/modules/fulfillment/gql/schema.generated.js.map +1 -1
- package/dist/modules/identity/oidc/index.js +1 -1
- package/dist/modules/identity/oidc/password-grant.js +3 -3
- package/dist/modules/identity/oidc/password-grant.js.map +1 -1
- package/dist/modules/identity/oidc/user.js +3 -3
- package/dist/modules/identity/oidc/user.js.map +1 -1
- package/dist/tsconfig.lib.tsbuildinfo +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.generated.js","sourceRoot":"","sources":["../../../../src/modules/fulfillment/gql/schema.generated.ts"],"names":[],"mappings":"AA+UA,MAAM,CAAN,IAAY,iCASX;AATD,WAAY,iCAAiC;IAC3C,6FAAU,CAAA;IACV,+FAAW,CAAA;IACX,+FAAW,CAAA;IACX,mGAAa,CAAA;IACb,mGAAa,CAAA;IACb,mGAAa,CAAA;IACb,mGAAa,CAAA;IACb,mGAAa,CAAA;AACf,CAAC,EATW,iCAAiC,KAAjC,iCAAiC,QAS5C;AAkDD,MAAM,CAAN,IAAY,0CAIX;AAJD,WAAY,0CAA0C;IACpD,mHAAY,CAAA;IACZ,qHAAa,CAAA;IACb,uHAAc,CAAA;AAChB,CAAC,EAJW,0CAA0C,KAA1C,0CAA0C,QAIrD;AAeD,MAAM,CAAN,IAAY,4CAUX;AAVD,WAAY,4CAA4C;IACtD,2GAAM,CAAA;IACN,2GAAM,CAAA;IACN,6GAAO,CAAA;IACP,2GAAM,CAAA;IACN,6GAAO,CAAA;IACP,qHAAW,CAAA;IACX,iHAAS,CAAA;IACT,2GAAM,CAAA;IACN,6GAAO,CAAA;AACT,CAAC,EAVW,4CAA4C,KAA5C,4CAA4C,QAUvD;AAED,MAAM,CAAN,IAAY,4CAMX;AAND,WAAY,4CAA4C;IACtD,mHAAU,CAAA;IACV,mHAAU,CAAA;IACV,qHAAW,CAAA;IACX,+GAAQ,CAAA;IACR,iHAAS,CAAA;AACX,CAAC,EANW,4CAA4C,KAA5C,4CAA4C,QAMvD;AAeD,MAAM,CAAN,IAAY,sCAUX;AAVD,WAAY,sCAAsC;IAChD,+FAAM,CAAA;IACN,+FAAM,CAAA;IACN,iGAAO,CAAA;IACP,+FAAM,CAAA;IACN,iGAAO,CAAA;IACP,yGAAW,CAAA;IACX,qGAAS,CAAA;IACT,+FAAM,CAAA;IACN,iGAAO,CAAA;AACT,CAAC,EAVW,sCAAsC,KAAtC,sCAAsC,QAUjD;AAED,MAAM,CAAN,IAAY,sCAMX;AAND,WAAY,sCAAsC;IAChD,uGAAU,CAAA;IACV,uGAAU,CAAA;IACV,yGAAW,CAAA;IACX,mGAAQ,CAAA;IACR,qGAAS,CAAA;AACX,CAAC,EANW,sCAAsC,KAAtC,sCAAsC,QAMjD;AAED,MAAM,CAAN,IAAY,uCAGX;AAHD,WAAY,uCAAuC;IACjD,mGAAO,CAAA;IACP,iGAAM,CAAA;AACR,CAAC,EAHW,uCAAuC,KAAvC,uCAAuC,QAGlD;AAED,MAAM,CAAN,IAAY,6CAGX;AAHD,WAAY,6CAA6C;IACvD,+GAAO,CAAA;IACP,6GAAM,CAAA;AACR,CAAC,EAHW,6CAA6C,KAA7C,6CAA6C,QAGxD;
|
|
1
|
+
{"version":3,"file":"schema.generated.js","sourceRoot":"","sources":["../../../../src/modules/fulfillment/gql/schema.generated.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export function createOIDC({ identitySrvClient, env, logger, config: { loginFn,
|
|
|
12
12
|
post_logout_redirect_uris,
|
|
13
13
|
client_id,
|
|
14
14
|
client_secret,
|
|
15
|
-
id_token_signed_response_alg: '
|
|
15
|
+
id_token_signed_response_alg: 'RS256',
|
|
16
16
|
grant_types: ['refresh_token', 'authorization_code', 'password'],
|
|
17
17
|
redirect_uris,
|
|
18
18
|
scopes: ['openid', 'offline_access'],
|
|
@@ -75,14 +75,14 @@ export const registerPasswordGrantType = (config) => {
|
|
|
75
75
|
}, { ctx });
|
|
76
76
|
token.set('jti', jti);
|
|
77
77
|
token.scope = 'openid profile';
|
|
78
|
-
return await token.issue({ expiresAt: exp });
|
|
78
|
+
return await token.issue({ use: 'idtoken', expiresAt: exp });
|
|
79
79
|
};
|
|
80
80
|
const idToken = await generateIdToken(ctx, clientId, expiresIn, claims);
|
|
81
81
|
return {
|
|
82
82
|
access_token: accessToken,
|
|
83
83
|
id_token: idToken,
|
|
84
|
-
expires_in: new Date(epochTime() + at.expiration),
|
|
85
|
-
last_login: new Date(
|
|
84
|
+
expires_in: new Date((epochTime() + at.expiration) * 1000),
|
|
85
|
+
last_login: new Date(),
|
|
86
86
|
token_type: at.tokenType,
|
|
87
87
|
scope: 'openid',
|
|
88
88
|
token_name: tokenName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-grant.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/password-grant.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"password-grant.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/password-grant.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,11 +30,11 @@ export const loginUser = async (ctx, identifier, password, remember) => {
|
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
try {
|
|
33
|
-
const result = await ctx.identitySrvClient.user.
|
|
33
|
+
const result = await ctx.identitySrvClient.user.login(LoginRequest.fromPartial({
|
|
34
34
|
identifier,
|
|
35
35
|
password,
|
|
36
36
|
}));
|
|
37
|
-
if (!result) {
|
|
37
|
+
if (!result || !result.payload || result.status.code !== 200) {
|
|
38
38
|
return {
|
|
39
39
|
error: {
|
|
40
40
|
key: 'INVALID_IDENTIFIER_OR_PASSWORD',
|
|
@@ -43,7 +43,7 @@ export const loginUser = async (ctx, identifier, password, remember) => {
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
return {
|
|
46
|
-
user: pick(result, KEY_WHITELIST),
|
|
46
|
+
user: pick(result.payload, KEY_WHITELIST),
|
|
47
47
|
identifier,
|
|
48
48
|
remember
|
|
49
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/user.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,WAAW,EAEZ,MAAM,4EAA4E,CAAC;AAEpF,MAAM,aAAa,GAAgC;IACjD,IAAI;IACJ,MAAM;IACN,OAAO;IACP,UAAU;IACV,YAAY;IACZ,kBAAkB;IAClB,WAAW;IACX,UAAU;IACV,cAAc;IACd,QAAQ;CACT,CAAC;AAEF,MAAM,IAAI,GAAG,CAAC,GAAS,EAAE,IAAoB,EAA0B,EAAE;IACvE,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACjB,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAgB,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;IAClF,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE;QAC5B,OAAO;YACL,UAAU;YACV,QAAQ;YACR,KAAK,EAAE;gBACL,GAAG,EAAE,gCAAgC;gBACrC,OAAO,EAAE,gCAAgC;aAC1C;SACF,CAAC;KACH;IAED,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC;YAC7E,UAAU;YACV,QAAQ;SACT,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/user.ts"],"names":[],"mappings":"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"}
|