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

package/lib/common/util/warden-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"warden-utils.js","sourceRoot":"","sources":["../../../src/common/util/warden-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"warden-utils.js","sourceRoot":"","sources":["../../../src/common/util/warden-utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitblit/ratchet-warden-common",
-  "version": "6.0.159",
+  "version": "6.1.167-alpha",
   "description": "Typescript library to simplify using simplewebauthn and secondary auth methods over GraphQL",
   "sideEffects": false,
   "type": "module",
@@ -47,12 +47,12 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@bitblit/ratchet-common": "6.0.159",
+    "@bitblit/ratchet-common": "6.1.167-alpha",
     "@simplewebauthn/browser": "13.2.2",
     "jwt-decode": "4.0.0"
   },
   "peerDependencies": {
-    "@bitblit/ratchet-common": "^6.0.159",
+    "@bitblit/ratchet-common": "^6.1.167-alpha",
     "@simplewebauthn/browser": "^13.2.2",
     "jwt-decode": "^4.0.0"
   }

package/src/client/provider/warden-client-abstract-recent-login-provider.ts

@@ -33,6 +33,9 @@ export abstract class WardenClientAbstractRecentLoginProvider implements WardenC
         contactMethods: [contact],
         webAuthnAuthenticatorSummaries: [],
         userLabel: label,
+        meta: [],
+        globalRoleIds: [],
+        teamRoleMappings: []
       });
     } else {
       Logger.warn('Cannot save new user - invalid data : %s : %j', userId, contact);

package/src/client/provider/warden-client-storage-based-logged-in-user-provider.ts

@@ -5,7 +5,7 @@ import { RequireRatchet } from "@bitblit/ratchet-common/lang/require-ratchet";
 import { StringRatchet } from "@bitblit/ratchet-common/lang/string-ratchet";
 import { Logger } from "@bitblit/ratchet-common/logger/logger";
 
-export class WardenClientStorageBasedLoggedInUserProvider<T> implements WardenLoggedInUserProvider<T> {
+export class WardenClientStorageBasedLoggedInUserProvider implements WardenLoggedInUserProvider {
 
   constructor(
     private storageProv: Storage | (() => Storage),
@@ -23,11 +23,11 @@ export class WardenClientStorageBasedLoggedInUserProvider<T> implements WardenLo
     }
   }
 
-  public fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper<T> {
+  public fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper {
     const storage: Storage = this.storage;
     if (storage) {
       const asString: string = storage.getItem(this.storageKey);
-      const rval: WardenLoggedInUserWrapper<T> = StringRatchet.trimToNull(asString) ? JSON.parse(asString) : null;
+      const rval: WardenLoggedInUserWrapper = StringRatchet.trimToNull(asString) ? JSON.parse(asString) : null;
       return rval;
     } else {
       Logger.debug('Tried to fetch logged in user before storage ready - returning null');
@@ -39,7 +39,7 @@ export class WardenClientStorageBasedLoggedInUserProvider<T> implements WardenLo
     this.setLoggedInUserWrapper(null);
   }
 
-  public setLoggedInUserWrapper(wrapper: WardenLoggedInUserWrapper<T>) {
+  public setLoggedInUserWrapper(wrapper: WardenLoggedInUserWrapper) {
     const storage: Storage = this.storage;
     if (storage) {
       if (wrapper) {

package/src/client/provider/warden-client-transient-memory-logged-in-user-provider.ts

@@ -1,10 +1,10 @@
 import { WardenLoggedInUserProvider } from "./warden-logged-in-user-provider.js";
 import { WardenLoggedInUserWrapper } from "./warden-logged-in-user-wrapper.js";
 
-export class WardenClientTransientMemoryLoggedInUserProvider<T> implements WardenLoggedInUserProvider<T> {
-  private wrapper: WardenLoggedInUserWrapper<T>;
+export class WardenClientTransientMemoryLoggedInUserProvider<T> implements WardenLoggedInUserProvider {
+  private wrapper: WardenLoggedInUserWrapper;
 
-  public fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper<T> {
+  public fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper {
     return this.wrapper;
   }
 
@@ -12,7 +12,7 @@ export class WardenClientTransientMemoryLoggedInUserProvider<T> implements Warde
     this.wrapper = null;
   }
 
-  public setLoggedInUserWrapper(wrapper: WardenLoggedInUserWrapper<T>) {
+  public setLoggedInUserWrapper(wrapper: WardenLoggedInUserWrapper) {
     this.wrapper = wrapper;
   }
 

package/src/client/provider/warden-logged-in-user-provider.ts

@@ -1,7 +1,7 @@
 import { WardenLoggedInUserWrapper } from "./warden-logged-in-user-wrapper.js";
 
-export interface WardenLoggedInUserProvider<T> {
-  fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper<T>;
-  setLoggedInUserWrapper(wrapper: WardenLoggedInUserWrapper<T>);
+export interface WardenLoggedInUserProvider {
+  fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper;
+  setLoggedInUserWrapper(wrapper: WardenLoggedInUserWrapper);
   logOutUser(): void;
 }

package/src/client/provider/warden-logged-in-user-wrapper.ts

@@ -1,7 +1,8 @@
-import { WardenJwtToken } from '../../common/model/warden-jwt-token.js';
+import { WardenEntrySummary } from "../../common/model/warden-entry-summary.ts";
+import { CommonJwtToken } from "@bitblit/ratchet-common/jwt/common-jwt-token";
 
-export interface WardenLoggedInUserWrapper<T> {
-  userObject: WardenJwtToken<T>;
+export interface WardenLoggedInUserWrapper {
+  userObject: CommonJwtToken<WardenEntrySummary>;
   jwtToken: string;
   expirationEpochSeconds: number;
 }

package/src/client/provider/warden-user-service-event-processing-provider.ts

@@ -4,11 +4,11 @@ import { WardenLoggedInUserWrapper } from './warden-logged-in-user-wrapper.js';
  * Notifies the containing system when significant events happen
  */
 
-export interface WardenUserServiceEventProcessingProvider<T> {
+export interface WardenUserServiceEventProcessingProvider {
   onLogout(): void;
-  onSuccessfulLogin(newUser: WardenLoggedInUserWrapper<T>): void;
+  onSuccessfulLogin(newUser: WardenLoggedInUserWrapper): void;
   onLoginFailure(reason: string): void;
 
-  onAutomaticTokenRefresh(refreshUser: WardenLoggedInUserWrapper<T>): void;
+  onAutomaticTokenRefresh(refreshUser: WardenLoggedInUserWrapper): void;
   onAutomaticLogout(): void;
 }

package/src/client/provider/warden-user-service-options.ts

@@ -3,11 +3,11 @@ import { WardenClient } from '../warden-client.js';
 import { WardenUserServiceEventProcessingProvider } from './warden-user-service-event-processing-provider.js';
 import { WardenClientRecentLoginProvider } from './warden-client-recent-login-provider.js';
 
-export interface WardenUserServiceOptions<T> {
+export interface WardenUserServiceOptions {
   recentLoginProvider?: WardenClientRecentLoginProvider;
-  loggedInUserProvider: WardenLoggedInUserProvider<T>;
+  loggedInUserProvider: WardenLoggedInUserProvider;
   wardenClient: WardenClient;
-  eventProcessor: WardenUserServiceEventProcessingProvider<T>;
+  eventProcessor: WardenUserServiceEventProcessingProvider;
   loginCheckTimerPingSeconds?: number;
   autoLoginHandlingThresholdSeconds?: number;
   allowAutoRefresh?: boolean;

package/src/client/warden-client.ts

@@ -46,13 +46,12 @@ export class WardenClient {
     return parsed;
   }
 
-  public async createAccount(contact: WardenContact, sendCode?: boolean, label?: string, tags?: string[]): Promise<string> {
+  public async createAccount(contact: WardenContact, sendCode?: boolean, label?: string): Promise<string> {
     const cmd: WardenCommand = {
       createAccount: {
         contact: contact,
         sendCode: sendCode,
-        label: label,
-        tags: tags,
+        label: label
       },
     };
     const rval: WardenCommandResponse = await this.exchangeCommand(cmd);

package/src/client/warden-delegating-current-user-providing-user-service-event-processing-provider.ts

@@ -18,18 +18,18 @@ import { Logger } from '@bitblit/ratchet-common/logger/logger';
  * By default this will never serve expired credentials - if a call is made, and the credentials found are
  * expired, they will be cleared and null will be returned
  */
-export class WardenDelegatingCurrentUserProvidingUserServiceEventProcessingProvider<T>
-  implements WardenUserServiceEventProcessingProvider<T>, WardenClientCurrentLoggedInJwtTokenProvider
+export class WardenDelegatingCurrentUserProvidingUserServiceEventProcessingProvider
+  implements WardenUserServiceEventProcessingProvider, WardenClientCurrentLoggedInJwtTokenProvider
 {
-  private _currentUserSubject: BehaviorSubject<WardenLoggedInUserWrapper<T>> = new BehaviorSubject<WardenLoggedInUserWrapper<T>>(null);
+  private _currentUserSubject: BehaviorSubject<WardenLoggedInUserWrapper> = new BehaviorSubject<WardenLoggedInUserWrapper>(null);
 
   constructor(
-    private wrapped?: Partial<WardenUserServiceEventProcessingProvider<T>>,
+    private wrapped?: Partial<WardenUserServiceEventProcessingProvider>,
     private serveExpiredCredentials: boolean = false,
   ) {}
 
   public fetchCurrentLoggedInJwtToken(): string {
-    let val: WardenLoggedInUserWrapper<T> = this?._currentUserSubject?.getValue();
+    let val: WardenLoggedInUserWrapper = this?._currentUserSubject?.getValue();
     if (!this.serveExpiredCredentials && val && WardenUtils.wrapperIsExpired(val)) {
       Logger.info('Current wrapper in the subject is expired - autostripping');
       this.currentUserSubject.next(null);
@@ -38,7 +38,7 @@ export class WardenDelegatingCurrentUserProvidingUserServiceEventProcessingProvi
     return val?.jwtToken;
   }
 
-  public get currentUserSubject(): BehaviorSubject<WardenLoggedInUserWrapper<T>> {
+  public get currentUserSubject(): BehaviorSubject<WardenLoggedInUserWrapper> {
     return this._currentUserSubject;
   }
 
@@ -48,7 +48,7 @@ export class WardenDelegatingCurrentUserProvidingUserServiceEventProcessingProvi
     }
   }
 
-  public onAutomaticTokenRefresh(refreshUser: WardenLoggedInUserWrapper<T>): void {
+  public onAutomaticTokenRefresh(refreshUser: WardenLoggedInUserWrapper): void {
     if (this?.wrapped?.onAutomaticTokenRefresh) {
       this.wrapped.onAutomaticTokenRefresh(refreshUser);
     }
@@ -67,7 +67,7 @@ export class WardenDelegatingCurrentUserProvidingUserServiceEventProcessingProvi
     this.currentUserSubject.next(null);
   }
 
-  public onSuccessfulLogin(newUser: WardenLoggedInUserWrapper<T>): void {
+  public onSuccessfulLogin(newUser: WardenLoggedInUserWrapper): void {
     if (this?.wrapped?.onSuccessfulLogin) {
       this.wrapped.onSuccessfulLogin(newUser);
     }

package/src/client/warden-user-service.spec.ts

@@ -11,18 +11,18 @@ import { mock } from 'vitest-mock-extended';
 describe('#wardenUserService', function () {
   // Currently disabled because this seems to hang forever on github actions (2023-03-20)
   test('should instantiate', async () => {
-    const wuso: WardenUserServiceOptions<any> = {
+    const wuso: WardenUserServiceOptions = {
       recentLoginProvider: mock<WardenClientRecentLoginProvider>(),
-      loggedInUserProvider: mock<WardenLoggedInUserProvider<any>>(),
+      loggedInUserProvider: mock<WardenLoggedInUserProvider>(),
       wardenClient: mock<WardenClient>(),
-      eventProcessor: mock<WardenUserServiceEventProcessingProvider<any>>(),
+      eventProcessor: mock<WardenUserServiceEventProcessingProvider>(),
       loginCheckTimerPingSeconds: 60,
       autoLoginHandlingThresholdSeconds: 60,
       allowAutoRefresh: true,
       applicationName: 'TEST-APP',
     };
 
-    const wus: WardenUserService<any> = new WardenUserService<any>(wuso);
+    const wus: WardenUserService = new WardenUserService(wuso);
     expect(wus).not.toBeNull();
     wus.cleanShutDown();
   });

package/src/client/warden-user-service.ts

@@ -5,7 +5,6 @@ import { Subscription, timer } from "rxjs";
 import { WardenUserServiceOptions } from "./provider/warden-user-service-options.js";
 import { WardenLoggedInUserWrapper } from "./provider/warden-logged-in-user-wrapper.js";
 import { WardenContact } from "../common/model/warden-contact.js";
-import { WardenJwtToken } from "../common/model/warden-jwt-token.js";
 import { WardenLoginResults } from "../common/model/warden-login-results.js";
 import { WardenLoginRequest } from "../common/model/warden-login-request.js";
 
@@ -22,25 +21,22 @@ import { WardenEntrySummary } from "../common/model/warden-entry-summary.js";
 import { WardenUtils } from "../common/util/warden-utils.js";
 import { WardenLoginRequestType } from "../common/model/warden-login-request-type";
 import { WardenTeamRoleMapping } from "../common/model/warden-team-role-mapping.ts";
-import { WardenUserDecoration } from "../common/model/warden-user-decoration.ts";
-import { WardenCommand } from "../common/command/warden-command.ts";
-import { WardenCommandResponse } from "../common/command/warden-command-response.ts";
+import { CommonJwtToken } from "@bitblit/ratchet-common/jwt/common-jwt-token";
 
 /**
  * A service that handles logging in, saving the current user, watching
  * for expiration, auto-refreshing the token, wrapped around a
  * warden-client.
  *
- * T is the type of user object contained in the
  */
-export class WardenUserService<T> {
+export class WardenUserService {
   private loggedInTimerSubscription: Subscription;
   private _autoRefreshEnabled: boolean = false;
 
-  constructor(private options: WardenUserServiceOptions<T>) {
+  constructor(private options: WardenUserServiceOptions) {
     Logger.info('Initializing user service');
     // Immediately read from storage if there is something there
-    const stored: WardenLoggedInUserWrapper<T> = this.options.loggedInUserProvider.fetchLoggedInUserWrapper();
+    const stored: WardenLoggedInUserWrapper = this.options.loggedInUserProvider.fetchLoggedInUserWrapper();
     if (WardenUtils.wrapperIsExpired(stored)) {
       // Not treating this as a logout since it basically never logged in, just clearing it
       Logger.info('Stored token is expired, removing it');
@@ -60,12 +56,12 @@ export class WardenUserService<T> {
     }
   }
 
-  public get serviceOptions(): WardenUserServiceOptions<T> {
+  public get serviceOptions(): WardenUserServiceOptions {
     return this.options;
   }
 
-  public async createAccount(contact: WardenContact, sendCode?: boolean, label?: string, tags?: string[]): Promise<string> {
-    const rval: string = await this.options.wardenClient.createAccount(contact, sendCode, label, tags);
+  public async createAccount(contact: WardenContact, sendCode?: boolean, label?: string): Promise<string> {
+    const rval: string = await this.options.wardenClient.createAccount(contact, sendCode, label);
 
     if (this.options.recentLoginProvider && StringRatchet.trimToNull(rval)) {
       this.options.recentLoginProvider.saveNewUser(rval, label, contact);
@@ -97,14 +93,14 @@ export class WardenUserService<T> {
   public async checkForAutoLogoutOrRefresh(t: number): Promise<void> {
     Logger.debug('Checking for auto-logout or refresh : %s', t);
     // This code will cause an auto-logout if the token is already expired, but not if it is CLOSE to expiration
-    const current: WardenLoggedInUserWrapper<T> = this.fetchLoggedInUserWrapper();
+    const current: WardenLoggedInUserWrapper = this.fetchLoggedInUserWrapper();
     if (current) {
       const thresholdSeconds: number = this.options.autoLoginHandlingThresholdSeconds || 10; // Default to 10 seconds
       const secondsLeft: number = current.expirationEpochSeconds - Math.floor(Date.now() / 1000);
       if (secondsLeft < thresholdSeconds) {
         if (this.autoRefreshEnabled) {
           Logger.info('Under threshold, initiating auto-refresh');
-          const result: WardenLoggedInUserWrapper<T> = await this.refreshToken();
+          const result: WardenLoggedInUserWrapper = await this.refreshToken();
           this.options.eventProcessor.onAutomaticTokenRefresh(result);
         } else {
           Logger.info('Under threshold, initiating auto-logout');
@@ -120,13 +116,13 @@ export class WardenUserService<T> {
   }
 
   public fetchLoggedInUserId(): string {
-    const tmp: WardenLoggedInUserWrapper<T> = this.options.loggedInUserProvider.fetchLoggedInUserWrapper();
-    const rval: string = tmp?.userObject?.wardenData?.userId;
+    const tmp: WardenLoggedInUserWrapper = this.options.loggedInUserProvider.fetchLoggedInUserWrapper();
+    const rval: string = tmp?.userObject?.user?.userId;
     return rval;
   }
 
-  public fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper<T> {
-    let tmp: WardenLoggedInUserWrapper<T> = this.options.loggedInUserProvider.fetchLoggedInUserWrapper();
+  public fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper {
+    let tmp: WardenLoggedInUserWrapper = this.options.loggedInUserProvider.fetchLoggedInUserWrapper();
     if (tmp) {
       if (WardenUtils.wrapperIsExpired(tmp)) {
         // This is belt-and-suspenders for when the window was not open - during normal operation either
@@ -142,8 +138,8 @@ export class WardenUserService<T> {
   public loggedInUserHasGlobalRole(roleId: string): boolean {
     let rval: boolean = false;
 
-    const token: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
-    rval = token ? WardenUtils.userHasGlobalRole(WardenUtils.wardenUserDecorationFromToken(token), roleId) : false;
+    const token: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
+    rval = token ? WardenUtils.userHasGlobalRole(token.user, roleId) : false;
 
     return rval;
   }
@@ -151,66 +147,66 @@ export class WardenUserService<T> {
   public loggedInUserHasRoleOnTeam(teamId: string, roleId: string): boolean {
     let rval: boolean = false;
 
-    const token: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
-    rval = token ? WardenUtils.userHasRoleOnTeam(WardenUtils.wardenUserDecorationFromToken(token), teamId, roleId) : false;
+    const token: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
+    rval = token ? WardenUtils.userHasRoleOnTeam(token.user, teamId, roleId) : false;
 
     return rval;
   }
 
   public isLoggedIn(): boolean {
-    const t: WardenLoggedInUserWrapper<T> = this.fetchLoggedInUserWrapper();
+    const t: WardenLoggedInUserWrapper = this.fetchLoggedInUserWrapper();
     return !!t;
   }
 
-  public fetchLoggedInUserJwtObject(): WardenJwtToken<T> {
-    const t: WardenLoggedInUserWrapper<T> = this.fetchLoggedInUserWrapper();
+  public fetchLoggedInUserJwtObject(): CommonJwtToken<WardenEntrySummary> {
+    const t: WardenLoggedInUserWrapper = this.fetchLoggedInUserWrapper();
     return t ? t.userObject : null;
   }
 
   public fetchLoggedInUserJwtToken(): string {
-    const t: WardenLoggedInUserWrapper<T> = this.fetchLoggedInUserWrapper();
+    const t: WardenLoggedInUserWrapper = this.fetchLoggedInUserWrapper();
     return t ? t.jwtToken : null;
   }
 
-  public fetchLoggedInUserObject(): T {
-    const t: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
+  public fetchLoggedInUserObject(): WardenEntrySummary {
+    const t: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
     return t?.user;
   }
 
-  public fetchLoggedInProxyObject(): T {
-    const t: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
+  public fetchLoggedInProxyObject(): WardenEntrySummary {
+    const t: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
     return t?.proxy;
   }
 
   public fetchLoggedInGlobalRoleIds(): string[] {
-    const t: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
-    return t?.globalRoleIds;
+    const t: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
+    return t?.user?.globalRoleIds;
   }
 
   public fetchLoggedInTeamRoleMappingsGlobalRoleIds(): WardenTeamRoleMapping[] {
-    const t: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
-    return t?.teamRoleMappings;
+    const t: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
+    return t?.user?.teamRoleMappings;
   }
 
   public fetchLoggedInUserExpirationEpochSeconds(): number {
-    const t: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
+    const t: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
     return t ? t.exp : null;
   }
 
   public fetchLoggedInUserRemainingSeconds(): number {
-    const t: WardenJwtToken<T> = this.fetchLoggedInUserJwtObject();
+    const t: CommonJwtToken<WardenEntrySummary> = this.fetchLoggedInUserJwtObject();
     return t ? t.exp - Math.floor(Date.now() / 1000) : null;
   }
 
-  private async updateLoggedInUserFromTokenString(token: string): Promise<WardenLoggedInUserWrapper<T>> {
-    let rval: WardenLoggedInUserWrapper<T> = null;
+  private async updateLoggedInUserFromTokenString(token: string): Promise<WardenLoggedInUserWrapper> {
+    let rval: WardenLoggedInUserWrapper = null;
     if (!StringRatchet.trimToNull(token)) {
       Logger.info('Called updateLoggedInUserFromTokenString with empty string - logging out');
       this.logout();
     } else {
       Logger.info('updateLoggedInUserFromTokenString : %s', token);
 
-      const parsed: WardenJwtToken<T> = JwtDecodeOnlyRatchet.decodeTokenNoVerify<WardenJwtToken<T>>(token);
+      const parsed: CommonJwtToken<WardenEntrySummary> = JwtDecodeOnlyRatchet.decodeTokenNoVerify<CommonJwtToken<WardenEntrySummary>>(token);
       if (parsed) {
         rval = {
           userObject: parsed,
@@ -218,7 +214,7 @@ export class WardenUserService<T> {
           expirationEpochSeconds: parsed.exp,
         };
         this.options.loggedInUserProvider.setLoggedInUserWrapper(rval);
-        this.updateRecentLoginsFromWardenEntrySummary(parsed.wardenData); // In case we have a recent logins tracker
+        this.updateRecentLoginsFromWardenEntrySummary(parsed.user); // In case we have a recent logins tracker
         this.options.eventProcessor.onSuccessfulLogin(rval);
       } else {
         Logger.warn('Failed to parse token %s - ignoring login and triggering failure');
@@ -228,9 +224,9 @@ export class WardenUserService<T> {
     return rval;
   }
 
-  public async refreshToken(): Promise<WardenLoggedInUserWrapper<T>> {
-    let rval: WardenLoggedInUserWrapper<T> = null;
-    const currentWrapper: WardenLoggedInUserWrapper<T> = this.fetchLoggedInUserWrapper();
+  public async refreshToken(): Promise<WardenLoggedInUserWrapper> {
+    let rval: WardenLoggedInUserWrapper = null;
+    const currentWrapper: WardenLoggedInUserWrapper = this.fetchLoggedInUserWrapper();
     if (!currentWrapper) {
       Logger.info('Could not refresh - no token available');
     } else {
@@ -245,8 +241,8 @@ export class WardenUserService<T> {
     return this.options.wardenClient.sendExpiringValidationToken(contact);
   }
 
-  private async processWardenLoginResults(resp: WardenLoginResults): Promise<WardenLoggedInUserWrapper<T>> {
-    let rval: WardenLoggedInUserWrapper<T> = null;
+  private async processWardenLoginResults(resp: WardenLoginResults): Promise<WardenLoggedInUserWrapper> {
+    let rval: WardenLoggedInUserWrapper = null;
     if (resp) {
       Logger.info('Warden: response : %j ', resp);
       if (resp.jwtToken) {
@@ -275,13 +271,13 @@ export class WardenUserService<T> {
     }
   }
 
-  private updateRecentLoginsFromLoggedInUserWrapper(res: WardenLoggedInUserWrapper<T>): void {
-    this.updateRecentLoginsFromWardenEntrySummary(res?.userObject?.wardenData);
+  private updateRecentLoginsFromLoggedInUserWrapper(res: WardenLoggedInUserWrapper): void {
+    this.updateRecentLoginsFromWardenEntrySummary(res?.userObject?.user);
   }
 
-  public async executeWebAuthnBasedLogin(userId: string): Promise<WardenLoggedInUserWrapper<T>> {
+  public async executeWebAuthnBasedLogin(userId: string): Promise<WardenLoggedInUserWrapper> {
     const resp: WardenLoginResults = await this.executeWebAuthnLoginToWardenLoginResults(userId);
-    const rval: WardenLoggedInUserWrapper<T> = await this.processWardenLoginResults(resp);
+    const rval: WardenLoggedInUserWrapper = await this.processWardenLoginResults(resp);
     this.updateRecentLoginsFromLoggedInUserWrapper(rval);
     return rval;
   }
@@ -300,7 +296,7 @@ export class WardenUserService<T> {
     contact: WardenContact,
     token: string,
     createUserIfMissing?: boolean,
-  ): Promise<WardenLoggedInUserWrapper<T>> {
+  ): Promise<WardenLoggedInUserWrapper> {
     Logger.info('Warden: executeValidationTokenBasedLogin : %j : %s : %s', contact, token, createUserIfMissing);
     const resp: WardenLoginResults = await this.options.wardenClient.performLoginCmd({
       type: WardenLoginRequestType.ExpiringToken,
@@ -308,7 +304,7 @@ export class WardenUserService<T> {
       expiringToken: token,
       createUserIfMissing: createUserIfMissing,
     });
-    const rval: WardenLoggedInUserWrapper<T> = await this.processWardenLoginResults(resp);
+    const rval: WardenLoggedInUserWrapper = await this.processWardenLoginResults(resp);
     this.updateRecentLoginsFromLoggedInUserWrapper(rval);
     return rval;
   }
@@ -317,7 +313,7 @@ export class WardenUserService<T> {
     thirdParty: string,
     token: string,
     createUserIfMissing?: boolean,
-  ): Promise<WardenLoggedInUserWrapper<T>> {
+  ): Promise<WardenLoggedInUserWrapper> {
     Logger.info('Warden: executeThirdPartyTokenBasedLogin : %j : %s : %s', thirdParty, token, createUserIfMissing);
     const resp: WardenLoginResults = await this.options.wardenClient.performLoginCmd({
       type: WardenLoginRequestType.ThirdParty,
@@ -327,7 +323,7 @@ export class WardenUserService<T> {
       },
       createUserIfMissing: createUserIfMissing,
     });
-    const rval: WardenLoggedInUserWrapper<T> = await this.processWardenLoginResults(resp);
+    const rval: WardenLoggedInUserWrapper = await this.processWardenLoginResults(resp);
     this.updateRecentLoginsFromLoggedInUserWrapper(rval);
     return rval;
   }

package/src/common/command/create-account.ts

@@ -4,5 +4,4 @@ export interface CreateAccount {
   contact: WardenContact;
   sendCode?: boolean;
   label?: string;
-  tags?: string[];
 }

package/src/common/model/warden-entry-common-data.ts

@@ -0,0 +1,13 @@
+import { WardenTeamRoleMapping } from "./warden-team-role-mapping.ts";
+import { WardenContact } from "./warden-contact.ts";
+import { WardenEntryMetadata } from "./warden-entry-metadata.ts";
+
+export interface WardenEntryCommonData {
+  userId: string;
+  userLabel: string; // Usually full name, could be something else
+  contactMethods: WardenContact[];
+  meta: WardenEntryMetadata[];
+
+  globalRoleIds: string[];
+  teamRoleMappings: WardenTeamRoleMapping[];
+}

package/src/common/model/warden-entry-metadata-type.ts

@@ -0,0 +1,4 @@
+export enum WardenEntryMetadataType {
+  Shared = 'Shared',
+  ServerSide = 'ServerSide',
+}

package/src/common/model/warden-entry-metadata.ts

@@ -0,0 +1,7 @@
+import { WardenEntryMetadataType } from "./warden-entry-metadata-type.ts";
+
+export interface WardenEntryMetadata {
+  key: string;
+  value: string;
+  type: WardenEntryMetadataType;
+}

package/src/common/model/warden-entry-summary.ts

@@ -1,9 +1,6 @@
-import { WardenContact } from './warden-contact.js';
-import { WardenWebAuthnEntrySummary } from './warden-web-authn-entry-summary.js';
+import { WardenWebAuthnEntrySummary } from "./warden-web-authn-entry-summary.js";
+import { WardenEntryCommonData } from "./warden-entry-common-data.ts";
 
-export interface WardenEntrySummary {
-  userId: string;
-  userLabel: string; // Usually full name, could be something else
-  contactMethods: WardenContact[];
+export interface WardenEntrySummary extends WardenEntryCommonData {
   webAuthnAuthenticatorSummaries: WardenWebAuthnEntrySummary[];
 }

package/src/common/model/warden-entry.ts

@@ -1,14 +1,13 @@
-import { WardenWebAuthnEntry } from './warden-web-authn-entry.js';
-import { WardenContact } from './warden-contact.js';
+import { WardenWebAuthnEntry } from "./warden-web-authn-entry.js";
 import { WardenThirdPartyAuthentication } from "./warden-third-party-authentication.js";
+import { WardenEntryCommonData } from "./warden-entry-common-data.ts";
 
-export interface WardenEntry {
-  userId: string;
-  userLabel: string; // Usually full name, could be something else
-  contactMethods: WardenContact[];
-  tags: string[];
+export interface WardenEntry extends WardenEntryCommonData{
   webAuthnAuthenticators: WardenWebAuthnEntry[];
   thirdPartyAuthenticators: WardenThirdPartyAuthentication[];
+
+  userTokenExpirationSeconds: number;
+
   createdEpochMS: number;
   updatedEpochMS: number;
 }