@earbug/db-models 0.0.52 → 0.0.54

package/README.md

@@ -9,3 +9,17 @@ To update the models after altering your local DB schema:
 1. bump version in `package.json` 
 1. `npm publish` - Will publish to npm.
 1. Bump the version in your dependent package: `npm i @earbug/db-models@latest`
+
+## Connecting with TLS
+
+TLS is **off** by default. Set `PG_SSL=true` (or pass `initDb({ ssl: true })`)
+to connect over TLS and validate the server against the Amazon RDS CA bundle
+that ships with this package. Services that build their own Sequelize/pg client
+can use the exported `RDS_SSL_CONFIG` for the same settings.
+
+The bundled CA comes from AWS's public truststore. Refresh it after an AWS CA
+rotation and commit the regenerated file:
+
+```bash
+npm run update-rds-ca
+```

package/dist/GuestUser.d.ts

@@ -3,8 +3,6 @@ import { Model, Optional } from 'sequelize';
 import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 import type { JukeboxSession, JukeboxSessionId } from './JukeboxSession';
 import type { Versus, VersusId } from './Versus';
-import type { VersusCoCreator, VersusCoCreatorId } from './VersusCoCreator';
-import type { VersusOption, VersusOptionId } from './VersusOption';
 export interface GuestUserAttributes {
     jukeboxSessionId?: string;
     firstName: string;
@@ -39,28 +37,6 @@ export declare class GuestUser extends Model<GuestUserAttributes, GuestUserCreat
     hasJukeboxQueueEntry: Sequelize.HasManyHasAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
     hasJukeboxQueueEntries: Sequelize.HasManyHasAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
     countJukeboxQueueEntries: Sequelize.HasManyCountAssociationsMixin;
-    versusCoCreators: VersusCoCreator[];
-    getVersusCoCreators: Sequelize.HasManyGetAssociationsMixin<VersusCoCreator>;
-    setVersusCoCreators: Sequelize.HasManySetAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    addVersusCoCreator: Sequelize.HasManyAddAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-    addVersusCoCreators: Sequelize.HasManyAddAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    createVersusCoCreator: Sequelize.HasManyCreateAssociationMixin<VersusCoCreator>;
-    removeVersusCoCreator: Sequelize.HasManyRemoveAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-    removeVersusCoCreators: Sequelize.HasManyRemoveAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    hasVersusCoCreator: Sequelize.HasManyHasAssociationMixin<VersusCoCreator, VersusCoCreatorId>;
-    hasVersusCoCreators: Sequelize.HasManyHasAssociationsMixin<VersusCoCreator, VersusCoCreatorId>;
-    countVersusCoCreators: Sequelize.HasManyCountAssociationsMixin;
-    versusOptions: VersusOption[];
-    getVersusOptions: Sequelize.HasManyGetAssociationsMixin<VersusOption>;
-    setVersusOptions: Sequelize.HasManySetAssociationsMixin<VersusOption, VersusOptionId>;
-    addVersusOption: Sequelize.HasManyAddAssociationMixin<VersusOption, VersusOptionId>;
-    addVersusOptions: Sequelize.HasManyAddAssociationsMixin<VersusOption, VersusOptionId>;
-    createVersusOption: Sequelize.HasManyCreateAssociationMixin<VersusOption>;
-    removeVersusOption: Sequelize.HasManyRemoveAssociationMixin<VersusOption, VersusOptionId>;
-    removeVersusOptions: Sequelize.HasManyRemoveAssociationsMixin<VersusOption, VersusOptionId>;
-    hasVersusOption: Sequelize.HasManyHasAssociationMixin<VersusOption, VersusOptionId>;
-    hasVersusOptions: Sequelize.HasManyHasAssociationsMixin<VersusOption, VersusOptionId>;
-    countVersusOptions: Sequelize.HasManyCountAssociationsMixin;
     jukeboxSession: JukeboxSession;
     getJukeboxSession: Sequelize.BelongsToGetAssociationMixin<JukeboxSession>;
     setJukeboxSession: Sequelize.BelongsToSetAssociationMixin<JukeboxSession, JukeboxSessionId>;

package/dist/VersusCoCreator.d.ts

@@ -1,37 +1,28 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import type { AppUser, AppUserId } from './AppUser';
-import type { GuestUser, GuestUserId } from './GuestUser';
 import type { Versus, VersusId } from './Versus';
 export interface VersusCoCreatorAttributes {
     versusId: string;
-    appUserId?: string;
-    guestUserId?: string;
-    invitedEmail?: string;
     id: string;
     createdAt: Date;
     updatedAt: Date;
+    appUserId: string;
 }
 export type VersusCoCreatorPk = "id";
 export type VersusCoCreatorId = VersusCoCreator[VersusCoCreatorPk];
-export type VersusCoCreatorOptionalAttributes = "appUserId" | "guestUserId" | "invitedEmail" | "id" | "createdAt" | "updatedAt";
+export type VersusCoCreatorOptionalAttributes = "id" | "createdAt" | "updatedAt";
 export type VersusCoCreatorCreationAttributes = Optional<VersusCoCreatorAttributes, VersusCoCreatorOptionalAttributes>;
 export declare class VersusCoCreator extends Model<VersusCoCreatorAttributes, VersusCoCreatorCreationAttributes> implements VersusCoCreatorAttributes {
     versusId: string;
-    appUserId?: string;
-    guestUserId?: string;
-    invitedEmail?: string;
     id: string;
     createdAt: Date;
     updatedAt: Date;
+    appUserId: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
     createAppUser: Sequelize.BelongsToCreateAssociationMixin<AppUser>;
-    guestUser: GuestUser;
-    getGuestUser: Sequelize.BelongsToGetAssociationMixin<GuestUser>;
-    setGuestUser: Sequelize.BelongsToSetAssociationMixin<GuestUser, GuestUserId>;
-    createGuestUser: Sequelize.BelongsToCreateAssociationMixin<GuestUser>;
     versu: Versus;
     getVersu: Sequelize.BelongsToGetAssociationMixin<Versus>;
     setVersu: Sequelize.BelongsToSetAssociationMixin<Versus, VersusId>;

package/dist/VersusCoCreator.js

@@ -38,29 +38,6 @@ class VersusCoCreator extends sequelize_1.Model {
                 },
                 field: 'versus_id'
             },
-            appUserId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: true,
-                references: {
-                    model: 'app_user',
-                    key: 'id'
-                },
-                field: 'app_user_id'
-            },
-            guestUserId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: true,
-                references: {
-                    model: 'guest_user',
-                    key: 'id'
-                },
-                field: 'guest_user_id'
-            },
-            invitedEmail: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: true,
-                field: 'invited_email'
-            },
             id: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -78,6 +55,15 @@ class VersusCoCreator extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
                 field: 'updated_at'
+            },
+            appUserId: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'app_user',
+                    key: 'id'
+                },
+                field: 'app_user_id'
             }
         }, {
             sequelize,
@@ -92,15 +78,17 @@ class VersusCoCreator extends sequelize_1.Model {
                     ]
                 },
                 {
-                    name: "idx_versus_co_creator_guest_user",
+                    name: "idx_versus_co_creator_versus",
                     fields: [
-                        { name: "guest_user_id" },
+                        { name: "versus_id" },
                     ]
                 },
                 {
-                    name: "idx_versus_co_creator_versus",
+                    name: "uk_versus_co_creator_versus_app_user",
+                    unique: true,
                     fields: [
                         { name: "versus_id" },
+                        { name: "app_user_id" },
                     ]
                 },
                 {

package/dist/VersusOption.d.ts

@@ -4,7 +4,6 @@ import type { AppUser, AppUserId } from './AppUser';
 import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
 import type { CanonArtist, CanonArtistId } from './CanonArtist';
 import type { CanonTrack, CanonTrackId } from './CanonTrack';
-import type { GuestUser, GuestUserId } from './GuestUser';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 import type { PlatformArtist, PlatformArtistId } from './PlatformArtist';
 import type { PlatformTrack, PlatformTrackId } from './PlatformTrack';
@@ -27,11 +26,10 @@ export interface VersusOptionAttributes {
     updatedAt: Date;
     deleted: boolean;
     appUserId?: string;
-    guestUserId?: string;
 }
 export type VersusOptionPk = "id";
 export type VersusOptionId = VersusOption[VersusOptionPk];
-export type VersusOptionOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "id" | "createdAt" | "updatedAt" | "appUserId" | "guestUserId";
+export type VersusOptionOptionalAttributes = "canonTrackId" | "platformTrackId" | "canonAlbumId" | "platformAlbumId" | "canonArtistId" | "platformArtistId" | "voteScore" | "resultsScore" | "id" | "createdAt" | "updatedAt" | "appUserId";
 export type VersusOptionCreationAttributes = Optional<VersusOptionAttributes, VersusOptionOptionalAttributes>;
 export declare class VersusOption extends Model<VersusOptionAttributes, VersusOptionCreationAttributes> implements VersusOptionAttributes {
     versusId: string;
@@ -50,7 +48,6 @@ export declare class VersusOption extends Model<VersusOptionAttributes, VersusOp
     updatedAt: Date;
     deleted: boolean;
     appUserId?: string;
-    guestUserId?: string;
     appUser: AppUser;
     getAppUser: Sequelize.BelongsToGetAssociationMixin<AppUser>;
     setAppUser: Sequelize.BelongsToSetAssociationMixin<AppUser, AppUserId>;
@@ -67,10 +64,6 @@ export declare class VersusOption extends Model<VersusOptionAttributes, VersusOp
     getCanonTrack: Sequelize.BelongsToGetAssociationMixin<CanonTrack>;
     setCanonTrack: Sequelize.BelongsToSetAssociationMixin<CanonTrack, CanonTrackId>;
     createCanonTrack: Sequelize.BelongsToCreateAssociationMixin<CanonTrack>;
-    guestUser: GuestUser;
-    getGuestUser: Sequelize.BelongsToGetAssociationMixin<GuestUser>;
-    setGuestUser: Sequelize.BelongsToSetAssociationMixin<GuestUser, GuestUserId>;
-    createGuestUser: Sequelize.BelongsToCreateAssociationMixin<GuestUser>;
     platformAlbum: PlatformAlbum;
     getPlatformAlbum: Sequelize.BelongsToGetAssociationMixin<PlatformAlbum>;
     setPlatformAlbum: Sequelize.BelongsToSetAssociationMixin<PlatformAlbum, PlatformAlbumId>;

package/dist/VersusOption.js

@@ -147,15 +147,6 @@ class VersusOption extends sequelize_1.Model {
                     key: 'id'
                 },
                 field: 'app_user_id'
-            },
-            guestUserId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: true,
-                references: {
-                    model: 'guest_user',
-                    key: 'id'
-                },
-                field: 'guest_user_id'
             }
         }, {
             sequelize,

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 export * from "./init-models";
-export { initDb } from "./initDb";
+export { initDb, RDS_SSL_CONFIG } from "./initDb";
 export type { InitDbOptions } from "./initDb";

package/dist/index.js

@@ -14,7 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initDb = void 0;
+exports.RDS_SSL_CONFIG = exports.initDb = void 0;
 __exportStar(require("./init-models"), exports);
 var initDb_1 = require("./initDb");
 Object.defineProperty(exports, "initDb", { enumerable: true, get: function () { return initDb_1.initDb; } });
+Object.defineProperty(exports, "RDS_SSL_CONFIG", { enumerable: true, get: function () { return initDb_1.RDS_SSL_CONFIG; } });

package/dist/init-models.js

@@ -549,10 +549,6 @@ function initModels(sequelize) {
     FeedContentType.hasMany(UserEngagementFactor, { as: "userEngagementFactors", foreignKey: "contentTypeId" });
     JukeboxQueueEntry.belongsTo(GuestUser, { as: "trackAddedGuestUser", foreignKey: "trackAddedGuestUserId" });
     GuestUser.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "trackAddedGuestUserId" });
-    VersusCoCreator.belongsTo(GuestUser, { as: "guestUser", foreignKey: "guestUserId" });
-    GuestUser.hasMany(VersusCoCreator, { as: "versusCoCreators", foreignKey: "guestUserId" });
-    VersusOption.belongsTo(GuestUser, { as: "guestUser", foreignKey: "guestUserId" });
-    GuestUser.hasMany(VersusOption, { as: "versusOptions", foreignKey: "guestUserId" });
     JukeboxSession.belongsTo(JukeboxAccessType, { as: "accessType", foreignKey: "accessTypeId" });
     JukeboxAccessType.hasMany(JukeboxSession, { as: "jukeboxSessions", foreignKey: "accessTypeId" });
     JukeboxUser.belongsTo(JukeboxQueueEntry, { as: "pausedQueueEntry", foreignKey: "pausedQueueEntryId" });

package/dist/initDb.d.ts

@@ -4,4 +4,12 @@ export interface InitDbOptions {
     retry?: Options["retry"];
     logging?: Options["logging"];
 }
+/**
+ * TLS settings that validate an RDS endpoint against the bundled AWS RDS CA
+ * bundle. Exported for services that construct their own Sequelize/pg client.
+ */
+export declare const RDS_SSL_CONFIG: Readonly<{
+    ca: string;
+    rejectUnauthorized: true;
+}>;
 export declare function initDb(options?: InitDbOptions): Sequelize;

package/dist/initDb.js

@@ -1,16 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RDS_SSL_CONFIG = void 0;
 exports.initDb = initDb;
 const sequelize_1 = require("sequelize");
 const init_models_1 = require("./init-models");
+const rdsCaBundle_1 = require("./rdsCaBundle");
 const REQUIRED_ENV_VARS = ["PG_DATABASE", "PG_USER", "PG_HOST"];
+/**
+ * TLS settings that validate an RDS endpoint against the bundled AWS RDS CA
+ * bundle. Exported for services that construct their own Sequelize/pg client.
+ */
+exports.RDS_SSL_CONFIG = Object.freeze({
+    ca: rdsCaBundle_1.RDS_GLOBAL_CA_BUNDLE,
+    rejectUnauthorized: true,
+});
 function initDb(options = {}) {
     var _a, _b, _c;
     const missing = REQUIRED_ENV_VARS.filter((v) => !process.env[v]);
     if (missing.length > 0) {
         throw new Error(`Missing required environment variables: ${missing.join(", ")}`);
     }
-    console.log(`Initializing DB connection to ${process.env.PG_HOST}:${process.env.PG_PORT || "5432"}/${process.env.PG_DATABASE}...`);
+    console.log(`Initializing DB connection to ${process.env.PG_HOST}:${process.env.PG_PORT || "5432"}/${process.env.PG_DATABASE}${process.env.PG_SSL === "true" ? " (TLS)" : ""}...`);
     const sequelize = new sequelize_1.Sequelize(process.env.PG_DATABASE, process.env.PG_USER, process.env.PG_PASSWORD, {
         host: process.env.PG_HOST,
         port: parseInt(process.env.PG_PORT || "5432"),
@@ -18,6 +28,7 @@ function initDb(options = {}) {
         schema: "eb",
         minifyAliases: true,
         logging: (_a = options.logging) !== null && _a !== void 0 ? _a : false,
+        dialectOptions: process.env.PG_SSL === "true" ? { ssl: exports.RDS_SSL_CONFIG } : undefined,
         pool: (_b = options.pool) !== null && _b !== void 0 ? _b : {
             max: 10,
             min: 1,

package/dist/rdsCaBundle.d.ts

@@ -0,0 +1 @@
+export declare const RDS_GLOBAL_CA_BUNDLE: string;