@memberjunction/server 0.9.220 → 0.9.222
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 +6 -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 +574 -477
- package/dist/generated/generated.js.map +1 -1
- package/dist/resolvers/MergeRecordsResolver.js +3 -3
- package/dist/resolvers/MergeRecordsResolver.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 +794 -742
- package/src/resolvers/MergeRecordsResolver.ts +2 -2
|
@@ -102,9 +102,9 @@ __decorate([
|
|
|
102
102
|
__metadata("design:type", String)
|
|
103
103
|
], RecordDependencyResult.prototype, "FieldName", void 0);
|
|
104
104
|
__decorate([
|
|
105
|
-
(0, type_graphql_1.Field)(() =>
|
|
106
|
-
__metadata("design:type",
|
|
107
|
-
], RecordDependencyResult.prototype, "
|
|
105
|
+
(0, type_graphql_1.Field)(() => String),
|
|
106
|
+
__metadata("design:type", String)
|
|
107
|
+
], RecordDependencyResult.prototype, "PrimaryKeyValue", void 0);
|
|
108
108
|
exports.RecordDependencyResult = RecordDependencyResult = __decorate([
|
|
109
109
|
(0, type_graphql_1.ObjectType)()
|
|
110
110
|
], RecordDependencyResult);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeRecordsResolver.js","sourceRoot":"","sources":["../../src/resolvers/MergeRecordsResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA2E;AAC3E,+CAA4H;AAIrH,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;CASlC,CAAA;AATY,wDAAsB;AAEjC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;0DACD;AAGnB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;iEACM;AAG1B;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;yDACF;iCARP,sBAAsB;IADlC,IAAA,yBAAU,GAAE;GACA,sBAAsB,CASlC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAE3B,AAAN,KAAK,CAAC,qBAAqB,CACU,UAAkB,EAC5C,EAAE,UAAU,EAAE,WAAW,EAAc,EACpC,MAAoB;QAE9B,IAAI,CAAC;YACL,MAAM,EAAE,GAAG,IAAI,eAAQ,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,GAAG,EAAE,CAAC;YACT,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;CAEJ,CAAA;AAjBY,4DAAwB;AAE3B;IADL,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC;IAEjC,WAAA,IAAA,kBAAG,EAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAA;IAC/B,WAAA,IAAA,kBAAG,GAAE,CAAA;IACL,WAAA,IAAA,qBAAM,GAAE,CAAA;;qDAAS,2BAAY;;qEAUjC;mCAfQ,wBAAwB;IADpC,IAAA,uBAAQ,EAAC,sBAAsB,CAAC;GACpB,wBAAwB,CAiBpC;AAIM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;CAMpC,CAAA;AANY,4DAAwB;AAEnC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;2DACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;uDACN;mCALH,wBAAwB;IADpC,IAAA,wBAAS,GAAE;GACC,wBAAwB,CAMpC;AAGM,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;CAMrC,CAAA;AANY,8DAAyB;AAEpC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;4DACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;wDACN;oCALH,yBAAyB;IADrC,IAAA,yBAAU,GAAE;GACA,yBAAyB,CAMrC;AAIM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;CAYlC,CAAA;AAZY,wDAAsB;AAEjC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;0DACD;AAGnB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;iEACM;AAG1B;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;yDACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"MergeRecordsResolver.js","sourceRoot":"","sources":["../../src/resolvers/MergeRecordsResolver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/server",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.222",
|
|
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
|
|