@memberjunction/server 0.9.220 → 0.9.221
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/build.log.json +3 -0
- package/dist/auth/index.js +3 -0
- package/dist/auth/index.js.map +1 -1
- package/dist/context.js +7 -3
- package/dist/context.js.map +1 -1
- package/dist/generated/generated.js +270 -246
- package/dist/generated/generated.js.map +1 -1
- package/package.json +8 -8
- package/src/auth/index.ts +4 -0
- package/src/context.ts +7 -3
- package/src/generated/generated.ts +513 -511
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/server",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.221",
|
|
4
4
|
"description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "src/index.ts",
|
|
@@ -22,15 +22,15 @@
|
|
|
22
22
|
"@apollo/server": "^4.9.1",
|
|
23
23
|
"@graphql-tools/utils": "^10.0.1",
|
|
24
24
|
"@memberjunction/ai": "^0.9.156",
|
|
25
|
-
"@memberjunction/aiengine": "^0.9.
|
|
25
|
+
"@memberjunction/aiengine": "^0.9.53",
|
|
26
26
|
"@memberjunction/core": "^0.9.168",
|
|
27
|
-
"@memberjunction/core-entities": "^0.9.
|
|
28
|
-
"@memberjunction/data-context": "^0.9.
|
|
29
|
-
"@memberjunction/data-context-server": "^0.9.
|
|
27
|
+
"@memberjunction/core-entities": "^0.9.151",
|
|
28
|
+
"@memberjunction/data-context": "^0.9.37",
|
|
29
|
+
"@memberjunction/data-context-server": "^0.9.33",
|
|
30
30
|
"@memberjunction/global": "^0.9.148",
|
|
31
|
-
"@memberjunction/queue": "^0.9.
|
|
32
|
-
"@memberjunction/sqlserver-dataprovider": "^0.9.
|
|
33
|
-
"@memberjunction/skip-types": "^0.9.
|
|
31
|
+
"@memberjunction/queue": "^0.9.171",
|
|
32
|
+
"@memberjunction/sqlserver-dataprovider": "^0.9.182",
|
|
33
|
+
"@memberjunction/skip-types": "^0.9.61",
|
|
34
34
|
"@types/cors": "^2.8.13",
|
|
35
35
|
"@types/jsonwebtoken": "^8.5.9",
|
|
36
36
|
"@types/node": "^18.11.14",
|
package/src/auth/index.ts
CHANGED
|
@@ -55,6 +55,10 @@ export class UserPayload {
|
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
export const getSigningKeys = (issuer: string) => (header: JwtHeader, cb: SigningKeyCallback) => {
|
|
58
|
+
if (!validationOptions[issuer]) {
|
|
59
|
+
throw new Error(`No validation options found for issuer ${issuer}`);
|
|
60
|
+
}
|
|
61
|
+
|
|
58
62
|
const jwksUri = validationOptions[issuer].jwksUri;
|
|
59
63
|
if (missingAuth0Config && missingAzureConfig) {
|
|
60
64
|
throw new MissingAuthError();
|
package/src/context.ts
CHANGED
|
@@ -53,8 +53,8 @@ export const getUserPayload = async (
|
|
|
53
53
|
throw new AuthenticationError('Invalid token payload');
|
|
54
54
|
}
|
|
55
55
|
|
|
56
|
-
const expiryDate = new Date(payload.exp ?? 0 * 1000);
|
|
57
|
-
if (
|
|
56
|
+
const expiryDate = new Date( (payload.exp ?? 0) * 1000);
|
|
57
|
+
if (expiryDate.getTime() <= Date.now()) {
|
|
58
58
|
throw new TokenExpiredError(expiryDate);
|
|
59
59
|
}
|
|
60
60
|
|
|
@@ -89,7 +89,11 @@ export const getUserPayload = async (
|
|
|
89
89
|
return { userRecord, email, sessionId };
|
|
90
90
|
} catch (e) {
|
|
91
91
|
console.error(e);
|
|
92
|
-
|
|
92
|
+
if (e instanceof TokenExpiredError) {
|
|
93
|
+
throw e;
|
|
94
|
+
}
|
|
95
|
+
else
|
|
96
|
+
return {} as UserPayload;
|
|
93
97
|
}
|
|
94
98
|
};
|
|
95
99
|
|