@memberjunction/server 2.13.2 → 2.13.4

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.
Files changed (16) hide show
  1. package/dist/auth/newUsers.d.ts.map +1 -1
  2. package/dist/auth/newUsers.js +52 -2
  3. package/dist/auth/newUsers.js.map +1 -1
  4. package/dist/config.d.ts +111 -25
  5. package/dist/config.d.ts.map +1 -1
  6. package/dist/config.js +42 -35
  7. package/dist/config.js.map +1 -1
  8. package/dist/context.js +1 -1
  9. package/dist/context.js.map +1 -1
  10. package/dist/orm.js +1 -1
  11. package/dist/orm.js.map +1 -1
  12. package/package.json +23 -23
  13. package/src/auth/newUsers.ts +64 -3
  14. package/src/config.ts +71 -47
  15. package/src/context.ts +1 -1
  16. package/src/orm.ts +1 -1
package/dist/auth/newUsers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"newUsers.d.ts","sourceRoot":"","sources":["../../src/auth/newUsers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAkB,MAAM,+BAA+B,CAAC;AAE3E,qBACa,WAAW;IACP,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,GAAE,MAAe,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAyExM"}
1
+ {"version":3,"file":"newUsers.d.ts","sourceRoot":"","sources":["../../src/auth/newUsers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAA0H,MAAM,+BAA+B,CAAC;AAEnL,qBACa,WAAW;IACP,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,GAAE,MAAe,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAsIxM"}
package/dist/auth/newUsers.js CHANGED
@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
4
4
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
5
  return c > 3 && r && Object.defineProperty(target, key, r), r;
6
6
  };
7
- import { LogError, LogStatus, Metadata } from "@memberjunction/core";
7
+ import { LogError, LogStatus, Metadata, RunView } from "@memberjunction/core";
8
8
  import { RegisterClass } from "@memberjunction/global";
9
9
  import { UserCache } from "@memberjunction/sqlserver-dataprovider";
10
10
  import { configInfo } from "../config.js";
@@ -58,11 +58,61 @@ let NewUserBase = class NewUserBase {
58
58
  }
59
59
  userRoleEntity.RoleID = userRole.ID;
60
60
  const roleSaveResult = await userRoleEntity.Save();
61
- if (!roleSaveResult) {
61
+ if (roleSaveResult) {
62
+ LogStatus(`Assigned role ${role} to new user ${user.Name}`);
63
+ }
64
+ else {
62
65
  LogError(`Failed to assign role ${role} to new user ${user.Name}:`, undefined, userRoleEntity.LatestResult);
63
66
  }
64
67
  }
65
68
  }
69
+ if (configInfo.userHandling && configInfo.userHandling.CreateUserApplicationRecords) {
70
+ LogStatus("Creating User Applications for new user: " + user.Name);
71
+ for (const appName of configInfo.userHandling.UserApplications) {
72
+ const toLowerCase = appName.trim().toLocaleLowerCase();
73
+ const application = md.Applications.find(a => a.Name.trim().toLocaleLowerCase() === toLowerCase);
74
+ if (!application) {
75
+ LogError(`Application ${appName} not found in the Metadata, cannot assign to new user ${user.Name}`);
76
+ continue;
77
+ }
78
+ const userApplication = await md.GetEntityObject('User Applications', contextUser);
79
+ userApplication.NewRecord();
80
+ userApplication.UserID = user.ID;
81
+ userApplication.ApplicationID = application.ID;
82
+ userApplication.IsActive = true;
83
+ const userApplicationSaveResult = await userApplication.Save();
84
+ if (userApplicationSaveResult) {
85
+ LogStatus(`Created User Application ${appName} for new user ${user.Name}`);
86
+ const rv = new RunView();
87
+ const rvResult = await rv.RunView({
88
+ EntityName: 'Application Entities',
89
+ ExtraFilter: `ApplicationID = '${application.ID}' and DefaultForNewUser = 1`,
90
+ }, contextUser);
91
+ if (!rvResult.Success) {
92
+ LogError(`Failed to load Application Entities for Application ${appName} for new user ${user.Name}:`, undefined, rvResult.ErrorMessage);
93
+ continue;
94
+ }
95
+ LogStatus(`Creating ${rvResult.Results.length} User Application Entities for User Application ${appName} for new user ${user.Name}`);
96
+ for (const [index, appEntity] of rvResult.Results.entries()) {
97
+ const userAppEntity = await md.GetEntityObject('User Application Entities', contextUser);
98
+ userAppEntity.NewRecord();
99
+ userAppEntity.UserApplicationID = userApplication.ID;
100
+ userAppEntity.EntityID = appEntity.EntityID;
101
+ userAppEntity.Sequence = index;
102
+ const userAppEntitySaveResult = await userAppEntity.Save();
103
+ if (userAppEntitySaveResult) {
104
+ LogStatus(`Created User Application Entity ${appEntity.Entity} for new user ${user.Name}`);
105
+ }
106
+ else {
107
+ LogError(`Failed to create User Application Entity for new user ${user.Name}:`, undefined, userAppEntity.LatestResult);
108
+ }
109
+ }
110
+ }
111
+ else {
112
+ LogError(`Failed to create User Application ${appName} for new user ${user.Name}:`, undefined, userApplication.LatestResult);
113
+ }
114
+ }
115
+ }
66
116
  return user;
67
117
  }
68
118
  catch (e) {
package/dist/auth/newUsers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"newUsers.js","sourceRoot":"","sources":["../../src/auth/newUsers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"newUsers.js","sourceRoot":"","sources":["../../src/auth/newUsers.ts"],"names":[],"mappings":"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"}
package/dist/config.d.ts CHANGED
@@ -1,29 +1,4 @@
1
1
  import { z } from 'zod';
2
- export declare const nodeEnv: string;
3
- export declare const dbHost: string;
4
- export declare const dbPort: number;
5
- export declare const dbUsername: string;
6
- export declare const dbPassword: string;
7
- export declare const dbDatabase: string;
8
- export declare const dbInstanceName: string;
9
- export declare const dbTrustServerCertificate: boolean;
10
- export declare const graphqlPort: number;
11
- export declare const ___codeGenAPIURL: string;
12
- export declare const ___codeGenAPIPort: number;
13
- export declare const ___codeGenAPISubmissionDelay: number;
14
- export declare const graphqlRootPath: string;
15
- export declare const webClientID: string;
16
- export declare const tenantID: string;
17
- export declare const enableIntrospection: boolean;
18
- export declare const websiteRunFromPackage: number;
19
- export declare const userEmailMap: Record<string, string>;
20
- export declare const ___skipAPIurl: string;
21
- export declare const ___skipAPIOrgId: string;
22
- export declare const auth0Domain: string;
23
- export declare const auth0WebClientID: string;
24
- export declare const auth0ClientSecret: string;
25
- export declare const mj_core_schema: string;
26
- export declare const configFile: string;
27
2
  declare const userHandlingInfoSchema: z.ZodObject<{
28
3
  autoCreateNewUsers: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
29
4
  newUserLimitedToAuthorizedDomains: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -32,6 +7,8 @@ declare const userHandlingInfoSchema: z.ZodObject<{
32
7
  updateCacheWhenNotFound: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
33
8
  updateCacheWhenNotFoundDelay: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
34
9
  contextUserForNewUserCreation: z.ZodDefault<z.ZodOptional<z.ZodString>>;
10
+ CreateUserApplicationRecords: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
11
+ UserApplications: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
35
12
  }, "strip", z.ZodTypeAny, {
36
13
  autoCreateNewUsers?: boolean;
37
14
  newUserLimitedToAuthorizedDomains?: boolean;
@@ -40,6 +17,8 @@ declare const userHandlingInfoSchema: z.ZodObject<{
40
17
  updateCacheWhenNotFound?: boolean;
41
18
  updateCacheWhenNotFoundDelay?: number;
42
19
  contextUserForNewUserCreation?: string;
20
+ CreateUserApplicationRecords?: boolean;
21
+ UserApplications?: string[];
43
22
  }, {
44
23
  autoCreateNewUsers?: boolean;
45
24
  newUserLimitedToAuthorizedDomains?: boolean;
@@ -48,6 +27,8 @@ declare const userHandlingInfoSchema: z.ZodObject<{
48
27
  updateCacheWhenNotFound?: boolean;
49
28
  updateCacheWhenNotFoundDelay?: number;
50
29
  contextUserForNewUserCreation?: string;
30
+ CreateUserApplicationRecords?: boolean;
31
+ UserApplications?: string[];
51
32
  }>;
52
33
  declare const databaseSettingsInfoSchema: z.ZodObject<{
53
34
  connectionTimeout: z.ZodNumber;
@@ -78,6 +59,8 @@ declare const configInfoSchema: z.ZodObject<{
78
59
  updateCacheWhenNotFound: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
79
60
  updateCacheWhenNotFoundDelay: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
80
61
  contextUserForNewUserCreation: z.ZodDefault<z.ZodOptional<z.ZodString>>;
62
+ CreateUserApplicationRecords: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
63
+ UserApplications: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
81
64
  }, "strip", z.ZodTypeAny, {
82
65
  autoCreateNewUsers?: boolean;
83
66
  newUserLimitedToAuthorizedDomains?: boolean;
@@ -86,6 +69,8 @@ declare const configInfoSchema: z.ZodObject<{
86
69
  updateCacheWhenNotFound?: boolean;
87
70
  updateCacheWhenNotFoundDelay?: number;
88
71
  contextUserForNewUserCreation?: string;
72
+ CreateUserApplicationRecords?: boolean;
73
+ UserApplications?: string[];
89
74
  }, {
90
75
  autoCreateNewUsers?: boolean;
91
76
  newUserLimitedToAuthorizedDomains?: boolean;
@@ -94,6 +79,8 @@ declare const configInfoSchema: z.ZodObject<{
94
79
  updateCacheWhenNotFound?: boolean;
95
80
  updateCacheWhenNotFoundDelay?: number;
96
81
  contextUserForNewUserCreation?: string;
82
+ CreateUserApplicationRecords?: boolean;
83
+ UserApplications?: string[];
97
84
  }>;
98
85
  databaseSettings: z.ZodObject<{
99
86
  connectionTimeout: z.ZodNumber;
@@ -140,6 +127,29 @@ declare const configInfoSchema: z.ZodObject<{
140
127
  includeEntitiesFromExcludedSchemas?: string[];
141
128
  };
142
129
  }>>;
130
+ dbHost: z.ZodDefault<z.ZodString>;
131
+ dbDatabase: z.ZodString;
132
+ dbPort: z.ZodDefault<z.ZodNumber>;
133
+ dbUsername: z.ZodString;
134
+ dbPassword: z.ZodString;
135
+ dbTrustServerCertificate: z.ZodEffects<z.ZodDefault<z.ZodBoolean>, "Y" | "N", boolean>;
136
+ dbInstanceName: z.ZodOptional<z.ZodString>;
137
+ graphqlPort: z.ZodDefault<z.ZodNumber>;
138
+ ___codeGenAPIURL: z.ZodOptional<z.ZodString>;
139
+ ___codeGenAPIPort: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
140
+ ___codeGenAPISubmissionDelay: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
141
+ graphqlRootPath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
142
+ webClientID: z.ZodOptional<z.ZodString>;
143
+ tenantID: z.ZodOptional<z.ZodString>;
144
+ enableIntrospection: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
145
+ websiteRunFromPackage: z.ZodOptional<z.ZodNumber>;
146
+ userEmailMap: z.ZodOptional<z.ZodEffects<z.ZodString, Record<string, string>, string>>;
147
+ ___skipAPIurl: z.ZodOptional<z.ZodString>;
148
+ ___skipAPIOrgId: z.ZodOptional<z.ZodString>;
149
+ auth0Domain: z.ZodOptional<z.ZodString>;
150
+ auth0WebClientID: z.ZodOptional<z.ZodString>;
151
+ auth0ClientSecret: z.ZodOptional<z.ZodString>;
152
+ mjCoreSchema: z.ZodString;
143
153
  }, "strip", z.ZodTypeAny, {
144
154
  userHandling?: {
145
155
  autoCreateNewUsers?: boolean;
@@ -149,6 +159,8 @@ declare const configInfoSchema: z.ZodObject<{
149
159
  updateCacheWhenNotFound?: boolean;
150
160
  updateCacheWhenNotFoundDelay?: number;
151
161
  contextUserForNewUserCreation?: string;
162
+ CreateUserApplicationRecords?: boolean;
163
+ UserApplications?: string[];
152
164
  };
153
165
  databaseSettings?: {
154
166
  connectionTimeout?: number;
@@ -165,6 +177,29 @@ declare const configInfoSchema: z.ZodObject<{
165
177
  includeEntitiesFromExcludedSchemas?: string[];
166
178
  };
167
179
  };
180
+ dbHost?: string;
181
+ dbDatabase?: string;
182
+ dbPort?: number;
183
+ dbUsername?: string;
184
+ dbPassword?: string;
185
+ dbTrustServerCertificate?: "Y" | "N";
186
+ dbInstanceName?: string;
187
+ graphqlPort?: number;
188
+ ___codeGenAPIURL?: string;
189
+ ___codeGenAPIPort?: number;
190
+ ___codeGenAPISubmissionDelay?: number;
191
+ graphqlRootPath?: string;
192
+ webClientID?: string;
193
+ tenantID?: string;
194
+ enableIntrospection?: boolean;
195
+ websiteRunFromPackage?: number;
196
+ userEmailMap?: Record<string, string>;
197
+ ___skipAPIurl?: string;
198
+ ___skipAPIOrgId?: string;
199
+ auth0Domain?: string;
200
+ auth0WebClientID?: string;
201
+ auth0ClientSecret?: string;
202
+ mjCoreSchema?: string;
168
203
  }, {
169
204
  userHandling?: {
170
205
  autoCreateNewUsers?: boolean;
@@ -174,6 +209,8 @@ declare const configInfoSchema: z.ZodObject<{
174
209
  updateCacheWhenNotFound?: boolean;
175
210
  updateCacheWhenNotFoundDelay?: number;
176
211
  contextUserForNewUserCreation?: string;
212
+ CreateUserApplicationRecords?: boolean;
213
+ UserApplications?: string[];
177
214
  };
178
215
  databaseSettings?: {
179
216
  connectionTimeout?: number;
@@ -190,12 +227,36 @@ declare const configInfoSchema: z.ZodObject<{
190
227
  includeEntitiesFromExcludedSchemas?: string[];
191
228
  };
192
229
  };
230
+ dbHost?: string;
231
+ dbDatabase?: string;
232
+ dbPort?: number;
233
+ dbUsername?: string;
234
+ dbPassword?: string;
235
+ dbTrustServerCertificate?: boolean;
236
+ dbInstanceName?: string;
237
+ graphqlPort?: number;
238
+ ___codeGenAPIURL?: string;
239
+ ___codeGenAPIPort?: number;
240
+ ___codeGenAPISubmissionDelay?: number;
241
+ graphqlRootPath?: string;
242
+ webClientID?: string;
243
+ tenantID?: string;
244
+ enableIntrospection?: boolean;
245
+ websiteRunFromPackage?: number;
246
+ userEmailMap?: string;
247
+ ___skipAPIurl?: string;
248
+ ___skipAPIOrgId?: string;
249
+ auth0Domain?: string;
250
+ auth0WebClientID?: string;
251
+ auth0ClientSecret?: string;
252
+ mjCoreSchema?: string;
193
253
  }>;
194
254
  export type UserHandlingInfo = z.infer<typeof userHandlingInfoSchema>;
195
255
  export type DatabaseSettingsInfo = z.infer<typeof databaseSettingsInfoSchema>;
196
256
  export type ViewingSystemSettingsInfo = z.infer<typeof viewingSystemInfoSchema>;
197
257
  export type ConfigInfo = z.infer<typeof configInfoSchema>;
198
258
  export declare const configInfo: ConfigInfo;
259
+ export declare const dbUsername: string, dbPassword: string, dbHost: string, dbDatabase: string, dbPort: number, dbTrustServerCertificate: "Y" | "N", dbInstanceName: string, graphqlPort: number, ___codeGenAPIURL: string, ___codeGenAPIPort: number, ___codeGenAPISubmissionDelay: number, graphqlRootPath: string, webClientID: string, tenantID: string, enableIntrospection: boolean, websiteRunFromPackage: number, userEmailMap: Record<string, string>, ___skipAPIurl: string, ___skipAPIOrgId: string, auth0Domain: string, auth0WebClientID: string, auth0ClientSecret: string, mj_core_schema: string;
199
260
  export declare function loadConfig(): {
200
261
  userHandling?: {
201
262
  autoCreateNewUsers?: boolean;
@@ -205,6 +266,8 @@ export declare function loadConfig(): {
205
266
  updateCacheWhenNotFound?: boolean;
206
267
  updateCacheWhenNotFoundDelay?: number;
207
268
  contextUserForNewUserCreation?: string;
269
+ CreateUserApplicationRecords?: boolean;
270
+ UserApplications?: string[];
208
271
  };
209
272
  databaseSettings?: {
210
273
  connectionTimeout?: number;
@@ -221,6 +284,29 @@ export declare function loadConfig(): {
221
284
  includeEntitiesFromExcludedSchemas?: string[];
222
285
  };
223
286
  };
287
+ dbHost?: string;
288
+ dbDatabase?: string;
289
+ dbPort?: number;
290
+ dbUsername?: string;
291
+ dbPassword?: string;
292
+ dbTrustServerCertificate?: "Y" | "N";
293
+ dbInstanceName?: string;
294
+ graphqlPort?: number;
295
+ ___codeGenAPIURL?: string;
296
+ ___codeGenAPIPort?: number;
297
+ ___codeGenAPISubmissionDelay?: number;
298
+ graphqlRootPath?: string;
299
+ webClientID?: string;
300
+ tenantID?: string;
301
+ enableIntrospection?: boolean;
302
+ websiteRunFromPackage?: number;
303
+ userEmailMap?: Record<string, string>;
304
+ ___skipAPIurl?: string;
305
+ ___skipAPIOrgId?: string;
306
+ auth0Domain?: string;
307
+ auth0WebClientID?: string;
308
+ auth0ClientSecret?: string;
309
+ mjCoreSchema?: string;
224
310
  };
225
311
  export {};
226
312
  //# sourceMappingURL=config.d.ts.map
package/dist/config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,OAAO,QAAiC,CAAC;AAEtD,eAAO,MAAM,MAAM,QAA2C,CAAC;AAC/D,eAAO,MAAM,MAAM,QAAoD,CAAC;AACxE,eAAO,MAAM,UAAU,QAA+C,CAAC;AACvE,eAAO,MAAM,UAAU,QAA+C,CAAC;AACvE,eAAO,MAAM,UAAU,QAA+C,CAAC;AACvE,eAAO,MAAM,cAAc,QAAyC,CAAC;AACrE,eAAO,MAAM,wBAAwB,SAAkD,CAAC;AAExF,eAAO,MAAM,WAAW,QAAiD,CAAC;AAE1E,eAAO,MAAM,gBAAgB,QAAwC,CAAC;AACtE,eAAO,MAAM,iBAAiB,QAA6D,CAAC;AAC5F,eAAO,MAAM,4BAA4B,QAAwE,CAAC;AAElH,eAAO,MAAM,eAAe,QAA+C,CAAC;AAE5E,eAAO,MAAM,WAAW,QAAsC,CAAC;AAC/D,eAAO,MAAM,QAAQ,QAAkC,CAAC;AAExD,eAAO,MAAM,mBAAmB,SAA4D,CAAC;AAC7F,eAAO,MAAM,qBAAqB,QAAsD,CAAC;AACzF,eAAO,MAAM,YAAY,wBAAmF,CAAC;AAE7G,eAAO,MAAM,aAAa,QAAyC,CAAC;AACpE,eAAO,MAAM,eAAe,QAAiD,CAAC;AAE9E,eAAO,MAAM,WAAW,QAAqC,CAAC;AAC9D,eAAO,MAAM,gBAAgB,QAAwC,CAAC;AACtE,eAAO,MAAM,iBAAiB,QAA4C,CAAC;AAE3E,eAAO,MAAM,cAAc,QAAuC,CAAC;AAEnE,eAAO,MAAM,UAAU,QAAoC,CAAC;AAE5D,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;EAQ1B,CAAC;AAEH,QAAA,MAAM,0BAA0B;;;;;;;;;;;;EAI9B,CAAC;AAEH,QAAA,MAAM,uBAAuB;;;;;;EAE3B,CAAC;AAUH,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKpB,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACtE,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAChF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,UAAU,EAAE,UAAyB,CAAC;AAEnD,wBAAgB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;EASzB"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU1B,CAAC;AAEH,QAAA,MAAM,0BAA0B;;;;;;;;;;;;EAI9B,CAAC;AAEH,QAAA,MAAM,uBAAuB;;;;;;EAE3B,CAAC;AAYH,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoCpB,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACtE,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAChF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,UAAU,EAAE,UAAyB,CAAC;AAEnD,eAAO,MACL,UAAU,UACV,UAAU,UACV,MAAM,UACN,UAAU,UACV,MAAM,UACN,wBAAwB,aACxB,cAAc,UACd,WAAW,UACX,gBAAgB,UAChB,iBAAiB,UACjB,4BAA4B,UAC5B,eAAe,UACf,WAAW,UACX,QAAQ,UACR,mBAAmB,WACnB,qBAAqB,UACrB,YAAY,0BACZ,aAAa,UACb,eAAe,UACf,WAAW,UACX,gBAAgB,UAChB,iBAAiB,UACH,cAAc,QAChB,CAAC;AAEf,wBAAgB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQzB"}
package/dist/config.js CHANGED
@@ -1,32 +1,6 @@
1
- import env from 'env-var';
2
- import fs from 'fs';
3
- import path from 'path';
4
1
  import { z } from 'zod';
5
- export const nodeEnv = env.get('NODE_ENV').asString();
6
- export const dbHost = env.get('DB_HOST').required().asString();
7
- export const dbPort = env.get('DB_PORT').default('1433').asPortNumber();
8
- export const dbUsername = env.get('DB_USERNAME').required().asString();
9
- export const dbPassword = env.get('DB_PASSWORD').required().asString();
10
- export const dbDatabase = env.get('DB_DATABASE').required().asString();
11
- export const dbInstanceName = env.get('DB_INSTANCE_NAME').asString();
12
- export const dbTrustServerCertificate = env.get('DB_TRUST_SERVER_CERTIFICATE').asBool();
13
- export const graphqlPort = env.get('PORT').default('4000').asPortNumber();
14
- export const ___codeGenAPIURL = env.get('CODEGEN_API_URL').asString();
15
- export const ___codeGenAPIPort = env.get('CODEGEN_API_PORT').default('3999').asPortNumber();
16
- export const ___codeGenAPISubmissionDelay = env.get('CODEGEN_API_SUBMISSION_DELAY').default(5000).asIntPositive();
17
- export const graphqlRootPath = env.get('ROOT_PATH').default('/').asString();
18
- export const webClientID = env.get('WEB_CLIENT_ID').asString();
19
- export const tenantID = env.get('TENANT_ID').asString();
20
- export const enableIntrospection = env.get('ENABLE_INTROSPECTION').default('false').asBool();
21
- export const websiteRunFromPackage = env.get('WEBSITE_RUN_FROM_PACKAGE').asIntPositive();
22
- export const userEmailMap = env.get('USER_EMAIL_MAP').default('{}').asJsonObject();
23
- export const ___skipAPIurl = env.get('ASK_SKIP_API_URL').asString();
24
- export const ___skipAPIOrgId = env.get('ASK_SKIP_ORGANIZATION_ID').asString();
25
- export const auth0Domain = env.get('AUTH0_DOMAIN').asString();
26
- export const auth0WebClientID = env.get('AUTH0_CLIENT_ID').asString();
27
- export const auth0ClientSecret = env.get('AUTH0_CLIENT_SECRET').asString();
28
- export const mj_core_schema = env.get('MJ_CORE_SCHEMA').asString();
29
- export const configFile = env.get('CONFIG_FILE').asString();
2
+ import { cosmiconfigSync } from 'cosmiconfig';
3
+ const explorer = cosmiconfigSync('mj', { searchStrategy: 'global' });
30
4
  const userHandlingInfoSchema = z.object({
31
5
  autoCreateNewUsers: z.boolean().optional().default(false),
32
6
  newUserLimitedToAuthorizedDomains: z.boolean().optional().default(false),
@@ -35,6 +9,8 @@ const userHandlingInfoSchema = z.object({
35
9
  updateCacheWhenNotFound: z.boolean().optional().default(false),
36
10
  updateCacheWhenNotFoundDelay: z.number().optional().default(30000),
37
11
  contextUserForNewUserCreation: z.string().optional().default(''),
12
+ CreateUserApplicationRecords: z.boolean().optional().default(false),
13
+ UserApplications: z.array(z.string()).optional().default([]),
38
14
  });
39
15
  const databaseSettingsInfoSchema = z.object({
40
16
  connectionTimeout: z.number(),
@@ -46,24 +22,55 @@ const viewingSystemInfoSchema = z.object({
46
22
  });
47
23
  const askSkipInfoSchema = z.object({
48
24
  organizationInfo: z.string().optional(),
49
- entitiesToSendSkip: z.object({
25
+ entitiesToSendSkip: z
26
+ .object({
50
27
  excludeSchemas: z.array(z.string()).optional(),
51
28
  includeEntitiesFromExcludedSchemas: z.array(z.string()).optional(),
52
- }).optional()
29
+ })
30
+ .optional(),
53
31
  });
54
32
  const configInfoSchema = z.object({
55
33
  userHandling: userHandlingInfoSchema,
56
34
  databaseSettings: databaseSettingsInfoSchema,
57
35
  viewingSystem: viewingSystemInfoSchema.optional(),
58
36
  askSkip: askSkipInfoSchema.optional(),
37
+ dbHost: z.string().default('localhost'),
38
+ dbDatabase: z.string(),
39
+ dbPort: z.number({ coerce: true }).default(1433),
40
+ dbUsername: z.string(),
41
+ dbPassword: z.string(),
42
+ dbTrustServerCertificate: z.coerce
43
+ .boolean()
44
+ .default(false)
45
+ .transform((v) => (v ? 'Y' : 'N')),
46
+ dbInstanceName: z.string().optional(),
47
+ graphqlPort: z.coerce.number().default(4000),
48
+ ___codeGenAPIURL: z.string().optional(),
49
+ ___codeGenAPIPort: z.coerce.number().optional().default(3999),
50
+ ___codeGenAPISubmissionDelay: z.coerce.number().optional().default(5000),
51
+ graphqlRootPath: z.string().optional().default('/'),
52
+ webClientID: z.string().optional(),
53
+ tenantID: z.string().optional(),
54
+ enableIntrospection: z.coerce.boolean().optional().default(false),
55
+ websiteRunFromPackage: z.coerce.number().optional(),
56
+ userEmailMap: z
57
+ .string()
58
+ .transform((val) => z.record(z.string()).parse(JSON.parse(val)))
59
+ .optional(),
60
+ ___skipAPIurl: z.string().optional(),
61
+ ___skipAPIOrgId: z.string().optional(),
62
+ auth0Domain: z.string().optional(),
63
+ auth0WebClientID: z.string().optional(),
64
+ auth0ClientSecret: z.string().optional(),
65
+ mjCoreSchema: z.string(),
59
66
  });
60
67
  export const configInfo = loadConfig();
68
+ export const { dbUsername, dbPassword, dbHost, dbDatabase, dbPort, dbTrustServerCertificate, dbInstanceName, graphqlPort, ___codeGenAPIURL, ___codeGenAPIPort, ___codeGenAPISubmissionDelay, graphqlRootPath, webClientID, tenantID, enableIntrospection, websiteRunFromPackage, userEmailMap, ___skipAPIurl, ___skipAPIOrgId, auth0Domain, auth0WebClientID, auth0ClientSecret, mjCoreSchema: mj_core_schema, } = configInfo;
61
69
  export function loadConfig() {
62
- const configPath = configFile ?? path.resolve('config.json');
63
- if (!fs.existsSync(configPath)) {
64
- throw new Error(`Config file ${configPath} does not exist.`);
70
+ const configSearchResult = explorer.search(process.cwd());
71
+ if (configSearchResult.isEmpty) {
72
+ throw new Error(`Config file ${configSearchResult.filepath} is empty or does not exist.`);
65
73
  }
66
- const configData = fs.readFileSync(configPath, 'utf-8');
67
- return configInfoSchema.parse(JSON.parse(configData));
74
+ return configInfoSchema.parse(configSearchResult.config);
68
75
  }
69
76
  //# sourceMappingURL=config.js.map
package/dist/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
package/dist/context.js CHANGED
@@ -44,7 +44,7 @@ export const getUserPayload = async (bearerToken, sessionId = 'default', dataSou
44
44
  await verifyAsync(issuer, validationOptions[issuer], token);
45
45
  authCache.set(token, true);
46
46
  }
47
- const email = payload?.email ? userEmailMap[payload?.email] ?? payload?.email : payload?.preferred_username;
47
+ const email = payload?.email ? ((userEmailMap ?? {})[payload?.email] ?? payload?.email) : payload?.preferred_username;
48
48
  const fullName = payload?.name;
49
49
  const firstName = payload?.given_name || fullName?.split(' ')[0];
50
50
  const lastName = payload?.family_name || fullName?.split(' ')[1] || fullName?.split(' ')[0];
package/dist/context.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
package/dist/orm.js CHANGED
@@ -23,7 +23,7 @@ const orm = (entities) => {
23
23
  if (dbTrustServerCertificate !== null && dbTrustServerCertificate !== undefined) {
24
24
  ormConfig.options = {
25
25
  ...ormConfig.options,
26
- trustServerCertificate: dbTrustServerCertificate,
26
+ trustServerCertificate: dbTrustServerCertificate === 'Y',
27
27
  };
28
28
  }
29
29
  return ormConfig;
package/dist/orm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvI,MAAM,GAAG,GAAG,CAAC,QAAuB,EAAqB,EAAE;IACzD,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,OAAgB;QACtB,QAAQ;QACR,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,cAAc;QAC1D,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC,iBAAiB;QAChE,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,cAAc,KAAK,IAAI,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChG,SAAS,CAAC,OAAO,GAAG;YAClB,GAAG,SAAS,CAAC,OAAO;YACpB,YAAY,EAAE,cAAc;SAC7B,CAAC;IACJ,CAAC;IACD,IAAI,wBAAwB,KAAK,IAAI,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;QAChF,SAAS,CAAC,OAAO,GAAG;YAClB,GAAG,SAAS,CAAC,OAAO;YACpB,sBAAsB,EAAE,wBAAwB;SACjD,CAAC;IACJ,CAAC;IAGD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,eAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvI,MAAM,GAAG,GAAG,CAAC,QAAuB,EAAqB,EAAE;IACzD,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,OAAgB;QACtB,QAAQ;QACR,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,cAAc;QAC1D,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC,iBAAiB;QAChE,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,cAAc,KAAK,IAAI,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChG,SAAS,CAAC,OAAO,GAAG;YAClB,GAAG,SAAS,CAAC,OAAO;YACpB,YAAY,EAAE,cAAc;SAC7B,CAAC;IACJ,CAAC;IACD,IAAI,wBAAwB,KAAK,IAAI,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;QAChF,SAAS,CAAC,OAAO,GAAG;YAClB,GAAG,SAAS,CAAC,OAAO;YACpB,sBAAsB,EAAE,wBAAwB,KAAK,GAAG;SACzD,CAAC;IACJ,CAAC;IAGD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,eAAe,GAAG,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@memberjunction/server",
3
- "version": "2.13.2",
3
+ "version": "2.13.4",
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,37 +22,37 @@
22
22
  "dependencies": {
23
23
  "@apollo/server": "^4.9.1",
24
24
  "@graphql-tools/utils": "^10.0.1",
25
- "@memberjunction/actions": "2.13.2",
26
- "@memberjunction/ai": "2.13.2",
27
- "@memberjunction/ai-mistral": "2.13.2",
28
- "@memberjunction/ai-openai": "2.13.2",
29
- "@memberjunction/ai-vectors-pinecone": "2.13.2",
30
- "@memberjunction/aiengine": "2.13.2",
31
- "@memberjunction/core": "2.13.2",
32
- "@memberjunction/core-actions": "2.13.2",
33
- "@memberjunction/core-entities": "2.13.2",
34
- "@memberjunction/data-context": "2.13.2",
35
- "@memberjunction/data-context-server": "2.13.2",
36
- "@memberjunction/doc-utils": "2.13.2",
37
- "@memberjunction/entity-communications-server": "2.13.2",
38
- "@memberjunction/external-change-detection": "2.13.2",
39
- "@memberjunction/global": "2.13.2",
40
- "@memberjunction/queue": "2.13.2",
41
- "@memberjunction/skip-types": "2.13.2",
42
- "@memberjunction/sqlserver-dataprovider": "2.13.2",
43
- "@memberjunction/graphql-dataprovider": "2.13.2",
44
- "@memberjunction/storage": "2.13.2",
45
- "@memberjunction/templates": "2.13.2",
25
+ "@memberjunction/actions": "2.13.4",
26
+ "@memberjunction/ai": "2.13.4",
27
+ "@memberjunction/ai-mistral": "2.13.4",
28
+ "@memberjunction/ai-openai": "2.13.4",
29
+ "@memberjunction/ai-vectors-pinecone": "2.13.4",
30
+ "@memberjunction/aiengine": "2.13.4",
31
+ "@memberjunction/core": "2.13.4",
32
+ "@memberjunction/core-actions": "2.13.4",
33
+ "@memberjunction/core-entities": "2.13.4",
34
+ "@memberjunction/data-context": "2.13.4",
35
+ "@memberjunction/data-context-server": "2.13.4",
36
+ "@memberjunction/doc-utils": "2.13.4",
37
+ "@memberjunction/entity-communications-server": "2.13.4",
38
+ "@memberjunction/external-change-detection": "2.13.4",
39
+ "@memberjunction/global": "2.13.4",
40
+ "@memberjunction/queue": "2.13.4",
41
+ "@memberjunction/skip-types": "2.13.4",
42
+ "@memberjunction/sqlserver-dataprovider": "2.13.4",
43
+ "@memberjunction/graphql-dataprovider": "2.13.4",
44
+ "@memberjunction/storage": "2.13.4",
45
+ "@memberjunction/templates": "2.13.4",
46
46
  "@types/cors": "^2.8.13",
47
47
  "@types/jsonwebtoken": "9.0.6",
48
48
  "@types/node": "20.14.2",
49
49
  "@types/ws": "^8.5.5",
50
50
  "axios": "^1.6.7",
51
51
  "body-parser": "^1.20.2",
52
+ "cosmiconfig": "9.0.0",
52
53
  "class-validator": "^0.14.0",
53
54
  "cors": "^2.8.5",
54
55
  "dotenv": "^16.4.1",
55
- "env-var": "^7.4.1",
56
56
  "express": "^4.18.2",
57
57
  "fast-glob": "^3.3.1",
58
58
  "graphql": "^16.8.0",
package/src/auth/newUsers.ts CHANGED
@@ -1,8 +1,8 @@
1
- import { LogError, LogStatus, Metadata, UserInfo } from "@memberjunction/core";
1
+ import { ApplicationInfo, LogError, LogStatus, Metadata, RunView, RunViewResult, UserInfo } from "@memberjunction/core";
2
2
  import { RegisterClass } from "@memberjunction/global";
3
3
  import { UserCache } from "@memberjunction/sqlserver-dataprovider";
4
4
  import { configInfo } from "../config.js";
5
- import { UserEntity, UserRoleEntity } from "@memberjunction/core-entities";
5
+ import { UserEntity, UserRoleEntity, UserApplicationEntity, UserApplicationEntityEntity, ApplicationEntityType, ApplicationEntityEntityType } from "@memberjunction/core-entities";
6
6
 
7
7
  @RegisterClass(NewUserBase)
8
8
  export class NewUserBase {
@@ -66,9 +66,70 @@ export class NewUserBase {
66
66
 
67
67
  userRoleEntity.RoleID = userRole.ID;
68
68
  const roleSaveResult: boolean = await userRoleEntity.Save();
69
- if(!roleSaveResult){
69
+ if(roleSaveResult){
70
+ LogStatus(`Assigned role ${role} to new user ${user.Name}`);
71
+ }
72
+ else{
70
73
  LogError(`Failed to assign role ${role} to new user ${user.Name}:`, undefined, userRoleEntity.LatestResult);
71
74
  }
75
+
76
+ }
77
+ }
78
+
79
+ // Create UserApplication records if specified in the config
80
+ if (configInfo.userHandling && configInfo.userHandling.CreateUserApplicationRecords) {
81
+ LogStatus("Creating User Applications for new user: " + user.Name);
82
+ for(const appName of configInfo.userHandling.UserApplications){
83
+ const toLowerCase: string = appName.trim().toLocaleLowerCase();
84
+ const application: ApplicationInfo | undefined = md.Applications.find(a => a.Name.trim().toLocaleLowerCase() === toLowerCase);
85
+ if (!application) {
86
+ LogError(`Application ${appName} not found in the Metadata, cannot assign to new user ${user.Name}`);
87
+ continue;
88
+ }
89
+
90
+ const userApplication: UserApplicationEntity = await md.GetEntityObject<UserApplicationEntity>('User Applications', contextUser);
91
+ userApplication.NewRecord();
92
+ userApplication.UserID = user.ID;
93
+ userApplication.ApplicationID = application.ID;
94
+ userApplication.IsActive = true;
95
+
96
+ const userApplicationSaveResult: boolean = await userApplication.Save();
97
+ if(userApplicationSaveResult){
98
+ LogStatus(`Created User Application ${appName} for new user ${user.Name}`);
99
+
100
+ //now create a UserApplicationEntity records for each entity in the application
101
+ const rv: RunView = new RunView();
102
+ const rvResult: RunViewResult<ApplicationEntityEntityType> = await rv.RunView({
103
+ EntityName: 'Application Entities',
104
+ ExtraFilter: `ApplicationID = '${application.ID}' and DefaultForNewUser = 1`,
105
+ }, contextUser);
106
+
107
+ if(!rvResult.Success){
108
+ LogError(`Failed to load Application Entities for Application ${appName} for new user ${user.Name}:`, undefined, rvResult.ErrorMessage);
109
+ continue;
110
+ }
111
+
112
+ LogStatus(`Creating ${rvResult.Results.length} User Application Entities for User Application ${appName} for new user ${user.Name}`);
113
+
114
+ for(const [index, appEntity] of rvResult.Results.entries()){
115
+ const userAppEntity: UserApplicationEntityEntity = await md.GetEntityObject<UserApplicationEntityEntity>('User Application Entities', contextUser);
116
+ userAppEntity.NewRecord();
117
+ userAppEntity.UserApplicationID = userApplication.ID;
118
+ userAppEntity.EntityID = appEntity.EntityID;
119
+ userAppEntity.Sequence = index;
120
+
121
+ const userAppEntitySaveResult: boolean = await userAppEntity.Save();
122
+ if(userAppEntitySaveResult){
123
+ LogStatus(`Created User Application Entity ${appEntity.Entity} for new user ${user.Name}`);
124
+ }
125
+ else{
126
+ LogError(`Failed to create User Application Entity for new user ${user.Name}:`, undefined, userAppEntity.LatestResult);
127
+ }
128
+ }
129
+ }
130
+ else{
131
+ LogError(`Failed to create User Application ${appName} for new user ${user.Name}:`, undefined, userApplication.LatestResult);
132
+ }
72
133
  }
73
134
  }
74
135
 
package/src/config.ts CHANGED
@@ -1,43 +1,7 @@
1
- import env from 'env-var';
2
- import fs from 'fs';
3
- import path from 'path';
4
1
  import { z } from 'zod';
2
+ import { cosmiconfigSync } from 'cosmiconfig';
5
3
 
6
- export const nodeEnv = env.get('NODE_ENV').asString();
7
-
8
- export const dbHost = env.get('DB_HOST').required().asString();
9
- export const dbPort = env.get('DB_PORT').default('1433').asPortNumber();
10
- export const dbUsername = env.get('DB_USERNAME').required().asString();
11
- export const dbPassword = env.get('DB_PASSWORD').required().asString();
12
- export const dbDatabase = env.get('DB_DATABASE').required().asString();
13
- export const dbInstanceName = env.get('DB_INSTANCE_NAME').asString();
14
- export const dbTrustServerCertificate = env.get('DB_TRUST_SERVER_CERTIFICATE').asBool();
15
-
16
- export const graphqlPort = env.get('PORT').default('4000').asPortNumber();
17
-
18
- export const ___codeGenAPIURL = env.get('CODEGEN_API_URL').asString();
19
- export const ___codeGenAPIPort = env.get('CODEGEN_API_PORT').default('3999').asPortNumber();
20
- export const ___codeGenAPISubmissionDelay = env.get('CODEGEN_API_SUBMISSION_DELAY').default(5000).asIntPositive();
21
-
22
- export const graphqlRootPath = env.get('ROOT_PATH').default('/').asString();
23
-
24
- export const webClientID = env.get('WEB_CLIENT_ID').asString();
25
- export const tenantID = env.get('TENANT_ID').asString();
26
-
27
- export const enableIntrospection = env.get('ENABLE_INTROSPECTION').default('false').asBool();
28
- export const websiteRunFromPackage = env.get('WEBSITE_RUN_FROM_PACKAGE').asIntPositive();
29
- export const userEmailMap = env.get('USER_EMAIL_MAP').default('{}').asJsonObject() as Record<string, string>;
30
-
31
- export const ___skipAPIurl = env.get('ASK_SKIP_API_URL').asString();
32
- export const ___skipAPIOrgId = env.get('ASK_SKIP_ORGANIZATION_ID').asString();
33
-
34
- export const auth0Domain = env.get('AUTH0_DOMAIN').asString();
35
- export const auth0WebClientID = env.get('AUTH0_CLIENT_ID').asString();
36
- export const auth0ClientSecret = env.get('AUTH0_CLIENT_SECRET').asString();
37
-
38
- export const mj_core_schema = env.get('MJ_CORE_SCHEMA').asString();
39
-
40
- export const configFile = env.get('CONFIG_FILE').asString();
4
+ const explorer = cosmiconfigSync('mj', { searchStrategy: 'global' });
41
5
 
42
6
  const userHandlingInfoSchema = z.object({
43
7
  autoCreateNewUsers: z.boolean().optional().default(false),
@@ -47,6 +11,8 @@ const userHandlingInfoSchema = z.object({
47
11
  updateCacheWhenNotFound: z.boolean().optional().default(false),
48
12
  updateCacheWhenNotFoundDelay: z.number().optional().default(30000),
49
13
  contextUserForNewUserCreation: z.string().optional().default(''),
14
+ CreateUserApplicationRecords: z.boolean().optional().default(false),
15
+ UserApplications: z.array(z.string()).optional().default([]),
50
16
  });
51
17
 
52
18
  const databaseSettingsInfoSchema = z.object({
@@ -61,10 +27,12 @@ const viewingSystemInfoSchema = z.object({
61
27
 
62
28
  const askSkipInfoSchema = z.object({
63
29
  organizationInfo: z.string().optional(),
64
- entitiesToSendSkip: z.object({
65
- excludeSchemas: z.array(z.string()).optional(),
66
- includeEntitiesFromExcludedSchemas: z.array(z.string()).optional(),
67
- }).optional()
30
+ entitiesToSendSkip: z
31
+ .object({
32
+ excludeSchemas: z.array(z.string()).optional(),
33
+ includeEntitiesFromExcludedSchemas: z.array(z.string()).optional(),
34
+ })
35
+ .optional(),
68
36
  });
69
37
 
70
38
  const configInfoSchema = z.object({
@@ -72,6 +40,37 @@ const configInfoSchema = z.object({
72
40
  databaseSettings: databaseSettingsInfoSchema,
73
41
  viewingSystem: viewingSystemInfoSchema.optional(),
74
42
  askSkip: askSkipInfoSchema.optional(),
43
+
44
+ dbHost: z.string().default('localhost'),
45
+ dbDatabase: z.string(),
46
+ dbPort: z.number({ coerce: true }).default(1433),
47
+ dbUsername: z.string(),
48
+ dbPassword: z.string(),
49
+ dbTrustServerCertificate: z.coerce
50
+ .boolean()
51
+ .default(false)
52
+ .transform((v) => (v ? 'Y' : 'N')),
53
+ dbInstanceName: z.string().optional(),
54
+ graphqlPort: z.coerce.number().default(4000),
55
+
56
+ ___codeGenAPIURL: z.string().optional(),
57
+ ___codeGenAPIPort: z.coerce.number().optional().default(3999),
58
+ ___codeGenAPISubmissionDelay: z.coerce.number().optional().default(5000),
59
+ graphqlRootPath: z.string().optional().default('/'),
60
+ webClientID: z.string().optional(),
61
+ tenantID: z.string().optional(),
62
+ enableIntrospection: z.coerce.boolean().optional().default(false),
63
+ websiteRunFromPackage: z.coerce.number().optional(),
64
+ userEmailMap: z
65
+ .string()
66
+ .transform((val) => z.record(z.string()).parse(JSON.parse(val)))
67
+ .optional(),
68
+ ___skipAPIurl: z.string().optional(),
69
+ ___skipAPIOrgId: z.string().optional(),
70
+ auth0Domain: z.string().optional(),
71
+ auth0WebClientID: z.string().optional(),
72
+ auth0ClientSecret: z.string().optional(),
73
+ mjCoreSchema: z.string(),
75
74
  });
76
75
 
77
76
  export type UserHandlingInfo = z.infer<typeof userHandlingInfoSchema>;
@@ -81,13 +80,38 @@ export type ConfigInfo = z.infer<typeof configInfoSchema>;
81
80
 
82
81
  export const configInfo: ConfigInfo = loadConfig();
83
82
 
83
+ export const {
84
+ dbUsername,
85
+ dbPassword,
86
+ dbHost,
87
+ dbDatabase,
88
+ dbPort,
89
+ dbTrustServerCertificate,
90
+ dbInstanceName,
91
+ graphqlPort,
92
+ ___codeGenAPIURL,
93
+ ___codeGenAPIPort,
94
+ ___codeGenAPISubmissionDelay,
95
+ graphqlRootPath,
96
+ webClientID,
97
+ tenantID,
98
+ enableIntrospection,
99
+ websiteRunFromPackage,
100
+ userEmailMap,
101
+ ___skipAPIurl,
102
+ ___skipAPIOrgId,
103
+ auth0Domain,
104
+ auth0WebClientID,
105
+ auth0ClientSecret,
106
+ mjCoreSchema: mj_core_schema,
107
+ } = configInfo;
108
+
84
109
  export function loadConfig() {
85
- const configPath = configFile ?? path.resolve('config.json');
110
+ const configSearchResult = explorer.search(process.cwd());
86
111
 
87
- if (!fs.existsSync(configPath)) {
88
- throw new Error(`Config file ${configPath} does not exist.`);
112
+ if (configSearchResult.isEmpty) {
113
+ throw new Error(`Config file ${configSearchResult.filepath} is empty or does not exist.`);
89
114
  }
90
115
 
91
- const configData = fs.readFileSync(configPath, 'utf-8');
92
- return configInfoSchema.parse(JSON.parse(configData));
116
+ return configInfoSchema.parse(configSearchResult.config);
93
117
  }
package/src/context.ts CHANGED
@@ -61,7 +61,7 @@ export const getUserPayload = async (
61
61
  authCache.set(token, true);
62
62
  }
63
63
 
64
- const email = payload?.email ? userEmailMap[payload?.email] ?? payload?.email : payload?.preferred_username; // temporary fix to check preferred_username if email is not present
64
+ const email = payload?.email ? ((userEmailMap ?? {})[payload?.email] ?? payload?.email) : payload?.preferred_username; // temporary fix to check preferred_username if email is not present
65
65
  const fullName = payload?.name;
66
66
  const firstName = payload?.given_name || fullName?.split(' ')[0];
67
67
  const lastName = payload?.family_name || fullName?.split(' ')[1] || fullName?.split(' ')[0];
package/src/orm.ts CHANGED
@@ -25,7 +25,7 @@ const orm = (entities: Array<string>): DataSourceOptions => {
25
25
  if (dbTrustServerCertificate !== null && dbTrustServerCertificate !== undefined) {
26
26
  ormConfig.options = {
27
27
  ...ormConfig.options,
28
- trustServerCertificate: dbTrustServerCertificate,
28
+ trustServerCertificate: dbTrustServerCertificate === 'Y',
29
29
  };
30
30
  }
31
31