@makerx/graphql-core 1.4.0 → 2.0.0
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/context.js +1 -1
- package/context.js.map +1 -1
- package/package.json +2 -2
- package/subscriptions/server.d.ts +1 -1
- package/subscriptions/server.d.ts.map +1 -1
- package/subscriptions/server.js +20 -0
- package/subscriptions/server.js.map +1 -1
- package/testing.d.ts +2 -2
- package/testing.d.ts.map +1 -1
- package/testing.js +6 -10
- package/testing.js.map +1 -1
package/context.js
CHANGED
|
@@ -15,7 +15,7 @@ const createContextFactory = ({ requestLogger, augmentRequestInfo, claimsToLog,
|
|
|
15
15
|
const baseRequestInfo = {
|
|
16
16
|
requestId: req.headers['x-request-id']?.toString() ?? (0, crypto_1.randomUUID)(),
|
|
17
17
|
protocol: req.protocol,
|
|
18
|
-
host: req.
|
|
18
|
+
host: req.hostname ?? '',
|
|
19
19
|
method: req.method ?? '',
|
|
20
20
|
url: req.originalUrl,
|
|
21
21
|
origin: req.get('Origin') ?? '',
|
package/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;;;;AACA,mCAAmC;AAEnC,8DAA8B;AAC9B,iCAA6B;AAkFtB,MAAM,oBAAoB,GAAG,CAAsD,EACxF,aAAa,EACb,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,cAAc,GACgB,EAA2B,EAAE;IAC3D,gDAAgD;IAChD,OAAO,KAAK,EAAE,KAAmB,EAAE,EAAE;QACnC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;QAEtC,2CAA2C;QAC3C,MAAM,eAAe,GAAoB;YACvC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAA,mBAAU,GAAE;YAClE,QAAQ,EAAE,GAAG,CAAC,QAA4B;YAC1C,IAAI,EAAE,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"main": "index.js",
|
|
3
3
|
"types": "index.d.ts",
|
|
4
4
|
"name": "@makerx/graphql-core",
|
|
5
|
-
"version": "
|
|
5
|
+
"version": "2.0.0",
|
|
6
6
|
"private": false,
|
|
7
7
|
"description": "A set of core GraphQL utilities that MakerX uses to build GraphQL APIs",
|
|
8
8
|
"author": "MakerX",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"url": "git+https://github.com/MakerXStudio/graphql-core.git"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@makerx/node-common": "^1.0
|
|
22
|
+
"@makerx/node-common": "^1.2.0",
|
|
23
23
|
"lodash.omitby": "^4.6.0",
|
|
24
24
|
"lodash.pick": "^4.4.0"
|
|
25
25
|
},
|
|
@@ -13,5 +13,5 @@ export declare function useSubscriptionsServer({ schema, httpServer, createSubsc
|
|
|
13
13
|
verifyToken?: (host: string, token: string) => Promise<JwtPayload>;
|
|
14
14
|
requireAuth?: boolean;
|
|
15
15
|
jwtClaimsToLog?: string[];
|
|
16
|
-
}): import("graphql-ws
|
|
16
|
+
}): import("graphql-ws").Disposable;
|
|
17
17
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAIrD,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,UAAU,EACV,yBAAyB,EACzB,MAAM,EACN,IAAiB,EACjB,WAAW,EACX,WAAW,EACX,cAA+B,GAChC,EAAE;IACD,MAAM,EAAE,aAAa,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,yBAAyB,EAAE,yBAAyB,CAAA;IACpD,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAA;IAClE,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAC1B,mCA+EA"}
|
package/subscriptions/server.js
CHANGED
|
@@ -9,6 +9,7 @@ const lodash_pick_1 = __importDefault(require("lodash.pick"));
|
|
|
9
9
|
const ws_2 = require("ws");
|
|
10
10
|
const logging_1 = require("../logging");
|
|
11
11
|
const utils_1 = require("./utils");
|
|
12
|
+
const graphql_ws_1 = require("graphql-ws");
|
|
12
13
|
function useSubscriptionsServer({ schema, httpServer, createSubscriptionContext, logger, path = '/graphql', verifyToken, requireAuth, jwtClaimsToLog = ['oid', 'iss'], }) {
|
|
13
14
|
if (requireAuth && !verifyToken)
|
|
14
15
|
throw new Error('verifyToken must be supplied when requireAuth is true');
|
|
@@ -49,6 +50,25 @@ function useSubscriptionsServer({ schema, httpServer, createSubscriptionContext,
|
|
|
49
50
|
return false;
|
|
50
51
|
}
|
|
51
52
|
},
|
|
53
|
+
onSubscribe: async (ctx) => {
|
|
54
|
+
if (!verifyToken)
|
|
55
|
+
return;
|
|
56
|
+
const token = (0, utils_1.extractTokenFromConnectionParams)(ctx.connectionParams);
|
|
57
|
+
if (!token) {
|
|
58
|
+
if (requireAuth) {
|
|
59
|
+
logger.error('No authorization parameter was supplied via websocket connection params');
|
|
60
|
+
ctx.extra.socket.close(graphql_ws_1.CloseCode.Forbidden, 'Forbidden');
|
|
61
|
+
}
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
try {
|
|
65
|
+
await verifyToken((0, utils_1.getHost)(ctx.extra.request), token);
|
|
66
|
+
}
|
|
67
|
+
catch (error) {
|
|
68
|
+
logger.warn('Subscription connection auth token is no longer valid', { claims: (0, lodash_pick_1.default)(ctx.extra.claims, jwtClaimsToLog), error });
|
|
69
|
+
ctx.extra.socket.close(graphql_ws_1.CloseCode.Forbidden, 'Forbidden');
|
|
70
|
+
}
|
|
71
|
+
},
|
|
52
72
|
onDisconnect({ extra: { claims } }) {
|
|
53
73
|
logger.info('Subscription connection disconnected', { claims: (0, lodash_pick_1.default)(claims, jwtClaimsToLog) });
|
|
54
74
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAiD;AAEjD,8DAA8B;AAC9B,2BAAoC;AAEpC,wCAAoD;AAEpD,mCAAmE;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/subscriptions/server.ts"],"names":[],"mappings":"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"}
|
package/testing.d.ts
CHANGED
|
@@ -2,6 +2,6 @@ import { ApolloClient, NormalizedCacheObject } from '@apollo/client/core';
|
|
|
2
2
|
import { ClientCredentialsConfig } from '@makerx/node-common';
|
|
3
3
|
import { ApolloClientOptions } from '@apollo/client/core/ApolloClient';
|
|
4
4
|
export * from '@apollo/client/core';
|
|
5
|
-
export declare const createTestClient: (url: string, accessToken?: string, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
|
|
6
|
-
export declare const createTestClientWithClientCredentials: (url: string, clientCredentialsConfig: ClientCredentialsConfig, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
|
|
5
|
+
export declare const createTestClient: (fetch: WindowOrWorkerGlobalScope['fetch'], url: string, accessToken?: string, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
|
|
6
|
+
export declare const createTestClientWithClientCredentials: (fetch: WindowOrWorkerGlobalScope['fetch'], url: string, clientCredentialsConfig: ClientCredentialsConfig, options?: Partial<ApolloClientOptions<NormalizedCacheObject>>) => ApolloClient<NormalizedCacheObject>;
|
|
7
7
|
//# sourceMappingURL=testing.d.ts.map
|
package/testing.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuC,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuC,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE9G,OAAO,EAAuB,uBAAuB,EAA6B,MAAM,qBAAqB,CAAA;AAC7G,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAEtE,cAAc,qBAAqB,CAAA;AAuCnC,eAAO,MAAM,gBAAgB,UACpB,yBAAyB,CAAC,OAAO,CAAC,OACpC,MAAM,gBACG,MAAM,YACV,QAAQ,oBAAoB,qBAAqB,CAAC,CAAC,KAC5D,aAAa,qBAAqB,CAUjC,CAAA;AAEJ,eAAO,MAAM,qCAAqC,UACzC,yBAAyB,CAAC,OAAO,CAAC,OACpC,MAAM,2BACc,uBAAuB,YACtC,QAAQ,oBAAoB,qBAAqB,CAAC,CAAC,KAC5D,aAAa,qBAAqB,CAUjC,CAAA"}
|
package/testing.js
CHANGED
|
@@ -13,14 +13,10 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
13
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
17
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
|
-
};
|
|
19
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
17
|
exports.createTestClientWithClientCredentials = exports.createTestClient = void 0;
|
|
21
18
|
const core_1 = require("@apollo/client/core");
|
|
22
19
|
const context_1 = require("@apollo/client/link/context");
|
|
23
|
-
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
24
20
|
const node_common_1 = require("@makerx/node-common");
|
|
25
21
|
__exportStar(require("@apollo/client/core"), exports);
|
|
26
22
|
const bearerTokenLink = (accessToken) => (0, context_1.setContext)((_, { headers }) => {
|
|
@@ -52,12 +48,12 @@ const clientCredentialsLink = (clientCredentialsConfig) => {
|
|
|
52
48
|
};
|
|
53
49
|
});
|
|
54
50
|
};
|
|
55
|
-
const httpLink = (url) => (0, core_1.createHttpLink)({
|
|
51
|
+
const httpLink = (url, fetch) => (0, core_1.createHttpLink)({
|
|
56
52
|
uri: url,
|
|
57
|
-
fetch
|
|
53
|
+
fetch,
|
|
58
54
|
});
|
|
59
|
-
const createTestClient = (url, accessToken, options) => new core_1.ApolloClient({
|
|
60
|
-
link: (0, core_1.from)([bearerTokenLink(accessToken), httpLink(url)]),
|
|
55
|
+
const createTestClient = (fetch, url, accessToken, options) => new core_1.ApolloClient({
|
|
56
|
+
link: (0, core_1.from)([bearerTokenLink(accessToken), httpLink(url, fetch)]),
|
|
61
57
|
cache: new core_1.InMemoryCache(),
|
|
62
58
|
defaultOptions: {
|
|
63
59
|
query: {
|
|
@@ -67,8 +63,8 @@ const createTestClient = (url, accessToken, options) => new core_1.ApolloClient(
|
|
|
67
63
|
...options,
|
|
68
64
|
});
|
|
69
65
|
exports.createTestClient = createTestClient;
|
|
70
|
-
const createTestClientWithClientCredentials = (url, clientCredentialsConfig, options) => new core_1.ApolloClient({
|
|
71
|
-
link: (0, core_1.from)([clientCredentialsLink(clientCredentialsConfig), httpLink(url)]),
|
|
66
|
+
const createTestClientWithClientCredentials = (fetch, url, clientCredentialsConfig, options) => new core_1.ApolloClient({
|
|
67
|
+
link: (0, core_1.from)([clientCredentialsLink(clientCredentialsConfig), httpLink(url, fetch)]),
|
|
72
68
|
cache: new core_1.InMemoryCache(),
|
|
73
69
|
defaultOptions: {
|
|
74
70
|
query: {
|
package/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA8G;AAC9G,yDAAwD;AACxD,qDAA6G;AAG7G,sDAAmC;AAEnC,MAAM,eAAe,GAAG,CAAC,WAAoB,EAAE,EAAE,CAC/C,IAAA,oBAAU,EAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5B,IAAI,WAAW;QACb,OAAO;YACL,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,aAAa,EAAE,UAAU,WAAW,EAAE;aACvC;SACF,CAAA;IACH,OAAO;QACL,OAAO;KACR,CAAA;AACH,CAAC,CAAC,CAAA;AAEJ,MAAM,qBAAqB,GAAG,CAAC,uBAAgD,EAAE,EAAE;IACjF,IAAI,OAAiD,CAAA;IACrD,OAAO,IAAA,oBAAU,EAAC,KAAK,IAAI,EAAE;QAC3B,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,IAAA,uCAAyB,EAAC,uBAAuB,CAAC,CAAA;QAC1E,IAAI,aAAa,GAAG,MAAM,OAAO,CAAA;QACjC,IAAI,aAAa,CAAC,SAAS,EAAE;YAC3B,OAAO,GAAG,IAAA,uCAAyB,EAAC,uBAAuB,CAAC,CAAA;YAC5D,aAAa,GAAG,MAAM,OAAO,CAAA;SAC9B;QACD,OAAO;YACL,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,aAAa,CAAC,YAAY,EAAE;aACtD;SACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,KAAyC,EAAE,EAAE,CAC1E,IAAA,qBAAc,EAAC;IACb,GAAG,EAAE,GAAG;IACR,KAAK;CACN,CAAC,CAAA;AAEG,MAAM,gBAAgB,GAAG,CAC9B,KAAyC,EACzC,GAAW,EACX,WAAoB,EACpB,OAA6D,EACxB,EAAE,CACvC,IAAI,mBAAY,CAAC;IACf,IAAI,EAAE,IAAA,WAAI,EAAC,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAChE,KAAK,EAAE,IAAI,oBAAa,EAAE;IAC1B,cAAc,EAAE;QACd,KAAK,EAAE;YACL,WAAW,EAAE,KAAK;SACnB;KACF;IACD,GAAG,OAAO;CACX,CAAC,CAAA;AAfS,QAAA,gBAAgB,oBAezB;AAEG,MAAM,qCAAqC,GAAG,CACnD,KAAyC,EACzC,GAAW,EACX,uBAAgD,EAChD,OAA6D,EACxB,EAAE,CACvC,IAAI,mBAAY,CAAC;IACf,IAAI,EAAE,IAAA,WAAI,EAAC,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAClF,KAAK,EAAE,IAAI,oBAAa,EAAE;IAC1B,cAAc,EAAE;QACd,KAAK,EAAE;YACL,WAAW,EAAE,KAAK;SACnB;KACF;IACD,GAAG,OAAO;CACX,CAAC,CAAA;AAfS,QAAA,qCAAqC,yCAe9C"}
|