@memberjunction/server 2.48.0 → 2.50.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/dist/apolloServer/TransactionPlugin.js +7 -7
- package/dist/apolloServer/TransactionPlugin.js.map +1 -1
- package/dist/auth/index.d.ts +3 -3
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js.map +1 -1
- package/dist/context.d.ts +3 -3
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js.map +1 -1
- package/dist/generated/generated.d.ts +683 -326
- package/dist/generated/generated.d.ts.map +1 -1
- package/dist/generated/generated.js +5528 -3028
- package/dist/generated/generated.js.map +1 -1
- package/dist/generic/ResolverBase.d.ts +17 -17
- package/dist/generic/ResolverBase.d.ts.map +1 -1
- package/dist/generic/ResolverBase.js +7 -5
- package/dist/generic/ResolverBase.js.map +1 -1
- package/dist/generic/RunViewResolver.d.ts.map +1 -1
- package/dist/generic/RunViewResolver.js +12 -4
- package/dist/generic/RunViewResolver.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +16 -14
- package/dist/index.js.map +1 -1
- package/dist/orm.d.ts +3 -3
- package/dist/orm.d.ts.map +1 -1
- package/dist/orm.js +14 -15
- package/dist/orm.js.map +1 -1
- package/dist/resolvers/AskSkipResolver.d.ts +19 -19
- package/dist/resolvers/AskSkipResolver.d.ts.map +1 -1
- package/dist/resolvers/AskSkipResolver.js +17 -12
- package/dist/resolvers/AskSkipResolver.js.map +1 -1
- package/dist/resolvers/EntityResolver.d.ts +2 -1
- package/dist/resolvers/EntityResolver.d.ts.map +1 -1
- package/dist/resolvers/EntityResolver.js +6 -3
- package/dist/resolvers/EntityResolver.js.map +1 -1
- package/dist/resolvers/FileCategoryResolver.d.ts.map +1 -1
- package/dist/resolvers/FileCategoryResolver.js +10 -2
- package/dist/resolvers/FileCategoryResolver.js.map +1 -1
- package/dist/resolvers/GetDataResolver.d.ts.map +1 -1
- package/dist/resolvers/GetDataResolver.js +4 -2
- package/dist/resolvers/GetDataResolver.js.map +1 -1
- package/dist/resolvers/ReportResolver.d.ts.map +1 -1
- package/dist/resolvers/ReportResolver.js +5 -3
- package/dist/resolvers/ReportResolver.js.map +1 -1
- package/dist/resolvers/RunAIAgentResolver.d.ts +19 -0
- package/dist/resolvers/RunAIAgentResolver.d.ts.map +1 -0
- package/dist/resolvers/RunAIAgentResolver.js +194 -0
- package/dist/resolvers/RunAIAgentResolver.js.map +1 -0
- package/dist/resolvers/UserFavoriteResolver.d.ts +2 -2
- package/dist/resolvers/UserViewResolver.d.ts +4 -4
- package/dist/resolvers/UserViewResolver.d.ts.map +1 -1
- package/dist/resolvers/UserViewResolver.js.map +1 -1
- package/dist/types.d.ts +6 -6
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/util.d.ts +10 -3
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +22 -3
- package/dist/util.js.map +1 -1
- package/package.json +25 -25
- package/src/apolloServer/TransactionPlugin.ts +8 -8
- package/src/auth/index.ts +4 -4
- package/src/context.ts +2 -2
- package/src/generated/generated.ts +4762 -3024
- package/src/generic/ResolverBase.ts +23 -22
- package/src/generic/RunViewResolver.ts +12 -4
- package/src/index.ts +17 -15
- package/src/orm.ts +18 -17
- package/src/resolvers/AskSkipResolver.ts +36 -32
- package/src/resolvers/EntityResolver.ts +5 -2
- package/src/resolvers/FileCategoryResolver.ts +9 -2
- package/src/resolvers/GetDataResolver.ts +4 -2
- package/src/resolvers/ReportResolver.ts +5 -3
- package/src/resolvers/RunAIAgentResolver.ts +174 -0
- package/src/resolvers/UserViewResolver.ts +0 -1
- package/src/types.ts +8 -8
- package/src/util.ts +31 -6
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAAE,IAAI,IAAI,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/server",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.50.0",
|
|
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,29 +22,30 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@apollo/server": "^4.9.1",
|
|
24
24
|
"@graphql-tools/utils": "^10.0.1",
|
|
25
|
-
"@memberjunction/actions": "2.
|
|
26
|
-
"@memberjunction/ai": "2.
|
|
27
|
-
"@memberjunction/ai-
|
|
28
|
-
"@memberjunction/ai-
|
|
29
|
-
"@memberjunction/ai-
|
|
30
|
-
"@memberjunction/
|
|
31
|
-
"@memberjunction/
|
|
32
|
-
"@memberjunction/
|
|
33
|
-
"@memberjunction/core
|
|
34
|
-
"@memberjunction/core-
|
|
35
|
-
"@memberjunction/core-entities
|
|
36
|
-
"@memberjunction/
|
|
37
|
-
"@memberjunction/data-context
|
|
38
|
-
"@memberjunction/
|
|
39
|
-
"@memberjunction/
|
|
40
|
-
"@memberjunction/
|
|
41
|
-
"@memberjunction/
|
|
42
|
-
"@memberjunction/
|
|
43
|
-
"@memberjunction/
|
|
44
|
-
"@memberjunction/
|
|
45
|
-
"@memberjunction/
|
|
46
|
-
"@memberjunction/
|
|
47
|
-
"@memberjunction/
|
|
25
|
+
"@memberjunction/actions": "2.50.0",
|
|
26
|
+
"@memberjunction/ai": "2.50.0",
|
|
27
|
+
"@memberjunction/ai-agents": "2.50.0",
|
|
28
|
+
"@memberjunction/ai-mistral": "2.50.0",
|
|
29
|
+
"@memberjunction/ai-openai": "2.50.0",
|
|
30
|
+
"@memberjunction/ai-vectors-pinecone": "2.50.0",
|
|
31
|
+
"@memberjunction/aiengine": "2.50.0",
|
|
32
|
+
"@memberjunction/ai-prompts": "2.50.0",
|
|
33
|
+
"@memberjunction/core": "2.50.0",
|
|
34
|
+
"@memberjunction/core-actions": "2.50.0",
|
|
35
|
+
"@memberjunction/core-entities": "2.50.0",
|
|
36
|
+
"@memberjunction/core-entities-server": "2.50.0",
|
|
37
|
+
"@memberjunction/data-context": "2.50.0",
|
|
38
|
+
"@memberjunction/data-context-server": "2.50.0",
|
|
39
|
+
"@memberjunction/doc-utils": "2.50.0",
|
|
40
|
+
"@memberjunction/entity-communications-server": "2.50.0",
|
|
41
|
+
"@memberjunction/external-change-detection": "2.50.0",
|
|
42
|
+
"@memberjunction/global": "2.50.0",
|
|
43
|
+
"@memberjunction/graphql-dataprovider": "2.50.0",
|
|
44
|
+
"@memberjunction/queue": "2.50.0",
|
|
45
|
+
"@memberjunction/skip-types": "2.50.0",
|
|
46
|
+
"@memberjunction/sqlserver-dataprovider": "2.50.0",
|
|
47
|
+
"@memberjunction/storage": "2.50.0",
|
|
48
|
+
"@memberjunction/templates": "2.50.0",
|
|
48
49
|
"@types/compression": "^1.7.5",
|
|
49
50
|
"@types/cors": "^2.8.13",
|
|
50
51
|
"@types/jsonwebtoken": "9.0.6",
|
|
@@ -73,7 +74,6 @@
|
|
|
73
74
|
"rxjs": "^7.8.1",
|
|
74
75
|
"type-graphql": "2.0.0-beta.3",
|
|
75
76
|
"typedi": "^0.10.0",
|
|
76
|
-
"typeorm": "^0.3.20",
|
|
77
77
|
"uuid": "^10.0.0",
|
|
78
78
|
"ws": "^8.13.0",
|
|
79
79
|
"zod": "^3.23.4"
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ApolloServerPlugin, GraphQLRequestContextDidEncounterErrors, GraphQLRequestListenerParsingDidEnd } from '@apollo/server';
|
|
2
|
-
import
|
|
2
|
+
import sql from 'mssql';
|
|
3
3
|
import { AppContext } from '../types.js';
|
|
4
4
|
|
|
5
5
|
export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
|
|
@@ -15,12 +15,13 @@ export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
|
|
|
15
15
|
// Start transaction, one or more mutations. If it is just one mutation, this trans wrapper isn't really needed
|
|
16
16
|
// but there's no good way to know if it's one or more mutations, so we just start a transaction anyway and it isn't terribly expensive
|
|
17
17
|
// to do so with SQL Server anyway.
|
|
18
|
-
const
|
|
19
|
-
const
|
|
18
|
+
const pool: sql.ConnectionPool = requestContext.contextValue.dataSource;
|
|
19
|
+
const transaction = new sql.Transaction(pool);
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
// Store transaction in context for resolvers to use
|
|
22
|
+
(requestContext.contextValue as any).transaction = transaction;
|
|
22
23
|
console.log('Starting transaction wrapper, time spent: ', Date.now() - start, 'ms ');
|
|
23
|
-
await
|
|
24
|
+
await transaction.begin();
|
|
24
25
|
|
|
25
26
|
return {
|
|
26
27
|
didEncounterErrors: async (requestContext) => {
|
|
@@ -33,16 +34,15 @@ export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
|
|
|
33
34
|
if (err) {
|
|
34
35
|
console.log('Error in transaction, rolling back, time spent: ', Date.now() - start, 'ms ');
|
|
35
36
|
console.error('Rolling back transaction', err);
|
|
36
|
-
await
|
|
37
|
+
await transaction.rollback();
|
|
37
38
|
} else {
|
|
38
39
|
console.log('Committing transaction, time spent: ', Date.now() - start, 'ms ');
|
|
39
|
-
await
|
|
40
|
+
await transaction.commit();
|
|
40
41
|
}
|
|
41
42
|
} catch (execErr) {
|
|
42
43
|
console.log('Execution Error, time spent: ', Date.now() - start, 'ms ');
|
|
43
44
|
console.error(execErr);
|
|
44
45
|
} finally {
|
|
45
|
-
await queryRunner.release();
|
|
46
46
|
console.log('Transaction complete, time spent: ', Date.now() - start, 'ms ');
|
|
47
47
|
}
|
|
48
48
|
},
|
package/src/auth/index.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { JwtHeader, SigningKeyCallback } from 'jsonwebtoken';
|
|
|
2
2
|
import jwksClient from 'jwks-rsa';
|
|
3
3
|
import { auth0Domain, auth0WebClientID, configInfo, tenantID, webClientID } from '../config.js';
|
|
4
4
|
import { UserCache } from '@memberjunction/sqlserver-dataprovider';
|
|
5
|
-
import
|
|
5
|
+
import sql from 'mssql';
|
|
6
6
|
import { Metadata, RoleInfo, UserInfo } from '@memberjunction/core';
|
|
7
7
|
import { NewUserBase } from './newUsers.js';
|
|
8
8
|
import { MJGlobal } from '@memberjunction/global';
|
|
@@ -28,7 +28,7 @@ const issuers = {
|
|
|
28
28
|
auth0: `https://${auth0Domain}/`,
|
|
29
29
|
};
|
|
30
30
|
|
|
31
|
-
const refreshUserCache = async (dataSource?:
|
|
31
|
+
const refreshUserCache = async (dataSource?: sql.ConnectionPool) => {
|
|
32
32
|
const startTime: number = Date.now();
|
|
33
33
|
await UserCache.Instance.Refresh(dataSource);
|
|
34
34
|
const endTime: number = Date.now();
|
|
@@ -105,7 +105,7 @@ export const getSigningKeys = (issuer: string) => (header: JwtHeader, cb: Signin
|
|
|
105
105
|
.catch((err) => console.error(err));
|
|
106
106
|
};
|
|
107
107
|
|
|
108
|
-
export const getSystemUser = async (dataSource?:
|
|
108
|
+
export const getSystemUser = async (dataSource?: sql.ConnectionPool, attemptCacheUpdateIfNeeded: boolean = true): Promise<UserInfo> => {
|
|
109
109
|
const systemUser = UserCache.Instance.Users.find((u) => u.ID.toLowerCase() === SYSTEM_USER_ID.toLowerCase());
|
|
110
110
|
if (!systemUser) {
|
|
111
111
|
if (dataSource && attemptCacheUpdateIfNeeded) {
|
|
@@ -124,7 +124,7 @@ export const verifyUserRecord = async (
|
|
|
124
124
|
firstName?: string,
|
|
125
125
|
lastName?: string,
|
|
126
126
|
requestDomain?: string,
|
|
127
|
-
dataSource?:
|
|
127
|
+
dataSource?: sql.ConnectionPool,
|
|
128
128
|
attemptCacheUpdateIfNeeded: boolean = true
|
|
129
129
|
): Promise<UserInfo | undefined> => {
|
|
130
130
|
if (!email) return undefined;
|
package/src/context.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { default as jwt } from 'jsonwebtoken';
|
|
|
4
4
|
import 'reflect-metadata';
|
|
5
5
|
import { Subject, firstValueFrom } from 'rxjs';
|
|
6
6
|
import { AuthenticationError, AuthorizationError } from 'type-graphql';
|
|
7
|
-
import
|
|
7
|
+
import sql from 'mssql';
|
|
8
8
|
import { getSigningKeys, getSystemUser, validationOptions, verifyUserRecord } from './auth/index.js';
|
|
9
9
|
import { authCache } from './cache.js';
|
|
10
10
|
import { userEmailMap, apiKey } from './config.js';
|
|
@@ -105,7 +105,7 @@ export const getUserPayload = async (
|
|
|
105
105
|
};
|
|
106
106
|
|
|
107
107
|
export const contextFunction =
|
|
108
|
-
({ setupComplete$, dataSource, dataSources }: { setupComplete$: Subject<unknown>; dataSource:
|
|
108
|
+
({ setupComplete$, dataSource, dataSources }: { setupComplete$: Subject<unknown>; dataSource: sql.ConnectionPool, dataSources: DataSourceInfo[] }) =>
|
|
109
109
|
async ({ req }: { req: IncomingMessage }) => {
|
|
110
110
|
await firstValueFrom(setupComplete$); // wait for setup to complete before processing the request
|
|
111
111
|
|