@bitblit/ratchet-warden-server 4.0.115-alpha → 4.0.119-alpha

package/lib/server/provider/warden-default-user-decoration-provider.d.ts

@@ -1,6 +1,6 @@
-import { WardenEntry } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry.js';
-import { WardenEntrySummary } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry-summary.js';
-import { WardenUserDecoration } from '@bitblit/ratchet-warden-common/lib/common/model/warden-user-decoration.js';
+import { WardenEntry } from '@bitblit/ratchet-warden-common';
+import { WardenEntrySummary } from '@bitblit/ratchet-warden-common';
+import { WardenUserDecoration } from '@bitblit/ratchet-warden-common';
 import { WardenUserDecorationProvider } from './warden-user-decoration-provider.js';
 export declare class WardenDefaultUserDecorationProvider implements WardenUserDecorationProvider<WardenEntrySummary> {
     fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<WardenEntrySummary>>;

package/lib/server/provider/warden-event-processing-provider.d.ts

@@ -1,4 +1,4 @@
-import { WardenEntry } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry.js';
+import { WardenEntry } from '@bitblit/ratchet-warden-common';
 export interface WardenEventProcessingProvider {
     userCreated(entry: WardenEntry): Promise<void>;
     userRemoved(entry: WardenEntry): Promise<void>;

package/lib/server/provider/warden-mailer-message-sending-provider.d.ts

@@ -1,10 +1,10 @@
 import { WardenMessageSendingProvider } from './warden-message-sending-provider.js';
 import { WardenMailerMessageSendingProviderOptions } from './warden-mailer-message-sending-provider-options.js';
-import { MailerLike } from '@bitblit/ratchet-aws/lib/ses/mailer-like.js';
-import { ReadyToSendEmail } from '@bitblit/ratchet-aws/lib/ses/ready-to-send-email.js';
-import { WardenContact } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact.js';
-import { WardenContactType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact-type.js';
-import { WardenCustomerMessageType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-customer-message-type.js';
+import { MailerLike } from '@bitblit/ratchet-aws';
+import { ReadyToSendEmail } from '@bitblit/ratchet-aws';
+import { WardenContact } from '@bitblit/ratchet-warden-common';
+import { WardenContactType } from '@bitblit/ratchet-warden-common';
+import { WardenCustomerMessageType } from '@bitblit/ratchet-warden-common';
 export declare class WardenMailerMessageSendingProvider implements WardenMessageSendingProvider<ReadyToSendEmail> {
     private mailer;
     private options;

package/lib/server/provider/warden-message-sending-provider.d.ts

@@ -1,6 +1,6 @@
-import { WardenContactType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact-type.js';
-import { WardenContact } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact.js';
-import { WardenCustomerMessageType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-customer-message-type.js';
+import { WardenContactType } from '@bitblit/ratchet-warden-common';
+import { WardenContact } from '@bitblit/ratchet-warden-common';
+import { WardenCustomerMessageType } from '@bitblit/ratchet-warden-common';
 export interface WardenMessageSendingProvider<T> {
     handlesContactType(type: WardenContactType): boolean;
     sendMessage(contact: WardenContact, message: T): Promise<boolean>;

package/lib/server/provider/warden-no-op-event-processing-provider.d.ts

@@ -1,4 +1,4 @@
-import { WardenEntry } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry.js';
+import { WardenEntry } from '@bitblit/ratchet-warden-common';
 import { WardenEventProcessingProvider } from './warden-event-processing-provider.js';
 export declare class WardenNoOpEventProcessingProvider implements WardenEventProcessingProvider {
     userCreated(entry: WardenEntry): Promise<void>;

package/lib/server/provider/warden-s3-single-file-storage-provider.d.ts

@@ -1,9 +1,9 @@
-import { WardenEntry } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry.js';
-import { WardenEntrySummary } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry-summary.js';
+import { WardenEntry } from '@bitblit/ratchet-warden-common';
+import { WardenEntrySummary } from '@bitblit/ratchet-warden-common';
 import { WardenStorageProvider } from './warden-storage-provider.js';
 import { WardenS3SingleFileStorageProviderOptions } from './warden-s3-single-file-storage-provider-options.js';
 import { PutObjectOutput, S3Client } from '@aws-sdk/client-s3';
-import { WardenContact } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact.js';
+import { WardenContact } from '@bitblit/ratchet-warden-common';
 export declare class WardenS3SingleFileStorageProvider implements WardenStorageProvider {
     private s3;
     private options;

package/lib/server/provider/warden-storage-provider.d.ts

@@ -1,6 +1,6 @@
-import { WardenEntry } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry.js';
-import { WardenEntrySummary } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry-summary.js';
-import { WardenContact } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact.js';
+import { WardenEntry } from '@bitblit/ratchet-warden-common';
+import { WardenEntrySummary } from '@bitblit/ratchet-warden-common';
+import { WardenContact } from '@bitblit/ratchet-warden-common';
 export interface WardenStorageProvider {
     findEntryById(userId: string): Promise<WardenEntry>;
     findEntryByContact(contact: WardenContact): Promise<WardenEntry>;

package/lib/server/provider/warden-twilio-text-message-sending-provider.d.ts

@@ -1,8 +1,8 @@
 import { WardenMessageSendingProvider } from './warden-message-sending-provider.js';
 import { WardenTwilioTextMessageSendingProviderOptions } from './warden-twilio-text-message-sending-provider-options.js';
-import { WardenContact } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact.js';
-import { WardenCustomerMessageType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-customer-message-type.js';
-import { WardenContactType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact-type.js';
+import { WardenContact } from '@bitblit/ratchet-warden-common';
+import { WardenCustomerMessageType } from '@bitblit/ratchet-warden-common';
+import { WardenContactType } from '@bitblit/ratchet-warden-common';
 export declare class WardenTwilioTextMessageSendingProvider implements WardenMessageSendingProvider<string> {
     private optsPromise;
     constructor(optsPromise: Promise<WardenTwilioTextMessageSendingProviderOptions>);

package/lib/server/provider/warden-user-decoration-provider.d.ts

@@ -1,5 +1,5 @@
-import { WardenEntry } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry.js';
-import { WardenUserDecoration } from '@bitblit/ratchet-warden-common/lib/common/model/warden-user-decoration.js';
+import { WardenEntry } from '@bitblit/ratchet-warden-common';
+import { WardenUserDecoration } from '@bitblit/ratchet-warden-common';
 export interface WardenUserDecorationProvider<T> {
     fetchDecoration(wardenUser: WardenEntry): Promise<WardenUserDecoration<T>>;
 }

package/lib/server/warden-service-options.d.ts

@@ -1,7 +1,7 @@
 import { WardenStorageProvider } from './provider/warden-storage-provider.js';
 import { WardenMessageSendingProvider } from './provider/warden-message-sending-provider.js';
-import { ExpiringCodeProvider } from '@bitblit/ratchet-aws/lib/expiring-code/expiring-code-provider.js';
-import { JwtRatchetLike } from '@bitblit/ratchet-common/lib/jwt/jwt-ratchet-like.js';
+import { ExpiringCodeProvider } from '@bitblit/ratchet-aws';
+import { JwtRatchetLike } from '@bitblit/ratchet-common';
 import { WardenUserDecorationProvider } from './provider/warden-user-decoration-provider.js';
 import { WardenEventProcessingProvider } from './provider/warden-event-processing-provider.js';
 export interface WardenServiceOptions {

package/lib/server/warden-service.d.ts

@@ -1,12 +1,12 @@
 import { AuthenticationResponseJSON, PublicKeyCredentialCreationOptionsJSON, PublicKeyCredentialRequestOptionsJSON, RegistrationResponseJSON } from '@simplewebauthn/typescript-types';
 import { WardenServiceOptions } from './warden-service-options.js';
-import { WardenEntry } from '@bitblit/ratchet-warden-common/lib/common/model/warden-entry.js';
-import { WardenStoreRegistrationResponse } from '@bitblit/ratchet-warden-common/lib/common/model/warden-store-registration-response.js';
+import { WardenEntry } from '@bitblit/ratchet-warden-common';
+import { WardenStoreRegistrationResponse } from '@bitblit/ratchet-warden-common';
 import { WardenMessageSendingProvider } from './provider/warden-message-sending-provider.js';
-import { WardenContact } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact.js';
-import { WardenCommand } from '@bitblit/ratchet-warden-common/lib/common/command/warden-command.js';
-import { WardenCommandResponse } from '@bitblit/ratchet-warden-common/lib/common/command/warden-command-response.js';
-import { WardenLoginRequest } from '@bitblit/ratchet-warden-common/lib/common/model/warden-login-request.js';
+import { WardenContact } from '@bitblit/ratchet-warden-common';
+import { WardenCommand } from '@bitblit/ratchet-warden-common';
+import { WardenCommandResponse } from '@bitblit/ratchet-warden-common';
+import { WardenLoginRequest } from '@bitblit/ratchet-warden-common';
 export declare class WardenService {
     private inOptions;
     private opts;

package/package.json

@@ -1,15 +1,20 @@
 {
   "name": "@bitblit/ratchet-warden-server",
-  "version": "4.0.115-alpha",
+  "version": "4.0.119-alpha",
   "description": "Typescript library to simplify using simplewebauthn and secondary auth methods over GraphQL",
   "sideEffects": false,
   "bin": {},
   "type": "module",
-  "module": "index.js",
   "files": [
     "lib/*",
     "bin/*"
   ],
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.mjs"
+    }
+  },
   "contributors": [
     "Christopher Weiss <bitblit@gmail.com>"
   ],
@@ -31,9 +36,9 @@
     "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 && tsc",
-    "build": "tsc"
+    "generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts && sed -i 's/\\x27;/.js\\x27;/' src/index.ts",
+    "build": "yarn clean && yarn generate-barrels && rollup -c rollup.config.js",
+    "force-build": "tsc --build --force"
   },
   "repository": {
     "type": "git",
@@ -52,21 +57,16 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/client-s3": "3.328.0",
-    "@aws-sdk/client-ses": "3.328.0",
-    "@bitblit/ratchet-aws": "4.0.115-alpha",
-    "@bitblit/ratchet-common": "4.0.115-alpha",
-    "@bitblit/ratchet-warden-common": "4.0.115-alpha",
+    "@aws-sdk/client-s3": "3.332.0",
+    "@aws-sdk/client-ses": "3.332.0",
+    "@bitblit/ratchet-aws": "4.0.119-alpha",
+    "@bitblit/ratchet-common": "4.0.119-alpha",
+    "@bitblit/ratchet-warden-common": "4.0.119-alpha",
     "@simplewebauthn/browser": "7.2.0",
     "@simplewebauthn/server": "7.2.0",
     "@simplewebauthn/typescript-types": "7.0.0",
     "jwt-decode": "3.1.2"
   },
   "peerDependencies": {
-    "@bitblit/ratchet-jest": "4.0.115-alpha",
-    "@simplewebauthn/browser": "^7.2.0",
-    "@simplewebauthn/server": "^7.2.0",
-    "@simplewebauthn/typescript-types": "^7.0.0",
-    "jwt-decode": "^3.1.2"
   }
 }

package/lib/build/ratchet-warden-server-info.js

@@ -1,14 +0,0 @@
-export class RatchetWardenServerInfo {
-    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;
-    }
-}

package/lib/index.js

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

package/lib/server/provider/warden-default-user-decoration-provider.js

@@ -1,11 +0,0 @@
-import { WardenUtils } from '@bitblit/ratchet-warden-common/lib/common/util/warden-utils.js';
-export class WardenDefaultUserDecorationProvider {
-    async fetchDecoration(wardenUser) {
-        const rval = {
-            userTokenData: WardenUtils.stripWardenEntryToSummary(wardenUser),
-            userTokenExpirationSeconds: 3600,
-            userTeamRoles: [{ team: 'WARDEN', role: 'USER' }],
-        };
-        return rval;
-    }
-}

package/lib/server/provider/warden-event-processing-provider.js

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

package/lib/server/provider/warden-mailer-message-sending-provider-options.js

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

package/lib/server/provider/warden-mailer-message-sending-provider.js

@@ -1,34 +0,0 @@
-import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
-import { WardenContactType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact-type.js';
-export class WardenMailerMessageSendingProvider {
-    mailer;
-    options;
-    static defaultOptions() {
-        const rval = {
-            emailBaseLayoutName: undefined,
-            expiringTokenHtmlTemplateName: 'expiring-token-request-email',
-            expiringTokenTxtTemplateName: undefined,
-        };
-        return rval;
-    }
-    constructor(mailer, options = WardenMailerMessageSendingProvider.defaultOptions()) {
-        this.mailer = mailer;
-        this.options = options;
-    }
-    async formatMessage(contact, messageType, context) {
-        const rts = {
-            destinationAddresses: [contact.value],
-            subject: 'Your login token',
-        };
-        await this.mailer.fillEmailBody(rts, context, this.options.expiringTokenHtmlTemplateName, this.options.expiringTokenTxtTemplateName, this.options.emailBaseLayoutName);
-        return rts;
-    }
-    handlesContactType(type) {
-        return type === WardenContactType.EmailAddress;
-    }
-    async sendMessage(contact, message) {
-        const rval = await this.mailer.sendEmail(message);
-        Logger.debug('SendRawEmailResponse was : %j', rval);
-        return !!rval;
-    }
-}

package/lib/server/provider/warden-message-sending-provider.js

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

package/lib/server/provider/warden-no-op-event-processing-provider.js

@@ -1,4 +0,0 @@
-export class WardenNoOpEventProcessingProvider {
-    async userCreated(entry) { }
-    async userRemoved(entry) { }
-}

package/lib/server/provider/warden-s3-single-file-storage-provider-options.js

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

package/lib/server/provider/warden-s3-single-file-storage-provider.js

@@ -1,90 +0,0 @@
-import { WardenUtils } from '@bitblit/ratchet-warden-common/lib/common/util/warden-utils.js';
-import { S3CacheRatchet } from '@bitblit/ratchet-aws/lib/s3/s3-cache-ratchet.js';
-import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
-import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
-export class WardenS3SingleFileStorageProvider {
-    s3;
-    options;
-    ratchet;
-    constructor(s3, options) {
-        this.s3 = s3;
-        this.options = options;
-        this.ratchet = new S3CacheRatchet(this.s3, this.options.bucket);
-    }
-    async listUserSummaries() {
-        const allData = (await this.fetchDataFile()).entries;
-        const rval = allData.map((d) => WardenUtils.stripWardenEntryToSummary(d));
-        return rval;
-    }
-    async fetchDataFile() {
-        let data = await this.ratchet.fetchCacheFileAsObject(this.options.dataFileKey);
-        data = data || {
-            entries: [],
-            challenges: [],
-        };
-        return data;
-    }
-    async storeDataFile(file) {
-        let rval = null;
-        if (file) {
-            rval = await this.ratchet.writeObjectToCacheFile(this.options.dataFileKey, file);
-        }
-        return rval;
-    }
-    async fetchCurrentUserChallenge(userId, relyingPartyId) {
-        const data = await this.fetchDataFile();
-        const entry = (data.challenges || []).find((d) => d.userId === userId && d.relyingPartyId === relyingPartyId);
-        if (!entry) {
-            ErrorRatchet.throwFormattedErr('fetchCurrentUserChallenge: Could not find user %s', userId);
-        }
-        return entry.challenge;
-    }
-    async findEntryByContact(contact) {
-        let rval = null;
-        if (contact?.type && StringRatchet.trimToNull(contact?.value)) {
-            const data = await this.fetchDataFile();
-            rval = (data.entries || []).find((d) => !!(d.contactMethods || []).find((x) => x.type === contact.type && x.value === contact.value));
-        }
-        return rval;
-    }
-    async findEntryById(userId) {
-        let rval = null;
-        if (StringRatchet.trimToNull(userId)) {
-            const data = await this.fetchDataFile();
-            rval = (data.entries || []).find((d) => d.userId === userId);
-        }
-        return rval;
-    }
-    async removeEntry(userId) {
-        const data = await this.fetchDataFile();
-        data.entries = (data.entries || []).filter((d) => d.userId !== userId);
-        await this.storeDataFile(data);
-        return true;
-    }
-    async saveEntry(entry) {
-        let rval = null;
-        if (entry && entry.userId) {
-            const now = Date.now();
-            entry.createdEpochMS = entry.createdEpochMS || now;
-            entry.updatedEpochMS = now;
-            const data = await this.fetchDataFile();
-            data.entries = (data.entries || []).filter((d) => d.userId !== entry.userId);
-            data.entries.push(entry);
-            await this.storeDataFile(data);
-            rval = await this.findEntryById(entry.userId);
-        }
-        return rval;
-    }
-    async updateUserChallenge(userId, relyingPartyId, challenge) {
-        const data = await this.fetchDataFile();
-        data.challenges = (data.challenges || []).filter((d) => d.userId !== userId || d.relyingPartyId !== relyingPartyId);
-        data.challenges.push({
-            userId: userId,
-            relyingPartyId: relyingPartyId,
-            challenge: challenge,
-            updatedEpochMS: Date.now(),
-        });
-        await this.storeDataFile(data);
-        return true;
-    }
-}

package/lib/server/provider/warden-storage-provider.js

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

package/lib/server/provider/warden-twilio-text-message-sending-provider-options.js

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

package/lib/server/provider/warden-twilio-text-message-sending-provider.js

@@ -1,29 +0,0 @@
-import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
-import { TwilioRatchet } from '@bitblit/ratchet-common/lib/third-party/twilio/twilio-ratchet.js';
-import { WardenContactType } from '@bitblit/ratchet-warden-common/lib/common/model/warden-contact-type.js';
-export class WardenTwilioTextMessageSendingProvider {
-    optsPromise;
-    constructor(optsPromise) {
-        this.optsPromise = optsPromise;
-    }
-    async formatMessage(contact, messageType, context) {
-        Logger.info('Creating text');
-        const msg = context['code'] +
-            ' is your ' +
-            context['relyingPartyName'] +
-            ' authentication code.\n@' +
-            context['relyingPartyName'] +
-            ' #' +
-            context['code'];
-        return msg;
-    }
-    handlesContactType(type) {
-        return type === WardenContactType.TextCapablePhoneNumber;
-    }
-    async sendMessage(contact, message) {
-        const opts = await this.optsPromise;
-        const rval = await TwilioRatchet.sendMessageDirect(opts.accountSID, opts.authToken, opts.outBoundNumber, [contact.value], message);
-        Logger.debug('sendMessage was : %j', rval);
-        return !!rval && rval.length > 0;
-    }
-}

package/lib/server/provider/warden-user-decoration-provider.js

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

package/lib/server/warden-service-options.js

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