fix: database changes to make docker flows easier

Author: Bccorb

.env.example

@@ -18,7 +18,11 @@ DEFAULT_ROLES=user,betaUser
 AVAILABLE_ROLES=user,admin,betaUser,team
 
 # DATABASE
-DATABASE_URL=postgres://myuser:mypassword@localhost:5432/seamless-auth
+DB_HOST=localhost
+DB_PORT=5432
+DB_NAME=seamless-auth
+DB_USER=myuser
+DB_PASSWORD=mypassword
 
 # AUTH CONFIGURATION
 ACCESS_TOKEN_TTL=30m

Dockerfile.dev

@@ -0,0 +1,19 @@
+# NOT a production image
+FROM node:20-alpine
+WORKDIR /app
+
+RUN apk add --no-cache postgresql-client netcat-openbsd
+
+COPY package.json package-lock.json* ./
+RUN npm ci
+
+COPY . .
+RUN mkdir -p ./keys
+
+ENV NODE_ENV=development
+
+EXPOSE 5312
+RUN chmod +x validateEnvs.sh 
+
+ENTRYPOINT ["./validateEnvs.sh"]
+CMD ["npm", "run", "dev"]

README.md

@@ -140,7 +140,11 @@ cp .env.example .env
 At minimum, ensure these values are set:
 
 ```env
-DATABASE_URL=postgres://myuser:mypassword@host:5432/seamless-auth
+DB_HOST=localhost
+DB_PORT=5432
+DB_NAME=seamless-auth
+DB_USER=myuser
+DB_PASSWORD=mypassword
 APP_ORIGIN=http://localhost:5001
 ISSUER=http://localhost:5312
 ```
@@ -163,7 +167,7 @@ docker run -d \
   postgres:15
 ```
 
-Update `DATABASE_URL` accordingly.
+Update DB env values accordingly.
 
 ## 4. Run Seamless Auth Server
 

src/config/config.js

@@ -5,16 +5,37 @@
 module.exports = {
   development: {
     dialect: 'postgres',
-    use_env_variable: 'DATABASE_URL',
+    development: {
+      username: process.env.DB_USER,
+      password: process.env.DB_PASSWORD,
+      database: process.env.DB_NAME,
+      host: process.env.DB_HOST,
+      port: process.env.DB_PORT,
+      dialect: 'postgres',
+    },
     logging: 'false',
   },
   test: {
     dialect: 'postgres',
-    use_env_variable: process.env.TEST_DATABASE_URL,
+    development: {
+      username: process.env.DB_USER,
+      password: process.env.DB_PASSWORD,
+      database: process.env.DB_NAME,
+      host: process.env.DB_HOST,
+      port: process.env.DB_PORT,
+      dialect: 'postgres',
+    },
   },
   production: {
     dialect: 'postgres',
-    use_env_variable: process.env.DATABASE_URL,
+    development: {
+      username: process.env.DB_USER,
+      password: process.env.DB_PASSWORD,
+      database: process.env.DB_NAME,
+      host: process.env.DB_HOST,
+      port: process.env.DB_PORT,
+      dialect: 'postgres',
+    },
     logging: 'false',
   },
 };

src/models/index.ts

@@ -12,8 +12,11 @@ const logger = getLogger('sequelize');
 
 const isProduction = process.env.NODE_ENV === 'production';
 const enableDbLogging = !isProduction && process.env.DB_LOGGING === 'true';
+const { DB_HOST, DB_PORT, DB_NAME, DB_USER, DB_PASSWORD } = process.env;
 
-const sequelize = new Sequelize(process.env.DATABASE_URL ?? '', {
+const DATABASE_URL = `postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}`;
+
+const sequelize = new Sequelize(DATABASE_URL, {
   logging: enableDbLogging ? (msg) => logger.debug(msg) : false,
 });
 

validateEnvs.sh

@@ -1,24 +1,34 @@
 #!/bin/sh
+set -euo pipefail
 
-required_vars=""
+required_vars="APP_NAME APP_ID APP_ORIGIN ISSUER AUTH_MODE DEMO DB_HOST DB_PORT DB_USER DB_PASSWORD DB_NAME DEFAULT_ROLES AVALIABLE_ROLES DB_LOGGING ACCESS_TOKEN_TTL REFRESH_TOKEN_TTL RATE_LIMIT DELAY_AFTER API_SERVICE_TOKEN JWOKS_ACTIVE_KID RPID ORIGINS"
 
 for var in $required_vars; do
   if [ -z "$(eval echo \$$var)" ]; then
-    echo "Environment variable $var is not set!"
-    env
+    echo "Environment variable $var is not set"
     exit 1
   fi
 done
 
 echo "Generating JWKS keys"
-if ! node dist/scripts/initKeys.js; then
-  echo "Key creatione failed to run"
-  exit 1
-fi
-echo "Done Creating JWKS keys"
+npx tsx ./src/scripts/initKeys.ts
+echo "JWKS keys ready"
 
-echo "Running database migrations..."
-npx sequelize-cli db:migrate
+echo "Waiting for database..."
+until nc -z "$DB_HOST" "$DB_PORT"; do
+  sleep 1
+done
+
+echo "Ensuring database exists..."
+export PGPASSWORD="$DB_PASSWORD"
+
+psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres \
+  -tc "SELECT 1 FROM pg_database WHERE datname = '$DB_NAME'" | grep -q 1 \
+  || psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres \
+     -c "CREATE DATABASE \"$DB_NAME\""
+
+echo "Running migrations..."
+npx sequelize-cli db:migrate --debug
 
-echo "Starting server..."
-exec node dist/server.js
+echo "Starting application"
+exec npm run dev