@bitblit/ratchet-warden-common 4.0.99-alpha → 4.0.103-alpha

package/{dist/types → lib}/build/ratchet-warden-common-info.d.ts

@@ -1,4 +1,4 @@
-import { BuildInformation } from '@bitblit/ratchet-common';
+import { BuildInformation } from '@bitblit/ratchet-common/lib/build/build-information.js';
 export declare class RatchetWardenCommonInfo {
     private constructor();
     static buildInformation(): BuildInformation;

package/{dist/types → lib}/client/provider/warden-client-abstract-recent-login-provider.d.ts

@@ -1,7 +1,7 @@
-import { WardenClientRecentLoginProvider } from './warden-client-recent-login-provider';
-import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor';
-import { WardenEntrySummary } from '../../common/model/warden-entry-summary';
-import { WardenContact } from '../../common/model/warden-contact';
+import { WardenClientRecentLoginProvider } from './warden-client-recent-login-provider.js';
+import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor.js';
+import { WardenEntrySummary } from '../../common/model/warden-entry-summary.js';
+import { WardenContact } from '../../common/model/warden-contact.js';
 export declare abstract class WardenClientAbstractRecentLoginProvider implements WardenClientRecentLoginProvider {
     abstract fetchCache(): WardenRecentLoginDescriptor[];
     abstract updateCache(newValue: WardenRecentLoginDescriptor[]): any;

package/{dist/es → lib}/client/provider/warden-client-abstract-recent-login-provider.js

@@ -1,5 +1,6 @@
-import { Logger, StringRatchet } from '@bitblit/ratchet-common';
-import { WardenUtils } from '../../common/util/warden-utils';
+import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
+import { WardenUtils } from '../../common/util/warden-utils.js';
 export class WardenClientAbstractRecentLoginProvider {
     saveRecentLogin(entry) {
         if (entry?.userId) {

package/{dist/types → lib}/client/provider/warden-client-local-storage-logged-in-user-provider.d.ts

@@ -1,5 +1,5 @@
-import { WardenLoggedInUserProvider } from './warden-logged-in-user-provider';
-import { WardenLoggedInUserWrapper } from './warden-logged-in-user-wrapper';
+import { WardenLoggedInUserProvider } from './warden-logged-in-user-provider.js';
+import { WardenLoggedInUserWrapper } from './warden-logged-in-user-wrapper.js';
 export declare class WardenClientLocalStorageLoggedInUserProvider<T> implements WardenLoggedInUserProvider<T> {
     private localStorageKey;
     constructor(localStorageKey: string);

package/{dist/es → lib}/client/provider/warden-client-local-storage-logged-in-user-provider.js

@@ -1,5 +1,8 @@
-import { ErrorRatchet, RequireRatchet, StringRatchet } from '@bitblit/ratchet-common';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
+import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
 export class WardenClientLocalStorageLoggedInUserProvider {
+    localStorageKey;
     constructor(localStorageKey) {
         this.localStorageKey = localStorageKey;
         RequireRatchet.notNullUndefinedOrOnlyWhitespaceString(this.localStorageKey, 'localStorageKey');

package/{dist/types → lib}/client/provider/warden-client-local-storage-recent-login-provider.d.ts

@@ -1,5 +1,5 @@
-import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor';
-import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider';
+import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor.js';
+import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider.js';
 export declare class WardenClientLocalStorageRecentLoginProvider extends WardenClientAbstractRecentLoginProvider {
     private localStorageKey;
     constructor(localStorageKey: string);

package/{dist/es → lib}/client/provider/warden-client-local-storage-recent-login-provider.js

@@ -1,6 +1,9 @@
-import { ErrorRatchet, RequireRatchet, StringRatchet } from '@bitblit/ratchet-common';
-import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
+import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
+import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider.js';
 export class WardenClientLocalStorageRecentLoginProvider extends WardenClientAbstractRecentLoginProvider {
+    localStorageKey;
     constructor(localStorageKey) {
         super();
         this.localStorageKey = localStorageKey;

package/{dist/types → lib}/client/provider/warden-client-recent-login-provider.d.ts

@@ -1,6 +1,6 @@
-import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor';
-import { WardenEntrySummary } from '../../common/model/warden-entry-summary';
-import { WardenContact } from '../../common/model/warden-contact';
+import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor.js';
+import { WardenEntrySummary } from '../../common/model/warden-entry-summary.js';
+import { WardenContact } from '../../common/model/warden-contact.js';
 export interface WardenClientRecentLoginProvider {
     saveRecentLogin(entry: WardenEntrySummary): void;
     saveNewUser(userId: string, label: string, contact: WardenContact): void;

package/{dist/types → lib}/client/provider/warden-client-transient-memory-logged-in-user-provider.d.ts

@@ -1,5 +1,5 @@
-import { WardenLoggedInUserProvider } from './warden-logged-in-user-provider';
-import { WardenLoggedInUserWrapper } from './warden-logged-in-user-wrapper';
+import { WardenLoggedInUserProvider } from './warden-logged-in-user-provider.js';
+import { WardenLoggedInUserWrapper } from './warden-logged-in-user-wrapper.js';
 export declare class WardenClientTransientMemoryLoggedInUserProvider<T> implements WardenLoggedInUserProvider<T> {
     private wrapper;
     fetchLoggedInUserWrapper(): WardenLoggedInUserWrapper<T>;

package/{dist/es → lib}/client/provider/warden-client-transient-memory-logged-in-user-provider.js

@@ -1,4 +1,5 @@
 export class WardenClientTransientMemoryLoggedInUserProvider {
+    wrapper;
     fetchLoggedInUserWrapper() {
         return this.wrapper;
     }

package/{dist/types → lib}/client/provider/warden-client-transient-memory-recent-login-provider.d.ts

@@ -1,5 +1,5 @@
-import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor';
-import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider';
+import { WardenRecentLoginDescriptor } from './warden-recent-login-descriptor.js';
+import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider.js';
 export declare class WardenClientTransientMemoryRecentLoginProvider extends WardenClientAbstractRecentLoginProvider {
     private _cache;
     fetchCache(): WardenRecentLoginDescriptor[];

package/{dist/es → lib}/client/provider/warden-client-transient-memory-recent-login-provider.js

@@ -1,9 +1,6 @@
-import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider';
+import { WardenClientAbstractRecentLoginProvider } from './warden-client-abstract-recent-login-provider.js';
 export class WardenClientTransientMemoryRecentLoginProvider extends WardenClientAbstractRecentLoginProvider {
-    constructor() {
-        super(...arguments);
-        this._cache = [];
-    }
+    _cache = [];
     fetchCache() {
         return this._cache;
     }

package/{dist/types → lib}/client/provider/warden-command-exchange-provider.d.ts

@@ -1,7 +1,3 @@
-/**
- * Classes implementing WardenMessageSendingProvider are able to
- * send expiring, single
- */
 export interface WardenCommandExchangeProvider {
     sendCommand(cmdString: string, jwtToken: string): Promise<string>;
 }

package/{dist/types → lib}/client/provider/warden-logged-in-user-provider.d.ts

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

package/{dist/types → lib}/client/provider/warden-logged-in-user-wrapper.d.ts

@@ -1,4 +1,4 @@
-import { WardenJwtToken } from '../../common/model/warden-jwt-token';
+import { WardenJwtToken } from '../../common/model/warden-jwt-token.js';
 export interface WardenLoggedInUserWrapper<T> {
     userObject: WardenJwtToken<T>;
     jwtToken: string;

package/{dist/types → lib}/client/provider/warden-recent-login-descriptor.d.ts

@@ -1,4 +1,4 @@
-import { WardenEntrySummary } from '../../common/model/warden-entry-summary';
+import { WardenEntrySummary } from '../../common/model/warden-entry-summary.js';
 export interface WardenRecentLoginDescriptor {
     user: WardenEntrySummary;
     lastLoginEpochMS: number;

package/{dist/types → lib}/client/provider/warden-user-service-event-processing-provider.d.ts

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

package/{dist/types → lib}/client/provider/warden-user-service-options.d.ts

@@ -1,7 +1,7 @@
-import { WardenLoggedInUserProvider } from './warden-logged-in-user-provider';
-import { WardenClient } from '../warden-client';
-import { WardenUserServiceEventProcessingProvider } from './warden-user-service-event-processing-provider';
-import { WardenClientRecentLoginProvider } from './warden-client-recent-login-provider';
+import { WardenLoggedInUserProvider } from './warden-logged-in-user-provider.js';
+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> {
     recentLoginProvider?: WardenClientRecentLoginProvider;
     loggedInUserProvider: WardenLoggedInUserProvider<T>;

package/{dist/types → lib}/client/warden-client.d.ts

@@ -1,12 +1,12 @@
-import { WardenCommand } from '../common/command/warden-command';
-import { WardenContact } from '../common/model/warden-contact';
-import { WardenCommandExchangeProvider } from './provider/warden-command-exchange-provider';
-import { WardenCommandResponse } from '../common/command/warden-command-response';
+import { WardenCommand } from '../common/command/warden-command.js';
+import { WardenContact } from '../common/model/warden-contact.js';
+import { WardenCommandExchangeProvider } from './provider/warden-command-exchange-provider.js';
+import { WardenCommandResponse } from '../common/command/warden-command-response.js';
 import { PublicKeyCredentialCreationOptionsJSON, PublicKeyCredentialRequestOptionsJSON, RegistrationResponseJSON } from '@simplewebauthn/typescript-types';
-import { WardenLoginResults } from '../common/model/warden-login-results';
-import { WardenLoginRequest } from '../common/model/warden-login-request';
-import { WardenClientCurrentLoggedInJwtTokenProvider } from './provider/warden-client-current-logged-in-jwt-token-provider';
-import { WardenEntrySummary } from '../common/model/warden-entry-summary';
+import { WardenLoginResults } from '../common/model/warden-login-results.js';
+import { WardenLoginRequest } from '../common/model/warden-login-request.js';
+import { WardenClientCurrentLoggedInJwtTokenProvider } from './provider/warden-client-current-logged-in-jwt-token-provider.js';
+import { WardenEntrySummary } from '../common/model/warden-entry-summary.js';
 export declare class WardenClient {
     private commandSender;
     private jwtProvider;

package/{dist/es → lib}/client/warden-client.js

@@ -1,5 +1,10 @@
-import { ErrorRatchet, Logger, RequireRatchet, StringRatchet } from '@bitblit/ratchet-common';
+import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
+import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
 export class WardenClient {
+    commandSender;
+    jwtProvider;
     constructor(commandSender, jwtProvider) {
         this.commandSender = commandSender;
         this.jwtProvider = jwtProvider;

package/lib/client/warden-client.spec.js

@@ -0,0 +1,22 @@
+import { JestRatchet } from '@bitblit/ratchet-jest/lib/jest/jest-ratchet.js';
+import { WardenClient } from './warden-client.js';
+import { jest } from '@jest/globals';
+let mockCommandExchangeProvider;
+let mockLoggedInJwtTokenProvider;
+describe('#wardenClient', function () {
+    beforeEach(() => {
+        mockCommandExchangeProvider = JestRatchet.mock(jest.fn);
+        mockLoggedInJwtTokenProvider = JestRatchet.mock(jest.fn);
+    });
+    it('should instantiate and exchange commands', async () => {
+        const wc = new WardenClient(mockCommandExchangeProvider, mockLoggedInJwtTokenProvider);
+        expect(wc).not.toBeNull();
+        const cmd = {
+            generateWebAuthnAuthenticationChallengeForUserId: 'test',
+        };
+        mockCommandExchangeProvider.sendCommand.mockResolvedValue('{"generateWebAuthnAuthenticationChallengeForUserId": { "dataAsJson": {} }}');
+        const result = await wc.exchangeCommand(cmd);
+        expect(result).not.toBeNull();
+        expect(result.generateWebAuthnRegistrationChallengeForLoggedInUser).not.toBeNull();
+    });
+});

package/{dist/types → lib}/client/warden-delegating-current-user-providing-user-service-event-processing-provider.d.ts

@@ -1,17 +1,7 @@
-import { WardenUserServiceEventProcessingProvider } from './provider/warden-user-service-event-processing-provider';
-import { WardenLoggedInUserWrapper } from './provider/warden-logged-in-user-wrapper';
+import { WardenUserServiceEventProcessingProvider } from './provider/warden-user-service-event-processing-provider.js';
+import { WardenLoggedInUserWrapper } from './provider/warden-logged-in-user-wrapper.js';
 import { BehaviorSubject } from 'rxjs';
-import { WardenClientCurrentLoggedInJwtTokenProvider } from './provider/warden-client-current-logged-in-jwt-token-provider';
-/**
- * This class maintains a BehaviorSubject of the current user for things that want to be
- * notified on change without depending on the WardenUserService (most commonly, the
- * API provider with both needs the token for auth'd calls, but also is responsible for
- * doing the login call itself and therefor cannot depend on the UserService which depends
- * on the WardenClient which likely depends on the API provider - prevents a circular
- * dependency to just depend on this)
- *
- * Delegates so that you still can also register other behavior, and just tack this onto it
- */
+import { WardenClientCurrentLoggedInJwtTokenProvider } from './provider/warden-client-current-logged-in-jwt-token-provider.js';
 export declare class WardenDelegatingCurrentUserProvidingUserServiceEventProcessingProvider<T> implements WardenUserServiceEventProcessingProvider<T>, WardenClientCurrentLoggedInJwtTokenProvider {
     private wrapped?;
     private _currentUserSubject;

package/{dist/es → lib}/client/warden-delegating-current-user-providing-user-service-event-processing-provider.js

@@ -1,8 +1,9 @@
 import { BehaviorSubject } from 'rxjs';
 export class WardenDelegatingCurrentUserProvidingUserServiceEventProcessingProvider {
+    wrapped;
+    _currentUserSubject = new BehaviorSubject(null);
     constructor(wrapped) {
         this.wrapped = wrapped;
-        this._currentUserSubject = new BehaviorSubject(null);
     }
     fetchCurrentLoggedInJwtToken() {
         return this?._currentUserSubject?.getValue()?.jwtToken;

package/{dist/types → lib}/client/warden-user-service.d.ts

@@ -1,21 +1,15 @@
-import { WardenUserServiceOptions } from './provider/warden-user-service-options';
-import { WardenLoggedInUserWrapper } from './provider/warden-logged-in-user-wrapper';
-import { WardenContact } from '../common/model/warden-contact';
-import { WardenJwtToken } from '../common/model/warden-jwt-token';
-import { WardenLoginResults } from '../common/model/warden-login-results';
-import { WardenEntrySummary } from '../common/model/warden-entry-summary';
-/**
- * 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
- */
+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 { WardenEntrySummary } from '../common/model/warden-entry-summary.js';
 export declare class WardenUserService<T> {
     private options;
     private loggedInTimerSubscription;
     private _autoRefreshEnabled;
     constructor(options: WardenUserServiceOptions<T>);
+    cleanShutDown(): void;
     get serviceOptions(): WardenUserServiceOptions<T>;
     createAccount(contact: WardenContact, sendCode?: boolean, label?: string, tags?: string[]): Promise<string>;
     addContactToLoggedInUser(contact: WardenContact): Promise<boolean>;

package/{dist/es → lib}/client/warden-user-service.js

@@ -1,11 +1,13 @@
-import { Logger } from '@bitblit/ratchet-common';
+import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
+import { JwtRatchet } from '@bitblit/ratchet-common/lib/jwt/jwt-ratchet.js';
 import { timer } from 'rxjs';
-import jwt_decode from 'jwt-decode';
-import { StringRatchet } from '@bitblit/ratchet-common';
 export class WardenUserService {
+    options;
+    loggedInTimerSubscription;
+    _autoRefreshEnabled = false;
     constructor(options) {
         this.options = options;
-        this._autoRefreshEnabled = false;
         Logger.info('Initializing user service');
         const stored = this.options.loggedInUserProvider.fetchLoggedInUserWrapper();
         if (WardenUserService.wrapperIsExpired(stored)) {
@@ -18,6 +20,11 @@ export class WardenUserService {
         const timerSeconds = this.options.loginCheckTimerPingSeconds || 2.5;
         this.loggedInTimerSubscription = timer(0, timerSeconds * 1000).subscribe((t) => this.checkForAutoLogoutOrRefresh(t));
     }
+    cleanShutDown() {
+        if (this.loggedInTimerSubscription) {
+            this.loggedInTimerSubscription.unsubscribe();
+        }
+    }
     get serviceOptions() {
         return this.options;
     }
@@ -126,7 +133,7 @@ export class WardenUserService {
         }
         else {
             Logger.info('updateLoggedInUserFromTokenString : %s', token);
-            const parsed = jwt_decode(token);
+            const parsed = JwtRatchet.decodeTokenNoVerify(token);
             if (parsed) {
                 rval = {
                     userObject: parsed,

package/lib/client/warden-user-service.spec.js

@@ -0,0 +1,19 @@
+import { WardenUserService } from './warden-user-service.js';
+import { JestRatchet } from '@bitblit/ratchet-jest/lib/jest/jest-ratchet.js';
+import { jest } from '@jest/globals';
+describe('#wardenUserService', function () {
+    it('should instantiate', async () => {
+        const wuso = {
+            recentLoginProvider: JestRatchet.mock(jest.fn),
+            loggedInUserProvider: JestRatchet.mock(jest.fn),
+            wardenClient: JestRatchet.mock(jest.fn),
+            eventProcessor: JestRatchet.mock(jest.fn),
+            loginCheckTimerPingSeconds: 60,
+            autoLoginHandlingThresholdSeconds: 60,
+            allowAutoRefresh: true,
+        };
+        const wus = new WardenUserService(wuso);
+        expect(wus).not.toBeNull();
+        wus.cleanShutDown();
+    });
+});

package/{dist/types → lib}/common/command/create-account.d.ts

@@ -1,4 +1,4 @@
-import { WardenContact } from '../model/warden-contact';
+import { WardenContact } from '../model/warden-contact.js';
 export interface CreateAccount {
     contact: WardenContact;
     sendCode?: boolean;

package/{dist/types → lib}/common/command/warden-command-response.d.ts

@@ -1,6 +1,6 @@
-import { WebAuthnObjectWrapper } from './web-authn-object-wrapper';
-import { WardenLoginResults } from '../model/warden-login-results';
-import { WardenEntrySummary } from '../model/warden-entry-summary';
+import { WebAuthnObjectWrapper } from './web-authn-object-wrapper.js';
+import { WardenLoginResults } from '../model/warden-login-results.js';
+import { WardenEntrySummary } from '../model/warden-entry-summary.js';
 export interface WardenCommandResponse {
     createAccount?: string;
     generateWebAuthnAuthenticationChallengeForUserId?: WebAuthnObjectWrapper;

package/{dist/types → lib}/common/command/warden-command.d.ts

@@ -1,8 +1,8 @@
-import { CreateAccount } from './create-account';
-import { WardenContact } from '../model/warden-contact';
-import { WebAuthnObjectWrapper } from './web-authn-object-wrapper';
-import { RemoveWebAuthnRegistration } from './remove-web-authn-registration';
-import { WardenLoginRequest } from '../model/warden-login-request';
+import { CreateAccount } from './create-account.js';
+import { WardenContact } from '../model/warden-contact.js';
+import { WebAuthnObjectWrapper } from './web-authn-object-wrapper.js';
+import { RemoveWebAuthnRegistration } from './remove-web-authn-registration.js';
+import { WardenLoginRequest } from '../model/warden-login-request.js';
 export interface WardenCommand {
     createAccount?: CreateAccount;
     generateWebAuthnAuthenticationChallengeForUserId?: string;

package/{dist/types → lib}/common/model/warden-contact.d.ts

@@ -1,4 +1,4 @@
-import { WardenContactType } from './warden-contact-type';
+import { WardenContactType } from './warden-contact-type.js';
 export interface WardenContact {
     value: string;
     type: WardenContactType;

package/{dist/types → lib}/common/model/warden-entry-summary.d.ts

@@ -1,4 +1,4 @@
-import { WardenContact } from './warden-contact';
+import { WardenContact } from './warden-contact.js';
 export interface WardenEntrySummary {
     userId: string;
     userLabel: string;

package/{dist/types → lib}/common/model/warden-entry.d.ts

@@ -1,5 +1,5 @@
-import { WardenWebAuthnEntry } from './warden-web-authn-entry';
-import { WardenContact } from './warden-contact';
+import { WardenWebAuthnEntry } from './warden-web-authn-entry.js';
+import { WardenContact } from './warden-contact.js';
 export interface WardenEntry {
     userId: string;
     userLabel: string;

package/lib/common/model/warden-jwt-token.d.ts

@@ -0,0 +1,5 @@
+import { CommonJwtToken } from '@bitblit/ratchet-common/lib/jwt/common-jwt-token.js';
+import { WardenEntrySummary } from './warden-entry-summary.js';
+export interface WardenJwtToken<T> extends CommonJwtToken<T> {
+    loginData: WardenEntrySummary;
+}

package/{dist/types → lib}/common/model/warden-login-request.d.ts

@@ -1,4 +1,4 @@
-import { WardenContact } from './warden-contact';
+import { WardenContact } from './warden-contact.js';
 import { AuthenticationResponseJSON } from '@simplewebauthn/typescript-types';
 export interface WardenLoginRequest {
     userId?: string;

package/{dist/types → lib}/common/model/warden-login-results.d.ts

@@ -1,4 +1,4 @@
-import { WardenLoginRequest } from './warden-login-request';
+import { WardenLoginRequest } from './warden-login-request.js';
 export interface WardenLoginResults {
     request: WardenLoginRequest;
     userId?: string;

package/{dist/types → lib}/common/model/warden-store-registration-response.d.ts

@@ -1,5 +1,5 @@
-import { WardenStoreRegistrationResponseType } from './warden-store-registration-response-type';
-import { WardenEntry } from './warden-entry';
+import { WardenStoreRegistrationResponseType } from './warden-store-registration-response-type.js';
+import { WardenEntry } from './warden-entry.js';
 export interface WardenStoreRegistrationResponse {
     updatedEntry?: WardenEntry;
     registrationResponseId: string;

package/{dist/types → lib}/common/model/warden-user-decoration.d.ts

@@ -1,4 +1,4 @@
-import { WardenTeamRole } from './warden-team-role';
+import { WardenTeamRole } from './warden-team-role.js';
 export interface WardenUserDecoration<T> {
     userTokenData: T;
     userTokenExpirationSeconds: number;

package/lib/common/model/warden-user-decoration.js

@@ -0,0 +1 @@
+export {};

package/{dist/types → lib}/common/model/warden-web-authn-entry.d.ts

@@ -1,4 +1,4 @@
-import { WardenWebAuthnTransportFutureType } from './warden-web-authn-transport-future-type';
+import { WardenWebAuthnTransportFutureType } from './warden-web-authn-transport-future-type.js';
 export interface WardenWebAuthnEntry {
     credentialIdBase64: string;
     credentialPublicKeyBase64: string;

package/lib/common/model/warden-web-authn-entry.js

@@ -0,0 +1 @@
+export {};

package/{dist/types → lib}/common/util/warden-utils.d.ts

@@ -1,9 +1,9 @@
-import { WardenContact } from '../model/warden-contact';
-import { WardenContactType } from '../model/warden-contact-type';
-import { WardenEntrySummary } from '../model/warden-entry-summary';
-import { WardenEntry } from '../model/warden-entry';
-import { WardenLoginRequest } from '../model/warden-login-request';
-import { WardenTeamRole } from '../model/warden-team-role';
+import { WardenContact } from '../model/warden-contact.js';
+import { WardenContactType } from '../model/warden-contact-type.js';
+import { WardenEntrySummary } from '../model/warden-entry-summary.js';
+import { WardenEntry } from '../model/warden-entry.js';
+import { WardenLoginRequest } from '../model/warden-login-request.js';
+import { WardenTeamRole } from '../model/warden-team-role.js';
 export declare class WardenUtils {
     constructor();
     static extractContactsOfType(req: WardenEntry | WardenEntrySummary, type: WardenContactType): string[];

package/{dist/es → lib}/common/util/warden-utils.js

@@ -1,5 +1,6 @@
-import { WardenContactType } from '../model/warden-contact-type';
-import { Logger, StringRatchet } from '@bitblit/ratchet-common';
+import { WardenContactType } from '../model/warden-contact-type.js';
+import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
 export class WardenUtils {
     constructor() { }
     static extractContactsOfType(req, type) {

package/lib/common/util/warden-utils.spec.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,10 @@
+import { WardenContactType } from '../model/warden-contact-type.js';
+import { WardenUtils } from './warden-utils.js';
+describe('#WardenUtils', () => {
+    it('Should convert a string to a contact type', async () => {
+        const output = WardenUtils.stringToWardenContact('test@test.com');
+        expect(output).not.toBeNull();
+        expect(output.value).toEqual('test@test.com');
+        expect(output.type).toEqual(WardenContactType.EmailAddress);
+    });
+});

package/lib/index.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/index.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@bitblit/ratchet-warden-common",
-  "version": "4.0.99-alpha",
+  "version": "4.0.103-alpha",
   "description": "Typescript library to simplify using simplewebauthn and secondary auth methods over GraphQL",
   "sideEffects": false,
   "bin": {},
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
+  "type": "module",
+  "module": "index.js",
   "files": [
-    "dist/*",
-    "includes/*"
+    "lib/*",
+    "bin/*"
   ],
   "contributors": [
     "Christopher Weiss <bitblit@gmail.com>"
@@ -27,16 +26,14 @@
   "config": {},
   "scripts": {
     "watch": "tsc-watch",
-    "clean": "shx rm -Rf dist",
-    "test": "jest",
+    "clean": "shx rm -Rf lib",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest",
     "docs": "typedoc",
     "lint": "eslint src/**/*.ts",
     "lint-fix": "eslint --fix src/**/*.ts",
-    "generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts",
-    "build": "yarn run generate-barrels && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:es": "tsc -p tsconfig.es.json",
-    "build:types": "tsc -p tsconfig.types.json"
+    "__generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts",
+    "__build": "yarn run generate-barrels && tsc",
+    "build": "tsc"
   },
   "repository": {
     "type": "git",

package/dist/cjs/build/ratchet-warden-common-info.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RatchetWardenCommonInfo = void 0;
-class RatchetWardenCommonInfo {
-    constructor() { }
-    static buildInformation() {
-        const val = {
-            version: 'LOCAL-SNAPSHOT',
-            hash: 'LOCAL-HASH',
-            branch: 'LOCAL-BRANCH',
-            tag: 'LOCAL-TAG',
-            timeBuiltISO: 'LOCAL-TIME-ISO',
-            notes: 'LOCAL-NOTES',
-        };
-        return val;
-    }
-}
-exports.RatchetWardenCommonInfo = RatchetWardenCommonInfo;