Merge branch 'master' of github.com:AletheiaFact/aletheia into stage

AletheiaFact · Jul 30, 2024 · bc4581f · bc4581f
2 parents 5b55e2c + c0233f3
commit bc4581f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml
@@ -92,6 +92,8 @@ jobs:
         env:
           RECAPTCHA_SECRET: ${{ secrets.RECAPTCHA_SECRETKEY }}
         run: |
+          sed -i "s%ZENVIA_API_URL%$ZENVIA_API_URL%g" config.$ENVIRONMENT.yaml
+          sed -i "s%ZENVIA_API_TOKEN%$ZENVIA_API_TOKEN%g" config.$ENVIRONMENT.yaml
           sed -i "s/ENV/$ENVIRONMENT/g" config.$ENVIRONMENT.yaml
           sed -i "s%RECAPTCHA_SECRET%$RECAPTCHA_SECRET%g" config.$ENVIRONMENT.yaml
           sed -i "s%MONGODB_URI%$MONGODB_URI%g" config.$ENVIRONMENT.yaml
@@ -107,8 +109,6 @@ jobs:
           sed -i "s%NOVU_APPLICATION_IDENTIFIER%$NOVU_APPLICATION_IDENTIFIER%g" config.$ENVIRONMENT.yaml
           sed -i "s%AGENTS_API_URL%$AGENTS_API_URL%g" config.$ENVIRONMENT.yaml
           sed -i "s%OPENAI_API_KEY%$OPENAI_API_KEY%g" config.$ENVIRONMENT.yaml
-          sed -i "s%ZENVIA_API_URL%$ZENVIA_API_URL%g" config.$ENVIRONMENT.yaml
-          sed -i "s%ZENVIA_API_TOKEN%$ZENVIA_API_TOKEN%g" config.$ENVIRONMENT.yaml
 
       - name: Set migrate-mongo-config.ts
         run: |

diff --git a/config.production.yaml b/config.production.yaml
@@ -23,7 +23,7 @@ services:
       ory:
         url: ORY_SDK_URL
         admin_url: ORY_SDK_URL
-        admin_endpoint: api/kratos/admin 
+        admin_endpoint: admin 
         access_token: ORY_ACCESS_TOKEN
         schema_id: ALETHEIA_SCHEMA_ID
       feature_flag:

diff --git a/server/app.module.ts b/server/app.module.ts
@@ -99,7 +99,6 @@ export class AppModule implements NestModule {
             SentenceModule,
             StatsModule,
             ViewModule,
-            HomeModule,
             EmailModule,
             SitemapModule,
             OryModule,
@@ -125,6 +124,7 @@ export class AppModule implements NestModule {
             VerificationRequestModule,
             FeatureFlagModule,
             GroupModule,
+            HomeModule, // Home module must be the last imported module because it contains the root endpoint, may causing some endpoints to be confused as namespace parameters
         ];
         if (options.feature_flag) {
             imports.push(