fix: mount oauth and healthz routes correctly when specifying AUTH_AP…

…I_PREFIX
nhost · Nov 7, 2023 · 7feffaa · 7feffaa
1 parent 5663eec
commit 7feffaa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -1,3 +1,5 @@
+import { sendError } from '@/errors';
+import { ReasonPhrases } from 'http-status-codes';
 import { json } from 'body-parser';
 import cors from 'cors';
 import express from 'express';
@@ -46,4 +48,16 @@ process.on('uncaughtException', (err, origin) => {
   process.exit(1);
 });
 
+/**
+ * GET /healthz
+ * @summary Check if the server is up and running
+ * @return 200 - Success - application/json
+ * @tags General
+ */
+app.get('/healthz', (_req, res) => res.json(ReasonPhrases.OK));
+
+app.use('/', (_req, res) => {
+  return sendError(res,  'bad-request');
+});
+
 export { app };
diff --git a/src/errors.ts b/src/errors.ts
@@ -26,6 +26,10 @@ const asErrors = <T>(et: {
 }) => et;
 
 export const ERRORS = asErrors({
+  'bad-request': {
+    status: StatusCodes.BAD_REQUEST,
+    message: 'Bad Request',
+  },
   'route-not-found': {
     status: StatusCodes.NOT_FOUND,
     message: 'Route not found',

diff --git a/src/routes/index.ts b/src/routes/index.ts
@@ -1,6 +1,5 @@
 import { sendError } from '@/errors';
 import * as express from 'express';
-import { ReasonPhrases } from 'http-status-codes';
 import nocache from 'nocache';
 import env from './env';
 import { mfaRouter } from './mfa';
@@ -16,14 +15,6 @@ import { verifyRouter } from './verify';
 const router = express.Router();
 router.use(nocache());
 
-/**
- * GET /healthz
- * @summary Check if the server is up and running
- * @return 200 - Success - application/json
- * @tags General
- */
-router.get('/healthz', (_req, res) => res.json(ReasonPhrases.OK));
-
 /**
  * GET /version
  * @summary Get the current Hasura-auth version

diff --git a/src/routes/oauth/utils.ts b/src/routes/oauth/utils.ts
@@ -139,7 +139,7 @@ export const createGrantConfig = (): GrantConfig =>
     {
       defaults: {
         origin: ENV.AUTH_SERVER_URL,
-        prefix: OAUTH_ROUTE,
+        prefix: `${ENV.AUTH_API_PREFIX}${OAUTH_ROUTE}`,
         transport: 'session',
         scope: ['email', 'profile'],
         response: ['tokens', 'email', 'profile', 'jwt'],