session state to pg

Author: gallayl

service/src/app-models/data-store/init-models.ts

@@ -3,8 +3,10 @@ import type { Sequelize } from 'sequelize'
 
 import {
   ApiTokenModel,
+  DefaultSessionModel,
   GitHubRepositoryModel,
   PasswordCredentialModel,
+  PasswordResetTokenModel,
   PrerequisiteModel,
   ServiceConfigModel,
   ServiceDefinitionModel,
@@ -234,6 +236,31 @@ export async function initAllModels(sequelize: Sequelize): Promise<void> {
     { sequelize, updatedAt: false },
   )
 
+  DefaultSessionModel.init(
+    {
+      sessionId: { type: DataTypes.STRING, primaryKey: true },
+      username: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        references: { model: UserModel, key: 'username' },
+      },
+    },
+    { sequelize, timestamps: false },
+  )
+
+  PasswordResetTokenModel.init(
+    {
+      token: { type: DataTypes.STRING, primaryKey: true },
+      userName: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        references: { model: UserModel, key: 'username' },
+      },
+      createdAt: { type: DataTypes.DATE },
+    },
+    { sequelize, updatedAt: false },
+  )
+
   // --- Associations ---
 
   UserModel.hasOne(PasswordCredentialModel, { foreignKey: 'userName', onDelete: 'CASCADE' })
@@ -242,6 +269,12 @@ export async function initAllModels(sequelize: Sequelize): Promise<void> {
   UserModel.hasMany(ApiTokenModel, { foreignKey: 'username', onDelete: 'CASCADE' })
   ApiTokenModel.belongsTo(UserModel, { foreignKey: 'username' })
 
+  UserModel.hasMany(DefaultSessionModel, { foreignKey: 'username', onDelete: 'CASCADE' })
+  DefaultSessionModel.belongsTo(UserModel, { foreignKey: 'username' })
+
+  UserModel.hasMany(PasswordResetTokenModel, { foreignKey: 'userName', onDelete: 'CASCADE' })
+  PasswordResetTokenModel.belongsTo(UserModel, { foreignKey: 'userName' })
+
   StackDefinitionModel.hasOne(StackConfigModel, { foreignKey: 'stackName', onDelete: 'CASCADE' })
   StackConfigModel.belongsTo(StackDefinitionModel, { foreignKey: 'stackName' })
 

service/src/app-models/data-store/models.ts

@@ -1,4 +1,5 @@
-import type { PasswordCredential } from '@furystack/security'
+import type { DefaultSession } from '@furystack/rest-service'
+import type { PasswordCredential, PasswordResetToken } from '@furystack/security'
 import type {
   ApiToken,
   EnvironmentVariableValue,
@@ -135,3 +136,17 @@ export class ApiTokenModel extends Model<ApiToken, ApiToken> implements ApiToken
   declare lastUsedAt: string | undefined
   declare createdAt: string
 }
+
+export class DefaultSessionModel extends Model<DefaultSession, DefaultSession> implements DefaultSession {
+  declare sessionId: string
+  declare username: string
+}
+
+export class PasswordResetTokenModel
+  extends Model<PasswordResetToken, PasswordResetToken>
+  implements PasswordResetToken
+{
+  declare userName: string
+  declare token: string
+  declare createdAt: string
+}

service/src/app-models/data-store/setup-data-store.ts

@@ -3,7 +3,8 @@ import { addStore, InMemoryStore } from '@furystack/core'
 import { getLogger } from '@furystack/logging'
 import { getRepository } from '@furystack/repository'
 import { useSequelize } from '@furystack/sequelize-store'
-import { PasswordCredential } from '@furystack/security'
+import { DefaultSession } from '@furystack/rest-service'
+import { PasswordCredential, PasswordResetToken } from '@furystack/security'
 import {
   ApiToken,
   GitHubRepository,
@@ -25,8 +26,10 @@ import { getDbOptions } from './db-options.js'
 import { initAllModels } from './init-models.js'
 import {
   ApiTokenModel,
+  DefaultSessionModel,
   GitHubRepositoryModel,
   PasswordCredentialModel,
+  PasswordResetTokenModel,
   PrerequisiteModel,
   ServiceConfigModel,
   ServiceDefinitionModel,
@@ -134,6 +137,22 @@ const registerSequelizeStores = (injector: Injector, dbOptions: ReturnType<typeo
     options: dbOptions,
     initModel: initOnce,
   })
+  useSequelize({
+    injector,
+    model: DefaultSession,
+    sequelizeModel: DefaultSessionModel,
+    primaryKey: 'sessionId',
+    options: dbOptions,
+    initModel: initOnce,
+  })
+  useSequelize({
+    injector,
+    model: PasswordResetToken,
+    sequelizeModel: PasswordResetTokenModel,
+    primaryKey: 'token',
+    options: dbOptions,
+    initModel: initOnce,
+  })
 }
 
 const registerDataSets = (injector: Injector) => {
@@ -149,6 +168,8 @@ const registerDataSets = (injector: Injector) => {
   repo.createDataSet(ServiceStatus, 'serviceId', { ...authorizedDataSet })
   repo.createDataSet(ServiceStateHistory, 'id', { ...authorizedDataSet })
   repo.createDataSet(ApiToken, 'id', { ...authorizedDataSet })
+  repo.createDataSet(DefaultSession, 'sessionId')
+  repo.createDataSet(PasswordResetToken, 'token')
   repo.createDataSet(PrerequisiteCheckResult, 'prerequisiteId', { ...authorizedDataSet })
 
   addStore(injector, new InMemoryStore({ model: ServiceGitStatus, primaryKey: 'serviceId' }))

service/src/config.ts

@@ -5,8 +5,7 @@ import { useLogging } from '@furystack/logging'
 import { FilteredConsoleLogger } from './utils/filtered-console-logger.js'
 import type { AuthorizationResult } from '@furystack/repository'
 import { getRepository } from '@furystack/repository'
-import { DefaultSession } from '@furystack/rest-service'
-import { PasswordResetToken, usePasswordPolicy } from '@furystack/security'
+import { usePasswordPolicy } from '@furystack/security'
 import { PrerequisiteCheckResult, PublicApiToken } from 'common'
 
 export const authorizedOnly = async (options: { injector: Injector }): Promise<AuthorizationResult> => {
@@ -30,13 +29,10 @@ export const authorizedDataSet = {
 export const injector = new Injector()
 useLogging(injector, FilteredConsoleLogger)
 
-addStore(injector, new InMemoryStore({ model: DefaultSession, primaryKey: 'sessionId' }))
-  .addStore(new InMemoryStore({ model: PublicApiToken, primaryKey: 'id' }))
-  .addStore(new InMemoryStore({ model: PrerequisiteCheckResult, primaryKey: 'prerequisiteId' }))
-  .addStore(new InMemoryStore({ model: PasswordResetToken, primaryKey: 'token' }))
+addStore(injector, new InMemoryStore({ model: PublicApiToken, primaryKey: 'id' })).addStore(
+  new InMemoryStore({ model: PrerequisiteCheckResult, primaryKey: 'prerequisiteId' }),
+)
 
-getRepository(injector).createDataSet(DefaultSession, 'sessionId')
 getRepository(injector).createDataSet(PublicApiToken, 'id', { ...authorizedDataSet })
-getRepository(injector).createDataSet(PasswordResetToken, 'token')
 
 usePasswordPolicy(injector)