@bitblit/ratchet-warden-server 6.0.159 → 6.1.167-alpha

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 (27) hide show
  1. package/lib/server/provider/warden-dynamo-storage-provider.d.ts +5 -10
  2. package/lib/server/provider/warden-dynamo-storage-provider.js +11 -29
  3. package/lib/server/provider/warden-dynamo-storage-provider.js.map +1 -1
  4. package/lib/server/warden-authorizer.d.ts +12 -15
  5. package/lib/server/warden-authorizer.js +11 -19
  6. package/lib/server/warden-authorizer.js.map +1 -1
  7. package/lib/server/warden-entry-builder.d.ts +5 -1
  8. package/lib/server/warden-entry-builder.js +14 -3
  9. package/lib/server/warden-entry-builder.js.map +1 -1
  10. package/lib/server/warden-service-options.d.ts +0 -2
  11. package/lib/server/warden-service.d.ts +1 -1
  12. package/lib/server/warden-service.js +10 -20
  13. package/lib/server/warden-service.js.map +1 -1
  14. package/package.json +8 -8
  15. package/src/server/provider/warden-dynamo-storage-provider.ts +15 -36
  16. package/src/server/warden-authorizer.ts +23 -35
  17. package/src/server/warden-entry-builder.ts +20 -3
  18. package/src/server/warden-service-options.ts +0 -2
  19. package/src/server/warden-service.ts +15 -26
  20. package/lib/server/provider/warden-default-user-decoration-provider.d.ts +0 -7
  21. package/lib/server/provider/warden-default-user-decoration-provider.js +0 -14
  22. package/lib/server/provider/warden-default-user-decoration-provider.js.map +0 -1
  23. package/lib/server/provider/warden-user-decoration-provider.d.ts +0 -5
  24. package/lib/server/provider/warden-user-decoration-provider.js +0 -2
  25. package/lib/server/provider/warden-user-decoration-provider.js.map +0 -1
  26. package/src/server/provider/warden-default-user-decoration-provider.ts +0 -23
  27. package/src/server/provider/warden-user-decoration-provider.ts +0 -10
package/lib/server/provider/warden-dynamo-storage-provider.d.ts CHANGED
@@ -6,20 +6,16 @@ import { WardenEntrySummary } from '@bitblit/ratchet-warden-common/common/model/
6
6
  import { ExpiringCodeProvider } from '@bitblit/ratchet-aws/expiring-code/expiring-code-provider';
7
7
  import { ExpiringCode } from '@bitblit/ratchet-aws/expiring-code/expiring-code';
8
8
  import { WardenStorageProvider } from "./warden-storage-provider.js";
9
- import { WardenUserDecorationProvider } from "./warden-user-decoration-provider.js";
10
- import { WardenUserDecoration } from "@bitblit/ratchet-warden-common/common/model/warden-user-decoration";
11
9
  import { WardenTeamRoleMapping } from "@bitblit/ratchet-warden-common/common/model/warden-team-role-mapping";
12
- export declare class WardenDynamoStorageProvider<T> implements WardenStorageProvider, ExpiringCodeProvider, WardenUserDecorationProvider<T> {
10
+ import { WardenEntryMetadata } from "@bitblit/ratchet-warden-common/common/model/warden-entry-metadata";
11
+ export declare class WardenDynamoStorageProvider<T> implements WardenStorageProvider, ExpiringCodeProvider {
13
12
  private ddb;
14
13
  private options;
15
14
  private static readonly EXPIRING_CODE_PROVIDER_KEY;
16
15
  constructor(ddb: DynamoRatchet, options: WardenDynamoStorageProviderOptions<T>);
17
- createDecoration(decoration: T): WardenUserDecoration<T>;
18
- updateRoles(userId: string, roles: WardenTeamRoleMapping[]): Promise<WardenUserDecoration<T>>;
19
- updateTokenExpirationSeconds(userId: string, newValue: number): Promise<WardenUserDecoration<T>>;
20
- updateDecoration(userId: string, decoration: T): Promise<WardenUserDecoration<T>>;
21
- fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<T>>;
22
- fetchDecorationById(userId: string): Promise<WardenUserDecoration<T>>;
16
+ updateRoles(userId: string, roles: WardenTeamRoleMapping[]): Promise<WardenEntry>;
17
+ updateMetaData(userId: string, meta: WardenEntryMetadata): Promise<WardenEntry>;
18
+ removeMetaData(userId: string, metaKey: string): Promise<WardenEntry>;
23
19
  private fetchExpiringCodes;
24
20
  private updateInternal;
25
21
  checkCode(code: string, context: string, deleteOnMatch?: boolean): Promise<boolean>;
@@ -39,7 +35,6 @@ export declare class WardenDynamoStorageProvider<T> implements WardenStorageProv
39
35
  export interface WardenDynamoStorageDataWrapper {
40
36
  userId: string;
41
37
  entry: WardenEntry;
42
- decoration: WardenUserDecoration<any>;
43
38
  currentUserChallenges: string[];
44
39
  contactSearchString: string;
45
40
  thirdPartySearchString: string;
package/lib/server/provider/warden-dynamo-storage-provider.js CHANGED
@@ -9,57 +9,39 @@ export class WardenDynamoStorageProvider {
9
9
  this.ddb = ddb;
10
10
  this.options = options;
11
11
  }
12
- createDecoration(decoration) {
13
- return {
14
- globalRoleIds: [],
15
- teamRoleMappings: this.options.defaultTeamRoleMappings,
16
- userTokenExpirationSeconds: this.options.defaultTokenExpirationSeconds,
17
- userTokenData: decoration,
18
- proxyUserTokenData: null
19
- };
20
- }
21
12
  async updateRoles(userId, roles) {
22
13
  const rval = await this.fetchInternalByUserId(userId);
23
14
  if (rval) {
24
- rval.decoration ??= this.createDecoration(null);
25
- rval.decoration.teamRoleMappings = roles;
15
+ rval.entry.teamRoleMappings = roles;
26
16
  await this.updateInternal(rval);
27
17
  }
28
18
  else {
29
19
  throw ErrorRatchet.fErr('Cannot update roles - no entry found for %s', userId);
30
20
  }
31
- return this.fetchDecorationById(userId);
21
+ return this.findEntryById(userId);
32
22
  }
33
- async updateTokenExpirationSeconds(userId, newValue) {
23
+ async updateMetaData(userId, meta) {
34
24
  const rval = await this.fetchInternalByUserId(userId);
35
25
  if (rval) {
36
- rval.decoration ??= this.createDecoration(null);
37
- rval.decoration.userTokenExpirationSeconds = newValue;
26
+ rval.entry.meta = (rval.entry.meta || []).filter(s => s.key !== meta.key);
27
+ rval.entry.meta.push(meta);
38
28
  await this.updateInternal(rval);
39
29
  }
40
30
  else {
41
31
  throw ErrorRatchet.fErr('Cannot update roles - no entry found for %s', userId);
42
32
  }
43
- return this.fetchDecorationById(userId);
33
+ return this.findEntryById(userId);
44
34
  }
45
- async updateDecoration(userId, decoration) {
35
+ async removeMetaData(userId, metaKey) {
46
36
  const rval = await this.fetchInternalByUserId(userId);
47
37
  if (rval) {
48
- rval.decoration ??= this.createDecoration(null);
49
- rval.decoration.userTokenData = decoration;
38
+ rval.entry.meta = (rval.entry.meta || []).filter(s => s.key !== metaKey);
50
39
  await this.updateInternal(rval);
51
40
  }
52
41
  else {
53
42
  throw ErrorRatchet.fErr('Cannot update roles - no entry found for %s', userId);
54
43
  }
55
- return this.fetchDecorationById(userId);
56
- }
57
- async fetchDecoration(wardenUser) {
58
- return this.fetchDecorationById(wardenUser.userId);
59
- }
60
- async fetchDecorationById(userId) {
61
- const rval = await this.fetchInternalByUserId(userId);
62
- return rval?.decoration;
44
+ return this.findEntryById(userId);
63
45
  }
64
46
  async fetchExpiringCodes() {
65
47
  let rval = await this.ddb.simpleGet(this.options.tableName, {
@@ -168,7 +150,8 @@ export class WardenDynamoStorageProvider {
168
150
  TableName: this.options.tableName,
169
151
  };
170
152
  const results = await this.ddb.fullyExecuteScan(scan);
171
- const rval = results.map(wd => {
153
+ const rval = results.filter(dsw => dsw.userId !== WardenDynamoStorageProvider.EXPIRING_CODE_PROVIDER_KEY)
154
+ .map(wd => {
172
155
  return WardenUtils.stripWardenEntryToSummary(wd.entry);
173
156
  });
174
157
  return rval;
@@ -184,7 +167,6 @@ export class WardenDynamoStorageProvider {
184
167
  userId: entry.userId,
185
168
  entry: entry,
186
169
  currentUserChallenges: [],
187
- decoration: this.createDecoration(null),
188
170
  contactSearchString: 'ContactSearch: ' + (entry.contactMethods || []).map((cm) => WardenDynamoStorageProvider.contactToSearchString(cm)).join(' '),
189
171
  thirdPartySearchString: '3rdPartySearch: ' + (entry.thirdPartyAuthenticators || []).map((item) => WardenDynamoStorageProvider.thirdPartyToSearchString(item.thirdParty, item.thirdPartyId)).join(' '),
190
172
  };
package/lib/server/provider/warden-dynamo-storage-provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"warden-dynamo-storage-provider.js","sourceRoot":"","sources":["../../../src/server/provider/warden-dynamo-storage-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"warden-dynamo-storage-provider.js","sourceRoot":"","sources":["../../../src/server/provider/warden-dynamo-storage-provider.ts"],"names":[],"mappings":"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"}
package/lib/server/warden-authorizer.d.ts CHANGED
@@ -1,14 +1,12 @@
1
1
  import { WardenServiceOptions } from "./warden-service-options.js";
2
2
  import { WardenContact } from "@bitblit/ratchet-warden-common/common/model/warden-contact";
3
3
  import { WardenEntry } from "@bitblit/ratchet-warden-common/common/model/warden-entry";
4
- import { WardenUserDecoration } from "@bitblit/ratchet-warden-common/common/model/warden-user-decoration";
5
- import { WardenJwtToken } from "@bitblit/ratchet-warden-common/common/model/warden-jwt-token";
4
+ import { WardenEntryCommonData } from "@bitblit/ratchet-warden-common/common/model/warden-entry-common-data";
6
5
  export declare class WardenAuthorizer {
7
6
  private opts;
8
7
  constructor(opts: WardenServiceOptions);
9
8
  findEntryByContact(contact: WardenContact): Promise<WardenEntry>;
10
9
  findEntryById(userId: string): Promise<WardenEntry>;
11
- findDecoratorById(userId: string): Promise<WardenUserDecoration<any>>;
12
10
  userHasGlobalRoleById(userId: string, roleId: string): Promise<boolean>;
13
11
  userHasRoleOnTeamById(userId: string, teamId: string, roleId: string): Promise<boolean>;
14
12
  userHasAtLeastOneGlobalRoleById(userId: string, roleIds: string[]): Promise<boolean>;
@@ -20,16 +18,15 @@ export declare class WardenAuthorizer {
20
18
  userIsTeamMemberById(userId: string, teamId: string): Promise<boolean>;
21
19
  userHasAnyRoleOnTeamById(userId: string, teamId: string): Promise<boolean>;
22
20
  usersTeamMembershipsById(userId: string): Promise<string[]>;
23
- userHasGlobalRole(user: WardenUserDecoration<any>, roleId: string): boolean;
24
- userHasRoleOnTeam(user: WardenUserDecoration<any>, teamId: string, roleId: string): boolean;
25
- userHasAtLeastOneGlobalRole(user: WardenUserDecoration<any>, roleIds: string[]): boolean;
26
- userHasAtLeastOneRoleOnTeam(user: WardenUserDecoration<any>, teamId: string, roleIds: string[]): boolean;
27
- userHasAllGlobalRoles(user: WardenUserDecoration<any>, roleIds: string[]): boolean;
28
- userHasAllRolesOnTeam(user: WardenUserDecoration<any>, teamId: string, roleIds: string[]): boolean;
29
- userHasGlobalRoles(user: WardenUserDecoration<any>, roleIds: string[], combineWithAnd: boolean): boolean;
30
- userHasRolesOnTeam(user: WardenUserDecoration<any>, teamId: string, roleIds: string[], combineWithAnd: boolean): boolean;
31
- wardenUserDecorationFromToken(jwt: WardenJwtToken<any>): WardenUserDecoration<any>;
32
- userIsTeamMember(user: WardenUserDecoration<any>, teamId: string): boolean;
33
- userHasAnyRoleOnTeam(user: WardenUserDecoration<any>, teamId: string): boolean;
34
- usersTeamMemberships(user: WardenUserDecoration<any>): string[];
21
+ userHasGlobalRole(user: WardenEntryCommonData, roleId: string): boolean;
22
+ userHasRoleOnTeam(user: WardenEntryCommonData, teamId: string, roleId: string): boolean;
23
+ userHasAtLeastOneGlobalRole(user: WardenEntryCommonData, roleIds: string[]): boolean;
24
+ userHasAtLeastOneRoleOnTeam(user: WardenEntryCommonData, teamId: string, roleIds: string[]): boolean;
25
+ userHasAllGlobalRoles(user: WardenEntryCommonData, roleIds: string[]): boolean;
26
+ userHasAllRolesOnTeam(user: WardenEntryCommonData, teamId: string, roleIds: string[]): boolean;
27
+ userHasGlobalRoles(user: WardenEntryCommonData, roleIds: string[], combineWithAnd: boolean): boolean;
28
+ userHasRolesOnTeam(user: WardenEntryCommonData, teamId: string, roleIds: string[], combineWithAnd: boolean): boolean;
29
+ userIsTeamMember(user: WardenEntryCommonData, teamId: string): boolean;
30
+ userHasAnyRoleOnTeam(user: WardenEntryCommonData, teamId: string): boolean;
31
+ usersTeamMemberships(user: WardenEntryCommonData): string[];
35
32
  }
package/lib/server/warden-authorizer.js CHANGED
@@ -10,43 +10,38 @@ export class WardenAuthorizer {
10
10
  findEntryById(userId) {
11
11
  return this.opts.storageProvider.findEntryById(userId);
12
12
  }
13
- async findDecoratorById(userId) {
14
- const user = await this.findEntryById(userId);
15
- const rval = user ? await this.opts.userDecorationProvider.fetchDecoration(user) : null;
16
- return rval;
17
- }
18
13
  async userHasGlobalRoleById(userId, roleId) {
19
- return this.userHasGlobalRole(await this.findDecoratorById(userId), roleId);
14
+ return this.userHasGlobalRole(await this.findEntryById(userId), roleId);
20
15
  }
21
16
  async userHasRoleOnTeamById(userId, teamId, roleId) {
22
- return this.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, [roleId], true);
17
+ return this.userHasRolesOnTeam(await this.findEntryById(userId), teamId, [roleId], true);
23
18
  }
24
19
  async userHasAtLeastOneGlobalRoleById(userId, roleIds) {
25
- return this.userHasGlobalRoles(await this.findDecoratorById(userId), roleIds, false);
20
+ return this.userHasGlobalRoles(await this.findEntryById(userId), roleIds, false);
26
21
  }
27
22
  async userHasAtLeastOneRoleOnTeamById(userId, teamId, roleIds) {
28
- return this.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, roleIds, false);
23
+ return this.userHasRolesOnTeam(await this.findEntryById(userId), teamId, roleIds, false);
29
24
  }
30
25
  async userHasAllGlobalRolesById(userId, roleIds) {
31
- return this.userHasGlobalRoles(await this.findDecoratorById(userId), roleIds, true);
26
+ return this.userHasGlobalRoles(await this.findEntryById(userId), roleIds, true);
32
27
  }
33
28
  async userHasAllRolesOnTeamById(userId, teamId, roleIds) {
34
- return this.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, roleIds, true);
29
+ return this.userHasRolesOnTeam(await this.findEntryById(userId), teamId, roleIds, true);
35
30
  }
36
31
  async userHasGlobalRolesById(userId, roleIds, combineWithAnd) {
37
- return WardenUtils.userHasGlobalRoles(await this.findDecoratorById(userId), roleIds, combineWithAnd);
32
+ return WardenUtils.userHasGlobalRoles(await this.findEntryById(userId), roleIds, combineWithAnd);
38
33
  }
39
34
  async userHasRolesOnTeamById(userId, teamId, roleIds, combineWithAnd) {
40
- return WardenUtils.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, roleIds, combineWithAnd);
35
+ return WardenUtils.userHasRolesOnTeam(await this.findEntryById(userId), teamId, roleIds, combineWithAnd);
41
36
  }
42
37
  async userIsTeamMemberById(userId, teamId) {
43
- return WardenUtils.userIsTeamMember(await this.findDecoratorById(userId), teamId);
38
+ return WardenUtils.userIsTeamMember(await this.findEntryById(userId), teamId);
44
39
  }
45
40
  async userHasAnyRoleOnTeamById(userId, teamId) {
46
- return WardenUtils.userHasAnyRoleOnTeam(await this.findDecoratorById(userId), teamId);
41
+ return WardenUtils.userHasAnyRoleOnTeam(await this.findEntryById(userId), teamId);
47
42
  }
48
43
  async usersTeamMembershipsById(userId) {
49
- return WardenUtils.usersTeamMemberships(await this.findDecoratorById(userId));
44
+ return WardenUtils.usersTeamMemberships(await this.findEntryById(userId));
50
45
  }
51
46
  userHasGlobalRole(user, roleId) {
52
47
  return WardenUtils.userHasGlobalRoles(user, [roleId], true);
@@ -72,9 +67,6 @@ export class WardenAuthorizer {
72
67
  userHasRolesOnTeam(user, teamId, roleIds, combineWithAnd) {
73
68
  return WardenUtils.userHasRolesOnTeam(user, teamId, roleIds, combineWithAnd);
74
69
  }
75
- wardenUserDecorationFromToken(jwt) {
76
- return WardenUtils.wardenUserDecorationFromToken(jwt);
77
- }
78
70
  userIsTeamMember(user, teamId) {
79
71
  return WardenUtils.userIsTeamMember(user, teamId);
80
72
  }
package/lib/server/warden-authorizer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"warden-authorizer.js","sourceRoot":"","sources":["../../src/server/warden-authorizer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,yDAAyD,CAAC;AAItF,MAAM,OAAO,gBAAgB;IAEP;IAApB,YAAoB,IAA0B;QAA1B,SAAI,GAAJ,IAAI,CAAsB;IAC9C,CAAC;IAGM,kBAAkB,CAAC,OAAsB;QAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAGM,aAAa,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,MAAc;QAC3C,MAAM,IAAI,GAAgB,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,IAAI,GAA8B,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnH,OAAO,IAAI,CAAC;IACd,CAAC;IAGM,KAAK,CAAC,qBAAqB,CAAC,MAAc,EAAE,MAAc;QAC/D,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;IAC9E,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,MAAc,EAAC,MAAc,EAAE,MAAc;QAC9E,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/F,CAAC;IAEM,KAAK,CAAC,+BAA+B,CAAC,MAAc,EAAE,OAAiB;QAC5E,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACvF,CAAC;IAEM,KAAK,CAAC,+BAA+B,CAAC,MAAc,EAAE,MAAc,EAAE,OAAiB;QAC5F,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/F,CAAC;IAGM,KAAK,CAAC,yBAAyB,CAAC,MAAc,EAAE,OAAiB;QACtE,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,MAAc,EAAE,MAAc,EAAE,OAAiB;QACtF,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC9F,CAAC;IAGM,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,OAAiB,EAAE,cAAuB;QAC5F,OAAO,WAAW,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IACvG,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,MAAc,EAAE,OAAiB,EAAE,cAAuB;QAC5G,OAAO,WAAW,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/G,CAAC;IAGM,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,MAAc;QAC9D,OAAO,WAAW,CAAC,gBAAgB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAC,MAAM,CAAC,CAAC;IACnF,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,MAAc,EAAE,MAAc;QAClE,OAAO,WAAW,CAAC,oBAAoB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAC,MAAM,CAAC,CAAC;IACvF,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,MAAc;QAClD,OAAO,WAAW,CAAC,oBAAoB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IAChF,CAAC;IAIM,iBAAiB,CAAC,IAA+B,EAAE,MAAc;QACtE,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEM,iBAAiB,CAAC,IAA+B,EAAC,MAAc,EAAE,MAAc;QACrF,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAEM,2BAA2B,CAAC,IAA+B,EAAE,OAAiB;QACnF,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAEM,2BAA2B,CAAC,IAA+B,EAAE,MAAc,EAAE,OAAiB;QACnG,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACtE,CAAC;IAGM,qBAAqB,CAAC,IAA+B,EAAE,OAAiB;QAC7E,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;IAEM,qBAAqB,CAAC,IAA+B,EAAE,MAAc,EAAE,OAAiB;QAC7F,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAGM,kBAAkB,CAAC,IAA+B,EAAE,OAAiB,EAAE,cAAuB;QACnG,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IACvE,CAAC;IAEM,kBAAkB,CAAC,IAA+B,EAAE,MAAc,EAAE,OAAiB,EAAE,cAAuB;QACnH,OAAO,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAEM,6BAA6B,CAAC,GAAwB;QAC3D,OAAO,WAAW,CAAC,6BAA6B,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC;IAGM,gBAAgB,CAAC,IAA+B,EAAE,MAAc;QACrE,OAAO,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAEM,oBAAoB,CAAC,IAA+B,EAAE,MAAc;QACzE,OAAO,WAAW,CAAC,oBAAoB,CAAC,IAAI,EAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAEM,oBAAoB,CAAC,IAA+B;QACzD,OAAO,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;CAEF"}
1
+ {"version":3,"file":"warden-authorizer.js","sourceRoot":"","sources":["../../src/server/warden-authorizer.ts"],"names":[],"mappings":"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"}
package/lib/server/warden-entry-builder.d.ts CHANGED
@@ -1,10 +1,14 @@
1
1
  import { WardenEntry } from "@bitblit/ratchet-warden-common/common/model/warden-entry";
2
2
  import { WardenContact } from "@bitblit/ratchet-warden-common/common/model/warden-contact";
3
3
  import { WardenThirdPartyAuthentication } from "@bitblit/ratchet-warden-common/common/model/warden-third-party-authentication";
4
+ import { WardenEntryMetadata } from "@bitblit/ratchet-warden-common/common/model/warden-entry-metadata";
5
+ import { WardenTeamRoleMapping } from "@bitblit/ratchet-warden-common/common/model/warden-team-role-mapping";
4
6
  export declare class WardenEntryBuilder {
5
7
  private readonly _entry;
6
8
  constructor(label?: string);
7
- withTags(tags: string[]): WardenEntryBuilder;
9
+ withMeta(value: WardenEntryMetadata[]): WardenEntryBuilder;
10
+ withGlobalRoleIds(value: string[]): WardenEntryBuilder;
11
+ withTeamRoleMappings(value: WardenTeamRoleMapping[]): WardenEntryBuilder;
8
12
  withThirdPartyAuthentication(thirdPartyAuthenticators: [WardenThirdPartyAuthentication]): WardenEntryBuilder;
9
13
  withLabel(label: string): WardenEntryBuilder;
10
14
  withLabelFromContact(contact: WardenContact): WardenEntryBuilder;
package/lib/server/warden-entry-builder.js CHANGED
@@ -8,15 +8,26 @@ export class WardenEntryBuilder {
8
8
  userId: guid,
9
9
  userLabel: label || 'User ' + guid,
10
10
  contactMethods: [],
11
- tags: [],
12
11
  webAuthnAuthenticators: [],
13
12
  thirdPartyAuthenticators: [],
13
+ globalRoleIds: [],
14
+ teamRoleMappings: [],
15
+ meta: [],
16
+ userTokenExpirationSeconds: 3600,
14
17
  createdEpochMS: now,
15
18
  updatedEpochMS: now,
16
19
  };
17
20
  }
18
- withTags(tags) {
19
- this._entry.tags = tags ?? [];
21
+ withMeta(value) {
22
+ this._entry.meta = value || [];
23
+ return this;
24
+ }
25
+ withGlobalRoleIds(value) {
26
+ this._entry.globalRoleIds = value || [];
27
+ return this;
28
+ }
29
+ withTeamRoleMappings(value) {
30
+ this._entry.teamRoleMappings = value || [];
20
31
  return this;
21
32
  }
22
33
  withThirdPartyAuthentication(thirdPartyAuthenticators) {
package/lib/server/warden-entry-builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"warden-entry-builder.js","sourceRoot":"","sources":["../../src/server/warden-entry-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAM5E,MAAM,OAAO,kBAAkB;IAEZ,MAAM,CAAc;IAErC,YAAY,KAAc;QACxB,MAAM,IAAI,GAAW,aAAa,CAAC,cAAc,EAAE,CAAC;QACpD,MAAM,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG;YACZ,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,KAAK,IAAI,OAAO,GAAC,IAAI;YAChC,cAAc,EAAE,EAAE;YAClB,IAAI,EAAE,EAAE;YACR,sBAAsB,EAAE,EAAE;YAC1B,wBAAwB,EAAE,EAAE;YAC5B,cAAc,EAAE,GAAG;YACnB,cAAc,EAAE,GAAG;SACpB,CAAC;IACJ,CAAC;IAEM,QAAQ,CAAC,IAAc;QAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,4BAA4B,CAAC,wBAA0D;QAC5F,IAAI,CAAC,MAAM,CAAC,wBAAwB,GAAG,wBAAwB,IAAI,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,SAAS,CAAC,KAAa;QAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,oBAAoB,CAAC,OAAsB;QAChD,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,QAAyB;QAC3C,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,QAAQ,IAAI,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CAEF"}
1
+ {"version":3,"file":"warden-entry-builder.js","sourceRoot":"","sources":["../../src/server/warden-entry-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAQ5E,MAAM,OAAO,kBAAkB;IAEZ,MAAM,CAAc;IAErC,YAAY,KAAc;QACxB,MAAM,IAAI,GAAW,aAAa,CAAC,cAAc,EAAE,CAAC;QACpD,MAAM,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG;YACZ,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,KAAK,IAAI,OAAO,GAAC,IAAI;YAChC,cAAc,EAAE,EAAE;YAClB,sBAAsB,EAAE,EAAE;YAC1B,wBAAwB,EAAE,EAAE;YAE5B,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,EAAE;YACpB,IAAI,EAAE,EAAE;YAER,0BAA0B,EAAE,IAAI;YAChC,cAAc,EAAE,GAAG;YACnB,cAAc,EAAE,GAAG;SACpB,CAAC;IACJ,CAAC;IAEM,QAAQ,CAAC,KAA4B;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,iBAAiB,CAAC,KAAe;QACtC,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,KAAK,IAAI,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,oBAAoB,CAAC,KAA8B;QACxD,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,KAAK,IAAI,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,4BAA4B,CAAC,wBAA0D;QAC5F,IAAI,CAAC,MAAM,CAAC,wBAAwB,GAAG,wBAAwB,IAAI,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,SAAS,CAAC,KAAa;QAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,oBAAoB,CAAC,OAAsB;QAChD,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,QAAyB;QAC3C,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,QAAQ,IAAI,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CAEF"}
package/lib/server/warden-service-options.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { WardenStorageProvider } from './provider/warden-storage-provider.js';
2
2
  import { JwtRatchetLike } from '@bitblit/ratchet-node-only/jwt/jwt-ratchet-like';
3
- import { WardenUserDecorationProvider } from './provider/warden-user-decoration-provider.js';
4
3
  import { WardenEventProcessingProvider } from './provider/warden-event-processing-provider.js';
5
4
  import { WardenSingleUseCodeProvider } from './provider/warden-single-use-code-provider.js';
6
5
  import { WardenSendMagicLinkCommandValidator } from './provider/warden-send-magic-link-command-validator.js';
@@ -11,7 +10,6 @@ export interface WardenServiceOptions {
11
10
  singleUseCodeProviders: WardenSingleUseCodeProvider[];
12
11
  storageProvider: WardenStorageProvider;
13
12
  jwtRatchet: JwtRatchetLike;
14
- userDecorationProvider?: WardenUserDecorationProvider<any>;
15
13
  eventProcessor?: WardenEventProcessingProvider;
16
14
  sendMagicLinkCommandValidator?: WardenSendMagicLinkCommandValidator;
17
15
  thirdPartyAuthenticationProviders?: WardenThirdPartyAuthenticationProvider[];
package/lib/server/warden-service.d.ts CHANGED
@@ -27,7 +27,7 @@ export declare class WardenService {
27
27
  singleUseCodeProvider(contact: WardenContact, requireMagicLinkSupport: boolean, returnNullIfNoProviders?: boolean): WardenSingleUseCodeProvider;
28
28
  sendMagicLink(contact: WardenContact, overrideDestinationContact: WardenContact, relyingPartyName: string, landingUrl: string, metaIn?: Record<string, string>, ttlSeconds?: number, customTemplate?: WardenCustomTemplateDescriptor): Promise<boolean>;
29
29
  createAccountByThirdParty(thirdParty: WardenThirdPartyAuthentication, origin: string, inLabel?: string): Promise<WardenEntry>;
30
- createAccount(contact: WardenContact, origin: string, sendCode?: boolean, label?: string, tags?: string[]): Promise<WardenEntry>;
30
+ createAccount(contact: WardenContact, origin: string, sendCode?: boolean, label?: string): Promise<WardenEntry>;
31
31
  saveNewUser(newUser: WardenEntry): Promise<WardenEntry>;
32
32
  addContactMethodToUser(userId: string, contact: WardenContact): Promise<boolean>;
33
33
  removeContactMethodFromUser(userId: string, contact: WardenContact): Promise<WardenEntry>;
package/lib/server/warden-service.js CHANGED
@@ -6,7 +6,6 @@ import { Logger } from "@bitblit/ratchet-common/logger/logger";
6
6
  import { ErrorRatchet } from "@bitblit/ratchet-common/lang/error-ratchet";
7
7
  import { StringRatchet } from "@bitblit/ratchet-common/lang/string-ratchet";
8
8
  import { Base64Ratchet } from "@bitblit/ratchet-common/lang/base64-ratchet";
9
- import { WardenDefaultUserDecorationProvider } from "./provider/warden-default-user-decoration-provider.js";
10
9
  import { WardenNoOpEventProcessingProvider } from "./provider/warden-no-op-event-processing-provider.js";
11
10
  import { WardenDefaultSendMagicLinkCommandValidator } from "./provider/warden-default-send-magic-link-command-validator.js";
12
11
  import { WardenLoginRequestType } from "@bitblit/ratchet-warden-common/common/model/warden-login-request-type";
@@ -25,7 +24,6 @@ export class WardenService {
25
24
  RequireRatchet.notNullOrUndefined(inOptions.jwtRatchet, "options.jwtRatchet");
26
25
  RequireRatchet.notNullUndefinedOrEmptyArray(inOptions.singleUseCodeProviders, "options.singleUseCodeProviders");
27
26
  this.opts = Object.assign({
28
- userTokenDataProvider: new WardenDefaultUserDecorationProvider(),
29
27
  eventProcessor: new WardenNoOpEventProcessingProvider(),
30
28
  sendMagicLinkCommandValidator: new WardenDefaultSendMagicLinkCommandValidator()
31
29
  }, inOptions);
@@ -74,7 +72,7 @@ export class WardenService {
74
72
  rval = { generateWebAuthnAuthenticationChallengeForUserId: { dataAsJson: JSON.stringify(tmp) } };
75
73
  }
76
74
  else if (cmd.createAccount) {
77
- const newEntry = await this.createAccount(cmd.createAccount.contact, origin, cmd.createAccount.sendCode, cmd.createAccount.label, cmd.createAccount.tags);
75
+ const newEntry = await this.createAccount(cmd.createAccount.contact, origin, cmd.createAccount.sendCode, cmd.createAccount.label);
78
76
  rval = {
79
77
  createAccount: newEntry.userId
80
78
  };
@@ -164,15 +162,11 @@ export class WardenService {
164
162
  const loginData = cmd.performLogin;
165
163
  const user = await this.processLogin(loginData, origin);
166
164
  if (user) {
167
- const decoration = await this.opts.userDecorationProvider.fetchDecoration(user);
168
165
  const wardenToken = {
169
- wardenData: WardenUtils.stripWardenEntryToSummary(user),
170
- user: decoration.userTokenData,
171
- proxy: decoration.proxyUserTokenData,
172
- globalRoleIds: decoration.globalRoleIds,
173
- teamRoleMappings: decoration.teamRoleMappings
166
+ user: WardenUtils.stripWardenEntryToSummary(user),
167
+ proxy: null,
174
168
  };
175
- const jwtToken = await this.opts.jwtRatchet.createTokenString(wardenToken, decoration.userTokenExpirationSeconds);
169
+ const jwtToken = await this.opts.jwtRatchet.createTokenString(wardenToken, user.userTokenExpirationSeconds);
176
170
  const output = {
177
171
  request: loginData,
178
172
  userId: user.userId,
@@ -186,16 +180,12 @@ export class WardenService {
186
180
  }
187
181
  else if (cmd.refreshJwtToken) {
188
182
  const parsed = await this.opts.jwtRatchet.decodeToken(cmd.refreshJwtToken, 1);
189
- const user = await this.opts.storageProvider.findEntryById(parsed.wardenData.userId);
190
- const decoration = await this.opts.userDecorationProvider.fetchDecoration(user);
183
+ const user = await this.opts.storageProvider.findEntryById(parsed.user.userId);
191
184
  const wardenToken = {
192
- wardenData: WardenUtils.stripWardenEntryToSummary(user),
193
- user: decoration.userTokenData,
194
- proxy: decoration.proxyUserTokenData,
195
- globalRoleIds: decoration.globalRoleIds,
196
- teamRoleMappings: decoration.teamRoleMappings
185
+ user: WardenUtils.stripWardenEntryToSummary(user),
186
+ proxy: null,
197
187
  };
198
- const newToken = await this.opts.jwtRatchet.createTokenString(wardenToken, decoration.userTokenExpirationSeconds);
188
+ const newToken = await this.opts.jwtRatchet.createTokenString(wardenToken, user.userTokenExpirationSeconds);
199
189
  rval = {
200
190
  refreshJwtToken: newToken
201
191
  };
@@ -312,14 +302,14 @@ export class WardenService {
312
302
  rval = await this.opts.storageProvider.saveEntry(newUser);
313
303
  return rval;
314
304
  }
315
- async createAccount(contact, origin, sendCode, label, tags) {
305
+ async createAccount(contact, origin, sendCode, label) {
316
306
  let rval = null;
317
307
  if (WardenUtils.validContact(contact)) {
318
308
  const old = await this.opts.storageProvider.findEntryByContact(contact);
319
309
  if (old) {
320
310
  ErrorRatchet.throwFormattedErr("Cannot create - account already exists for %j", contact);
321
311
  }
322
- const newUser = new WardenEntryBuilder(label || contact.value).withContacts([contact]).withTags(tags).entry;
312
+ const newUser = new WardenEntryBuilder(label || contact.value).withContacts([contact]).entry;
323
313
  rval = await this.opts.storageProvider.saveEntry(newUser);
324
314
  if (sendCode) {
325
315
  Logger.info("New user %j created and send requested - sending", rval);
package/lib/server/warden-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"warden-service.js","sourceRoot":"","sources":["../../src/server/warden-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"warden-service.js","sourceRoot":"","sources":["../../src/server/warden-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bitblit/ratchet-warden-server",
3
- "version": "6.0.159",
3
+ "version": "6.1.167-alpha",
4
4
  "description": "Typescript library to simplify using simplewebauthn and secondary auth methods over GraphQL",
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -49,10 +49,10 @@
49
49
  "dependencies": {
50
50
  "@aws-sdk/client-s3": "3.922.0",
51
51
  "@aws-sdk/client-ses": "3.922.0",
52
- "@bitblit/ratchet-aws": "6.0.159",
53
- "@bitblit/ratchet-common": "6.0.159",
54
- "@bitblit/ratchet-node-only": "6.0.159",
55
- "@bitblit/ratchet-warden-common": "6.0.159",
52
+ "@bitblit/ratchet-aws": "6.1.167-alpha",
53
+ "@bitblit/ratchet-common": "6.1.167-alpha",
54
+ "@bitblit/ratchet-node-only": "6.1.167-alpha",
55
+ "@bitblit/ratchet-warden-common": "6.1.167-alpha",
56
56
  "@simplewebauthn/browser": "13.2.2",
57
57
  "@simplewebauthn/server": "13.2.2",
58
58
  "jsonwebtoken": "9.0.3"
@@ -60,9 +60,9 @@
60
60
  "peerDependencies": {
61
61
  "@aws-sdk/client-s3": "^3.922.0",
62
62
  "@aws-sdk/client-ses": "^3.922.0",
63
- "@bitblit/ratchet-aws": "6.0.159",
64
- "@bitblit/ratchet-common": "6.0.159",
65
- "@bitblit/ratchet-warden-common": "6.0.159",
63
+ "@bitblit/ratchet-aws": "6.1.167-alpha",
64
+ "@bitblit/ratchet-common": "6.1.167-alpha",
65
+ "@bitblit/ratchet-warden-common": "6.1.167-alpha",
66
66
  "@simplewebauthn/browser": "^13.2.2",
67
67
  "@simplewebauthn/server": "^13.2.2",
68
68
  "jsonwebtoken": "^9.0.3"
package/src/server/provider/warden-dynamo-storage-provider.ts CHANGED
@@ -10,13 +10,12 @@ import { WardenUtils } from '@bitblit/ratchet-warden-common/common/util/warden-u
10
10
  import { ExpiringCodeProvider } from '@bitblit/ratchet-aws/expiring-code/expiring-code-provider';
11
11
  import { ExpiringCode } from '@bitblit/ratchet-aws/expiring-code/expiring-code';
12
12
  import { WardenStorageProvider } from "./warden-storage-provider.js";
13
- import { WardenUserDecorationProvider } from "./warden-user-decoration-provider.js";
14
- import { WardenUserDecoration } from "@bitblit/ratchet-warden-common/common/model/warden-user-decoration";
15
13
  import { WardenTeamRoleMapping } from "@bitblit/ratchet-warden-common/common/model/warden-team-role-mapping";
14
+ import { WardenEntryMetadata } from "@bitblit/ratchet-warden-common/common/model/warden-entry-metadata";
16
15
 
17
16
 
18
17
  // Create a ddb table with a hashkey of userId type string
19
- export class WardenDynamoStorageProvider<T> implements WardenStorageProvider, ExpiringCodeProvider, WardenUserDecorationProvider<T> {
18
+ export class WardenDynamoStorageProvider<T> implements WardenStorageProvider, ExpiringCodeProvider {
20
19
 
21
20
  private static readonly EXPIRING_CODE_PROVIDER_KEY: string = '__EXPIRING_CODE_DATA';
22
21
 
@@ -26,63 +25,44 @@ export class WardenDynamoStorageProvider<T> implements WardenStorageProvider, Ex
26
25
  ) {
27
26
  }
28
27
 
29
- public createDecoration(decoration: T): WardenUserDecoration<T> {
30
- return {
31
- globalRoleIds: [],
32
- teamRoleMappings: this.options.defaultTeamRoleMappings,
33
- userTokenExpirationSeconds: this.options.defaultTokenExpirationSeconds,
34
- userTokenData: decoration,
35
- proxyUserTokenData: null
36
- };
37
- }
38
-
39
- public async updateRoles(userId: string, roles: WardenTeamRoleMapping[]): Promise<WardenUserDecoration<T>> {
28
+ public async updateRoles(userId: string, roles: WardenTeamRoleMapping[]): Promise<WardenEntry> {
40
29
  const rval: WardenDynamoStorageDataWrapper = await this.fetchInternalByUserId(userId);
41
30
  if (rval) {
42
- rval.decoration ??= this.createDecoration(null);
43
- rval.decoration.teamRoleMappings = roles;
31
+ rval.entry.teamRoleMappings = roles;
44
32
  await this.updateInternal(rval);
45
33
  } else {
46
34
  throw ErrorRatchet.fErr('Cannot update roles - no entry found for %s', userId);
47
35
  }
48
36
 
49
- return this.fetchDecorationById(userId);
37
+ return this.findEntryById(userId);
50
38
  }
51
39
 
52
- public async updateTokenExpirationSeconds(userId: string, newValue: number): Promise<WardenUserDecoration<T>> {
40
+
41
+ public async updateMetaData(userId: string, meta: WardenEntryMetadata): Promise<WardenEntry> {
53
42
  const rval: WardenDynamoStorageDataWrapper = await this.fetchInternalByUserId(userId);
54
43
  if (rval) {
55
- rval.decoration ??= this.createDecoration(null);
56
- rval.decoration.userTokenExpirationSeconds = newValue;
44
+ rval.entry.meta = (rval.entry.meta||[]).filter(s=>s.key!==meta.key);
45
+ rval.entry.meta.push(meta);
57
46
  await this.updateInternal(rval);
58
47
  } else {
59
48
  throw ErrorRatchet.fErr('Cannot update roles - no entry found for %s', userId);
60
49
  }
61
50
 
62
- return this.fetchDecorationById(userId);
51
+ return this.findEntryById(userId);
63
52
  }
64
53
 
65
- public async updateDecoration(userId: string, decoration:T): Promise<WardenUserDecoration<T>> {
54
+ public async removeMetaData(userId: string, metaKey: string): Promise<WardenEntry> {
66
55
  const rval: WardenDynamoStorageDataWrapper = await this.fetchInternalByUserId(userId);
67
56
  if (rval) {
68
- rval.decoration ??= this.createDecoration(null);
69
- rval.decoration.userTokenData = decoration;
57
+ rval.entry.meta = (rval.entry.meta||[]).filter(s=>s.key!==metaKey);
70
58
  await this.updateInternal(rval);
71
59
  } else {
72
60
  throw ErrorRatchet.fErr('Cannot update roles - no entry found for %s', userId);
73
61
  }
74
62
 
75
- return this.fetchDecorationById(userId);
63
+ return this.findEntryById(userId);
76
64
  }
77
65
 
78
- public async fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<T>> {
79
- return this.fetchDecorationById(wardenUser.userId);
80
- }
81
-
82
- public async fetchDecorationById(userId: string): Promise<WardenUserDecoration<T>> {
83
- const rval: WardenDynamoStorageDataWrapper = await this.fetchInternalByUserId(userId);
84
- return rval?.decoration;
85
- }
86
66
 
87
67
  // Sure, this is hackish... but DDB doesn't care, and it allows you to wrap up all the
88
68
  // warden data in a single item
@@ -212,7 +192,8 @@ export class WardenDynamoStorageProvider<T> implements WardenStorageProvider, Ex
212
192
  };
213
193
 
214
194
  const results: WardenDynamoStorageDataWrapper[] = await this.ddb.fullyExecuteScan<WardenDynamoStorageDataWrapper>(scan);
215
- const rval: WardenEntrySummary[] = results.map(wd=>{
195
+ const rval: WardenEntrySummary[] = results.filter(dsw=>dsw.userId!==WardenDynamoStorageProvider.EXPIRING_CODE_PROVIDER_KEY)
196
+ .map(wd=>{
216
197
  return WardenUtils.stripWardenEntryToSummary(wd.entry);
217
198
  })
218
199
  return rval;
@@ -230,7 +211,6 @@ export class WardenDynamoStorageProvider<T> implements WardenStorageProvider, Ex
230
211
  userId: entry.userId,
231
212
  entry: entry,
232
213
  currentUserChallenges: [],
233
- decoration: this.createDecoration(null),
234
214
  contactSearchString: 'ContactSearch: '+(entry.contactMethods || []).map((cm) => WardenDynamoStorageProvider.contactToSearchString(cm)).join(' '),
235
215
  thirdPartySearchString: '3rdPartySearch: '+(entry.thirdPartyAuthenticators || []).map((item) => WardenDynamoStorageProvider.thirdPartyToSearchString(item.thirdParty, item.thirdPartyId)).join(' '),
236
216
  };
@@ -266,7 +246,6 @@ export class WardenDynamoStorageProvider<T> implements WardenStorageProvider, Ex
266
246
  export interface WardenDynamoStorageDataWrapper {
267
247
  userId: string;
268
248
  entry: WardenEntry;
269
- decoration: WardenUserDecoration<any>;
270
249
  currentUserChallenges: string[];
271
250
  contactSearchString: string;
272
251
  thirdPartySearchString: string;
package/src/server/warden-authorizer.ts CHANGED
@@ -2,8 +2,7 @@ import { WardenServiceOptions } from "./warden-service-options.js";
2
2
  import { WardenContact } from "@bitblit/ratchet-warden-common/common/model/warden-contact";
3
3
  import { WardenEntry } from "@bitblit/ratchet-warden-common/common/model/warden-entry";
4
4
  import { WardenUtils } from "@bitblit/ratchet-warden-common/common/util/warden-utils";
5
- import { WardenUserDecoration } from "@bitblit/ratchet-warden-common/common/model/warden-user-decoration";
6
- import { WardenJwtToken } from "@bitblit/ratchet-warden-common/common/model/warden-jwt-token";
5
+ import { WardenEntryCommonData } from "@bitblit/ratchet-warden-common/common/model/warden-entry-common-data";
7
6
 
8
7
  export class WardenAuthorizer {
9
8
 
@@ -20,110 +19,99 @@ export class WardenAuthorizer {
20
19
  return this.opts.storageProvider.findEntryById(userId);
21
20
  }
22
21
 
23
- public async findDecoratorById(userId: string): Promise<WardenUserDecoration<any>> {
24
- const user: WardenEntry = await this.findEntryById(userId);
25
- const rval: WardenUserDecoration<any> = user ? await this.opts.userDecorationProvider.fetchDecoration(user) : null;
26
- return rval;
27
- }
28
-
29
-
30
22
  public async userHasGlobalRoleById(userId: string, roleId: string): Promise<boolean> {
31
- return this.userHasGlobalRole(await this.findDecoratorById(userId), roleId);
23
+ return this.userHasGlobalRole(await this.findEntryById(userId), roleId);
32
24
  }
33
25
 
34
26
  public async userHasRoleOnTeamById(userId: string,teamId: string, roleId: string): Promise<boolean> {
35
- return this.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, [roleId], true);
27
+ return this.userHasRolesOnTeam(await this.findEntryById(userId), teamId, [roleId], true);
36
28
  }
37
29
 
38
30
  public async userHasAtLeastOneGlobalRoleById(userId: string, roleIds: string[]): Promise<boolean> {
39
- return this.userHasGlobalRoles(await this.findDecoratorById(userId), roleIds, false);
31
+ return this.userHasGlobalRoles(await this.findEntryById(userId), roleIds, false);
40
32
  }
41
33
 
42
34
  public async userHasAtLeastOneRoleOnTeamById(userId: string, teamId: string, roleIds: string[]): Promise<boolean> {
43
- return this.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, roleIds, false);
35
+ return this.userHasRolesOnTeam(await this.findEntryById(userId), teamId, roleIds, false);
44
36
  }
45
37
 
46
38
 
47
39
  public async userHasAllGlobalRolesById(userId: string, roleIds: string[]): Promise<boolean> {
48
- return this.userHasGlobalRoles(await this.findDecoratorById(userId), roleIds, true);
40
+ return this.userHasGlobalRoles(await this.findEntryById(userId), roleIds, true);
49
41
  }
50
42
 
51
43
  public async userHasAllRolesOnTeamById(userId: string, teamId: string, roleIds: string[]): Promise<boolean> {
52
- return this.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, roleIds, true);
44
+ return this.userHasRolesOnTeam(await this.findEntryById(userId), teamId, roleIds, true);
53
45
  }
54
46
 
55
47
 
56
48
  public async userHasGlobalRolesById(userId: string, roleIds: string[], combineWithAnd: boolean): Promise<boolean> {
57
- return WardenUtils.userHasGlobalRoles(await this.findDecoratorById(userId), roleIds, combineWithAnd);
49
+ return WardenUtils.userHasGlobalRoles(await this.findEntryById(userId), roleIds, combineWithAnd);
58
50
  }
59
51
 
60
52
  public async userHasRolesOnTeamById(userId: string, teamId: string, roleIds: string[], combineWithAnd: boolean): Promise<boolean> {
61
- return WardenUtils.userHasRolesOnTeam(await this.findDecoratorById(userId), teamId, roleIds, combineWithAnd);
53
+ return WardenUtils.userHasRolesOnTeam(await this.findEntryById(userId), teamId, roleIds, combineWithAnd);
62
54
  }
63
55
 
64
56
  // Just a synonym since that is how some people think
65
57
  public async userIsTeamMemberById(userId: string, teamId: string): Promise<boolean> {
66
- return WardenUtils.userIsTeamMember(await this.findDecoratorById(userId),teamId);
58
+ return WardenUtils.userIsTeamMember(await this.findEntryById(userId),teamId);
67
59
  }
68
60
 
69
61
  public async userHasAnyRoleOnTeamById(userId: string, teamId: string): Promise<boolean> {
70
- return WardenUtils.userHasAnyRoleOnTeam(await this.findDecoratorById(userId),teamId);
62
+ return WardenUtils.userHasAnyRoleOnTeam(await this.findEntryById(userId),teamId);
71
63
  }
72
64
 
73
65
  public async usersTeamMembershipsById(userId: string): Promise<string[]> {
74
- return WardenUtils.usersTeamMemberships(await this.findDecoratorById(userId));
66
+ return WardenUtils.usersTeamMemberships(await this.findEntryById(userId));
75
67
  }
76
68
 
77
69
 
78
70
  // Simple passthrus for convenience
79
- public userHasGlobalRole(user: WardenUserDecoration<any>, roleId: string): boolean {
71
+ public userHasGlobalRole(user: WardenEntryCommonData, roleId: string): boolean {
80
72
  return WardenUtils.userHasGlobalRoles(user, [roleId], true);
81
73
  }
82
74
 
83
- public userHasRoleOnTeam(user: WardenUserDecoration<any>,teamId: string, roleId: string): boolean {
75
+ public userHasRoleOnTeam(user: WardenEntryCommonData,teamId: string, roleId: string): boolean {
84
76
  return WardenUtils.userHasRolesOnTeam(user, teamId, [roleId], true);
85
77
  }
86
78
 
87
- public userHasAtLeastOneGlobalRole(user: WardenUserDecoration<any>, roleIds: string[]): boolean {
79
+ public userHasAtLeastOneGlobalRole(user: WardenEntryCommonData, roleIds: string[]): boolean {
88
80
  return WardenUtils.userHasGlobalRoles(user, roleIds, false);
89
81
  }
90
82
 
91
- public userHasAtLeastOneRoleOnTeam(user: WardenUserDecoration<any>, teamId: string, roleIds: string[]): boolean {
83
+ public userHasAtLeastOneRoleOnTeam(user: WardenEntryCommonData, teamId: string, roleIds: string[]): boolean {
92
84
  return WardenUtils.userHasRolesOnTeam(user, teamId, roleIds, false);
93
85
  }
94
86
 
95
87
 
96
- public userHasAllGlobalRoles(user: WardenUserDecoration<any>, roleIds: string[]): boolean {
88
+ public userHasAllGlobalRoles(user: WardenEntryCommonData, roleIds: string[]): boolean {
97
89
  return WardenUtils.userHasGlobalRoles(user, roleIds, true);
98
90
  }
99
91
 
100
- public userHasAllRolesOnTeam(user: WardenUserDecoration<any>, teamId: string, roleIds: string[]): boolean {
92
+ public userHasAllRolesOnTeam(user: WardenEntryCommonData, teamId: string, roleIds: string[]): boolean {
101
93
  return WardenUtils.userHasRolesOnTeam(user, teamId, roleIds, true);
102
94
  }
103
95
 
104
96
 
105
- public userHasGlobalRoles(user: WardenUserDecoration<any>, roleIds: string[], combineWithAnd: boolean): boolean {
97
+ public userHasGlobalRoles(user: WardenEntryCommonData, roleIds: string[], combineWithAnd: boolean): boolean {
106
98
  return WardenUtils.userHasGlobalRoles(user, roleIds, combineWithAnd);
107
99
  }
108
100
 
109
- public userHasRolesOnTeam(user: WardenUserDecoration<any>, teamId: string, roleIds: string[], combineWithAnd: boolean): boolean {
101
+ public userHasRolesOnTeam(user: WardenEntryCommonData, teamId: string, roleIds: string[], combineWithAnd: boolean): boolean {
110
102
  return WardenUtils.userHasRolesOnTeam(user, teamId, roleIds, combineWithAnd);
111
103
  }
112
104
 
113
- public wardenUserDecorationFromToken(jwt: WardenJwtToken<any>): WardenUserDecoration<any> {
114
- return WardenUtils.wardenUserDecorationFromToken(jwt);
115
- }
116
-
117
105
  // Just a synonym since that is how some people think
118
- public userIsTeamMember(user: WardenUserDecoration<any>, teamId: string): boolean {
106
+ public userIsTeamMember(user: WardenEntryCommonData, teamId: string): boolean {
119
107
  return WardenUtils.userIsTeamMember(user,teamId);
120
108
  }
121
109
 
122
- public userHasAnyRoleOnTeam(user: WardenUserDecoration<any>, teamId: string): boolean {
110
+ public userHasAnyRoleOnTeam(user: WardenEntryCommonData, teamId: string): boolean {
123
111
  return WardenUtils.userHasAnyRoleOnTeam(user,teamId);
124
112
  }
125
113
 
126
- public usersTeamMemberships(user: WardenUserDecoration<any>): string[] {
114
+ public usersTeamMemberships(user: WardenEntryCommonData): string[] {
127
115
  return WardenUtils.usersTeamMemberships(user);
128
116
  }
129
117
 
package/src/server/warden-entry-builder.ts CHANGED
@@ -4,6 +4,8 @@ import { WardenContact } from "@bitblit/ratchet-warden-common/common/model/warde
4
4
  import {
5
5
  WardenThirdPartyAuthentication
6
6
  } from "@bitblit/ratchet-warden-common/common/model/warden-third-party-authentication";
7
+ import { WardenEntryMetadata } from "@bitblit/ratchet-warden-common/common/model/warden-entry-metadata";
8
+ import { WardenTeamRoleMapping } from "@bitblit/ratchet-warden-common/common/model/warden-team-role-mapping";
7
9
 
8
10
  export class WardenEntryBuilder {
9
11
 
@@ -16,16 +18,31 @@ export class WardenEntryBuilder {
16
18
  userId: guid,
17
19
  userLabel: label || 'User '+guid,
18
20
  contactMethods: [],
19
- tags: [],
20
21
  webAuthnAuthenticators: [],
21
22
  thirdPartyAuthenticators: [],
23
+
24
+ globalRoleIds: [],
25
+ teamRoleMappings: [],
26
+ meta: [],
27
+
28
+ userTokenExpirationSeconds: 3600,
22
29
  createdEpochMS: now,
23
30
  updatedEpochMS: now,
24
31
  };
25
32
  }
26
33
 
27
- public withTags(tags: string[]): WardenEntryBuilder {
28
- this._entry.tags = tags ?? [];
34
+ public withMeta(value: WardenEntryMetadata[]): WardenEntryBuilder {
35
+ this._entry.meta = value || [];
36
+ return this;
37
+ }
38
+
39
+ public withGlobalRoleIds(value: string[]): WardenEntryBuilder {
40
+ this._entry.globalRoleIds = value || [];
41
+ return this;
42
+ }
43
+
44
+ public withTeamRoleMappings(value: WardenTeamRoleMapping[]): WardenEntryBuilder {
45
+ this._entry.teamRoleMappings = value || [];
29
46
  return this;
30
47
  }
31
48
 
package/src/server/warden-service-options.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { WardenStorageProvider } from './provider/warden-storage-provider.js';
2
2
  import { JwtRatchetLike } from '@bitblit/ratchet-node-only/jwt/jwt-ratchet-like';
3
- import { WardenUserDecorationProvider } from './provider/warden-user-decoration-provider.js';
4
3
  import { WardenEventProcessingProvider } from './provider/warden-event-processing-provider.js';
5
4
  import { WardenSingleUseCodeProvider } from './provider/warden-single-use-code-provider.js';
6
5
  import { WardenSendMagicLinkCommandValidator } from './provider/warden-send-magic-link-command-validator.js';
@@ -13,7 +12,6 @@ export interface WardenServiceOptions {
13
12
  singleUseCodeProviders: WardenSingleUseCodeProvider[];
14
13
  storageProvider: WardenStorageProvider;
15
14
  jwtRatchet: JwtRatchetLike;
16
- userDecorationProvider?: WardenUserDecorationProvider<any>;
17
15
  eventProcessor?: WardenEventProcessingProvider;
18
16
  sendMagicLinkCommandValidator?: WardenSendMagicLinkCommandValidator;
19
17
  thirdPartyAuthenticationProviders?: WardenThirdPartyAuthenticationProvider[];
package/src/server/warden-service.ts CHANGED
@@ -28,8 +28,6 @@ import { WardenLoginResults } from "@bitblit/ratchet-warden-common/common/model/
28
28
  import {
29
29
  WardenStoreRegistrationResponse
30
30
  } from "@bitblit/ratchet-warden-common/common/model/warden-store-registration-response";
31
- import { WardenUserDecoration } from "@bitblit/ratchet-warden-common/common/model/warden-user-decoration";
32
- import { WardenJwtToken } from "@bitblit/ratchet-warden-common/common/model/warden-jwt-token";
33
31
  import {
34
32
  WardenStoreRegistrationResponseType
35
33
  } from "@bitblit/ratchet-warden-common/common/model/warden-store-registration-response-type";
@@ -42,7 +40,6 @@ import { StringRatchet } from "@bitblit/ratchet-common/lang/string-ratchet";
42
40
  import { Base64Ratchet } from "@bitblit/ratchet-common/lang/base64-ratchet";
43
41
  import { ExpiredJwtHandling } from "@bitblit/ratchet-common/jwt/expired-jwt-handling";
44
42
 
45
- import { WardenDefaultUserDecorationProvider } from "./provider/warden-default-user-decoration-provider.js";
46
43
  import { WardenNoOpEventProcessingProvider } from "./provider/warden-no-op-event-processing-provider.js";
47
44
  import { WardenSingleUseCodeProvider } from "./provider/warden-single-use-code-provider.js";
48
45
  import {
@@ -56,6 +53,8 @@ import { WardenThirdPartyAuthenticationProvider } from "./provider/warden-third-
56
53
  import { WardenEntryBuilder } from "./warden-entry-builder.js";
57
54
  import { WardenAuthorizer } from "./warden-authorizer.ts";
58
55
  import { WardenWebAuthnExportToken } from "./warden-web-authn-export-token.ts";
56
+ import { WardenEntrySummary } from "@bitblit/ratchet-warden-common/common/model/warden-entry-summary";
57
+ import { CommonJwtToken } from "@bitblit/ratchet-common/jwt/common-jwt-token";
59
58
 
60
59
  export class WardenService {
61
60
  private opts: WardenServiceOptions;
@@ -71,7 +70,6 @@ export class WardenService {
71
70
 
72
71
  this.opts = Object.assign(
73
72
  {
74
- userTokenDataProvider: new WardenDefaultUserDecorationProvider(),
75
73
  eventProcessor: new WardenNoOpEventProcessingProvider(),
76
74
  sendMagicLinkCommandValidator: new WardenDefaultSendMagicLinkCommandValidator()
77
75
  },
@@ -137,8 +135,7 @@ export class WardenService {
137
135
  cmd.createAccount.contact,
138
136
  origin,
139
137
  cmd.createAccount.sendCode,
140
- cmd.createAccount.label,
141
- cmd.createAccount.tags
138
+ cmd.createAccount.label
142
139
  );
143
140
  rval = {
144
141
  createAccount: newEntry.userId
@@ -250,15 +247,11 @@ export class WardenService {
250
247
  const loginData: WardenLoginRequest = cmd.performLogin;
251
248
  const user: WardenEntry = await this.processLogin(loginData, origin);
252
249
  if (user) {
253
- const decoration: WardenUserDecoration<any> = await this.opts.userDecorationProvider.fetchDecoration(user);
254
- const wardenToken: WardenJwtToken<any> = {
255
- wardenData: WardenUtils.stripWardenEntryToSummary(user),
256
- user: decoration.userTokenData,
257
- proxy: decoration.proxyUserTokenData,
258
- globalRoleIds: decoration.globalRoleIds,
259
- teamRoleMappings: decoration.teamRoleMappings
250
+ const wardenToken: CommonJwtToken<WardenEntrySummary> = {
251
+ user: WardenUtils.stripWardenEntryToSummary(user),
252
+ proxy: null,
260
253
  };
261
- const jwtToken: string = await this.opts.jwtRatchet.createTokenString(wardenToken, decoration.userTokenExpirationSeconds);
254
+ const jwtToken: string = await this.opts.jwtRatchet.createTokenString(wardenToken, user.userTokenExpirationSeconds);
262
255
  const output: WardenLoginResults = {
263
256
  request: loginData,
264
257
  userId: user.userId,
@@ -269,18 +262,14 @@ export class WardenService {
269
262
  rval = { error: "Login failed" };
270
263
  }
271
264
  } else if (cmd.refreshJwtToken) {
272
- const parsed: WardenJwtToken<any> = await this.opts.jwtRatchet.decodeToken(cmd.refreshJwtToken, ExpiredJwtHandling.THROW_EXCEPTION);
273
- const user: WardenEntry = await this.opts.storageProvider.findEntryById(parsed.wardenData.userId);
274
- const decoration: WardenUserDecoration<any> = await this.opts.userDecorationProvider.fetchDecoration(user);
275
- const wardenToken: WardenJwtToken<any> = {
276
- wardenData: WardenUtils.stripWardenEntryToSummary(user),
277
- user: decoration.userTokenData,
278
- proxy: decoration.proxyUserTokenData,
279
- globalRoleIds: decoration.globalRoleIds,
280
- teamRoleMappings: decoration.teamRoleMappings
265
+ const parsed: CommonJwtToken<WardenEntrySummary> = await this.opts.jwtRatchet.decodeToken(cmd.refreshJwtToken, ExpiredJwtHandling.THROW_EXCEPTION);
266
+ const user: WardenEntry = await this.opts.storageProvider.findEntryById(parsed.user.userId);
267
+ const wardenToken: CommonJwtToken<WardenEntrySummary> = {
268
+ user: WardenUtils.stripWardenEntryToSummary(user),
269
+ proxy: null,
281
270
  };
282
271
 
283
- const newToken: string = await this.opts.jwtRatchet.createTokenString(wardenToken, decoration.userTokenExpirationSeconds);
272
+ const newToken: string = await this.opts.jwtRatchet.createTokenString(wardenToken, user.userTokenExpirationSeconds);
284
273
  // CAW : We do not use refresh token because we want any user changes to show up in the new token
285
274
  //const newToken: string = await this.opts.jwtRatchet.refreshJWTString(cmd.refreshJwtToken, false, expirationSeconds);
286
275
  rval = {
@@ -428,7 +417,7 @@ export class WardenService {
428
417
  }
429
418
 
430
419
  // Creates a new account, returns the userId for that account upon success
431
- public async createAccount(contact: WardenContact, origin: string, sendCode?: boolean, label?: string, tags?: string[]): Promise<WardenEntry> {
420
+ public async createAccount(contact: WardenContact, origin: string, sendCode?: boolean, label?: string): Promise<WardenEntry> {
432
421
  let rval: WardenEntry = null;
433
422
  if (WardenUtils.validContact(contact)) {
434
423
  const old: WardenEntry = await this.opts.storageProvider.findEntryByContact(contact);
@@ -437,7 +426,7 @@ export class WardenService {
437
426
  }
438
427
 
439
428
  // Defaults to email if nothing provided, usually full name
440
- const newUser: WardenEntry = new WardenEntryBuilder(label || contact.value).withContacts([contact]).withTags(tags).entry;
429
+ const newUser: WardenEntry = new WardenEntryBuilder(label || contact.value).withContacts([contact]).entry;
441
430
  rval = await this.opts.storageProvider.saveEntry(newUser);
442
431
 
443
432
  if (sendCode) {
package/lib/server/provider/warden-default-user-decoration-provider.d.ts DELETED
@@ -1,7 +0,0 @@
1
- import { WardenEntrySummary } from '@bitblit/ratchet-warden-common/common/model/warden-entry-summary';
2
- import { WardenEntry } from '@bitblit/ratchet-warden-common/common/model/warden-entry';
3
- import { WardenUserDecoration } from '@bitblit/ratchet-warden-common/common/model/warden-user-decoration';
4
- import { WardenUserDecorationProvider } from './warden-user-decoration-provider.js';
5
- export declare class WardenDefaultUserDecorationProvider implements WardenUserDecorationProvider<WardenEntrySummary> {
6
- fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<WardenEntrySummary>>;
7
- }
package/lib/server/provider/warden-default-user-decoration-provider.js DELETED
@@ -1,14 +0,0 @@
1
- import { WardenUtils } from '@bitblit/ratchet-warden-common/common/util/warden-utils';
2
- export class WardenDefaultUserDecorationProvider {
3
- async fetchDecoration(wardenUser) {
4
- const rval = {
5
- userTokenData: WardenUtils.stripWardenEntryToSummary(wardenUser),
6
- proxyUserTokenData: null,
7
- userTokenExpirationSeconds: 3600,
8
- globalRoleIds: [],
9
- teamRoleMappings: [],
10
- };
11
- return rval;
12
- }
13
- }
14
- //# sourceMappingURL=warden-default-user-decoration-provider.js.map
package/lib/server/provider/warden-default-user-decoration-provider.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"warden-default-user-decoration-provider.js","sourceRoot":"","sources":["../../../src/server/provider/warden-default-user-decoration-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,yDAAyD,CAAC;AAItF,MAAM,OAAO,mCAAmC;IACvC,KAAK,CAAC,eAAe,CAAC,UAAuB;QAElD,MAAM,IAAI,GAA6C;YACrD,aAAa,EAAE,WAAW,CAAC,yBAAyB,CAAC,UAAU,CAAC;YAChE,kBAAkB,EAAE,IAAI;YACxB,0BAA0B,EAAE,IAAI;YAChC,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,EAAE;SACrB,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
package/lib/server/provider/warden-user-decoration-provider.d.ts DELETED
@@ -1,5 +0,0 @@
1
- import { WardenEntry } from '@bitblit/ratchet-warden-common/common/model/warden-entry';
2
- import { WardenUserDecoration } from '@bitblit/ratchet-warden-common/common/model/warden-user-decoration';
3
- export interface WardenUserDecorationProvider<T> {
4
- fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<T>>;
5
- }
package/lib/server/provider/warden-user-decoration-provider.js DELETED
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=warden-user-decoration-provider.js.map
package/lib/server/provider/warden-user-decoration-provider.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"warden-user-decoration-provider.js","sourceRoot":"","sources":["../../../src/server/provider/warden-user-decoration-provider.ts"],"names":[],"mappings":""}
package/src/server/provider/warden-default-user-decoration-provider.ts DELETED
@@ -1,23 +0,0 @@
1
- /**
2
- * The user details gets jammed into the JWT token upon login. If one is not provided,
3
- * the default only puts the WardenEntrySummary in there
4
- */
5
- import { WardenEntrySummary } from '@bitblit/ratchet-warden-common/common/model/warden-entry-summary';
6
- import { WardenEntry } from '@bitblit/ratchet-warden-common/common/model/warden-entry';
7
- import { WardenUtils } from '@bitblit/ratchet-warden-common/common/util/warden-utils';
8
- import { WardenUserDecoration } from '@bitblit/ratchet-warden-common/common/model/warden-user-decoration';
9
- import { WardenUserDecorationProvider } from './warden-user-decoration-provider.js';
10
-
11
- export class WardenDefaultUserDecorationProvider implements WardenUserDecorationProvider<WardenEntrySummary> {
12
- public async fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<WardenEntrySummary>> {
13
- // Default to 1 hour
14
- const rval: WardenUserDecoration<WardenEntrySummary> = {
15
- userTokenData: WardenUtils.stripWardenEntryToSummary(wardenUser),
16
- proxyUserTokenData: null,
17
- userTokenExpirationSeconds: 3600,
18
- globalRoleIds: [],
19
- teamRoleMappings: [],
20
- };
21
- return rval;
22
- }
23
- }
package/src/server/provider/warden-user-decoration-provider.ts DELETED
@@ -1,10 +0,0 @@
1
- /**
2
- * The user details gets jammed into the JWT token upon login. If one is not provided,
3
- * the default only puts the user id and label in there
4
- */
5
- import { WardenEntry } from '@bitblit/ratchet-warden-common/common/model/warden-entry';
6
- import { WardenUserDecoration } from '@bitblit/ratchet-warden-common/common/model/warden-user-decoration';
7
-
8
- export interface WardenUserDecorationProvider<T> {
9
- fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<T>>;
10
- }