Merge pull request #110 from WXYC/fix/default-auth-port

Allow working deploy with expected 8080 port within container

Author: AyBruno

Dockerfile.auth

@@ -26,6 +26,4 @@ COPY --from=builder ./auth-builder/apps/auth/dist ./apps/auth/dist
 COPY --from=builder ./auth-builder/shared/database/dist ./shared/database/dist
 COPY --from=builder ./auth-builder/shared/authentication/dist ./shared/authentication/dist
 
-EXPOSE 8082
-
 CMD ["npm", "start", "--workspace=@wxyc/auth-service"]

Dockerfile.backend

@@ -26,6 +26,4 @@ COPY --from=builder ./builder/apps/backend/dist ./apps/backend/dist
 COPY --from=builder ./builder/shared/database/dist ./shared/database/dist
 COPY --from=builder ./builder/shared/authentication/dist ./shared/authentication/dist
 
-EXPOSE 8080
-
 CMD ["npm", "start", "--workspace=@wxyc/backend"]

apps/auth/app.ts

@@ -7,7 +7,7 @@ import { toNodeHandler } from 'better-auth/node';
 import cors from 'cors';
 import express from 'express';
 
-const port = process.env.AUTH_PORT || '8082';
+const port = process.env.AUTH_PORT || '8080';
 
 const app = express();
 

apps/backend/app.ts

@@ -14,7 +14,6 @@ import { showMemberMiddleware } from './middleware/checkShowMember.js';
 import { activeShow } from './middleware/checkActiveShow.js';
 import errorHandler from './middleware/errorHandler.js';
 import { requirePermissions } from '@wxyc/authentication';
-// import errorHandler from './middleware/errorHandler';
 
 const port = process.env.PORT || 8080;
 const app = express();
@@ -59,7 +58,7 @@ app.use(
 );
 
 //example for how to use te Cognito auth middleware
-app.get('/testAuth', requirePermissions({ flowsheet: ["read"] }), async (req, res) => {
+app.get('/testAuth', requirePermissions({ flowsheet: ['read'] }), async (req, res) => {
   res.json({ message: 'Authenticated!' });
 });
 

dev_env/docker-compose.yml

@@ -94,10 +94,10 @@ services:
       - DB_USERNAME=${DB_USERNAME}
       - DB_PASSWORD=${DB_PASSWORD}
       - DB_NAME=${DB_NAME}
-      - BETTER_AUTH_URL=http://auth:8082/api/auth
-      - BETTER_AUTH_JWKS_URL=http://auth:8082/api/auth/jwks
-      - BETTER_AUTH_ISSUER=http://auth:8082
-      - BETTER_AUTH_AUDIENCE=http://auth:8082
+      - BETTER_AUTH_URL=http://auth:8080/api/auth
+      - BETTER_AUTH_JWKS_URL=http://auth:8080/api/auth/jwks
+      - BETTER_AUTH_ISSUER=http://auth:8080
+      - BETTER_AUTH_AUDIENCE=http://auth:8080
       - BETTER_AUTH_TRUSTED_ORIGINS=${BETTER_AUTH_TRUSTED_ORIGINS}
       - FRONTEND_SOURCE=${FRONTEND_SOURCE}
       - DEFAULT_ORG_SLUG=${DEFAULT_ORG_SLUG}
@@ -109,7 +109,7 @@ services:
       - DEFAULT_USER_REAL_NAME=${DEFAULT_USER_REAL_NAME}
       - CREATE_DEFAULT_USER=${CREATE_DEFAULT_USER}
     ports:
-      - '${CI_AUTH_PORT:-8083}:8082'
+      - '${CI_AUTH_PORT:-8083}:8080'
 
   backend:
     depends_on:
@@ -130,10 +130,10 @@ services:
       - AUTH_USERNAME=${AUTH_USERNAME}
       - COGNITO_USERPOOL_ID=${COGNITO_USERPOOL_ID}
       - DJ_APP_CLIENT_ID=${DJ_APP_CLIENT_ID}
-      - BETTER_AUTH_URL=http://auth:8082/api/auth
-      - BETTER_AUTH_AUDIENCE=http://auth:8082
-      - BETTER_AUTH_ISSUER=http://auth:8082
-      - BETTER_AUTH_JWKS_URL=http://auth:8082/api/auth/jwks
+      - BETTER_AUTH_URL=http://auth:8080/api/auth
+      - BETTER_AUTH_AUDIENCE=http://auth:8080
+      - BETTER_AUTH_ISSUER=http://auth:8080
+      - BETTER_AUTH_JWKS_URL=http://auth:8080/api/auth/jwks
     ports:
       - '${CI_PORT:-8081}:8080'
 

tests/test.setup.js

@@ -1,5 +1,5 @@
 const get_access_token = require('./utils/better_auth');
-const waitOn = require('wait-on'); // Import wait-on
+const waitOn = require('wait-on');
 
 global.primary_dj_id = 1;
 global.secondary_dj_id = 2;