Merge branch 'next' into nv-2906-remove-the-is_topic_notification_ena…

…bled-feature-flag
novuhq · May 7, 2024 · f294347 · f294347
2 parents 300fa2c + d48836b
commit f294347
Show file tree

Hide file tree

Showing 870 changed files with 5,025 additions and 16,561 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -640,6 +640,15 @@
     "whatsapp",
     "whatsappbusiness",
     "parens",
+    "Webpush",
+    "webpush",
+    "xkeysib",
+    "firestore",
+    "firsttris",
+    "esbenp",
+    "npmjs",
+    "maxage",
+    "unpublish"
   ],
   "flagWords": [],
   "patterns": [

diff --git a/.github/workflows/reusable-webhook-e2e.yml b/.github/workflows/reusable-webhook-e2e.yml
@@ -28,4 +28,3 @@ jobs:
     - name: Run a test
       run: |
         cd apps/webhook && pnpm test:e2e
-        pnpm test
diff --git a/.gitignore b/.gitignore
@@ -109,3 +109,4 @@ docker/.env
 # EE Symlinked folders - we need these for the EE build
 # @TODO - find a way to remove the symlinks without breaking the build
 !enterprise/packages/**/src
+/.idea/jsLinters/eslint.xml
diff --git a/.idea/nx-angular-config.xml b/.idea/nx-angular-config.xml
diff --git a/README.md b/README.md
@@ -262,7 +262,6 @@ We are more than happy to help you. If you are getting any errors or facing prob
 Novu is licensed under the MIT License - see the [LICENSE](https://github.com/novuhq/novu/blob/main/LICENSE) file for details.
 
 ## 💪 Thanks To All Contributors
-
 Thanks a lot for spending your time helping Novu grow. Keep rocking 🥂
 
 <a href="https://novu.co/contributors?utm_source=github">

diff --git a/_templates/provider/new/.czrc.ejs.t b/_templates/provider/new/.czrc.ejs.t
diff --git a/_templates/provider/new/.eslintrc.json.ejs.t b/_templates/provider/new/.eslintrc.json.ejs.t
diff --git a/_templates/provider/new/.gitignore.ejs.t b/_templates/provider/new/.gitignore.ejs.t
diff --git a/_templates/provider/new/README.ejs.t b/_templates/provider/new/README.ejs.t
diff --git a/_templates/provider/new/jest.config.js.ejs.t b/_templates/provider/new/jest.config.js.ejs.t
diff --git a/_templates/provider/new/package.ejs.t b/_templates/provider/new/package.ejs.t
diff --git a/_templates/provider/new/prompt.js b/_templates/provider/new/prompt.js
diff --git a/_templates/provider/new/src/index.ejs.t b/_templates/provider/new/src/index.ejs.t
diff --git a/_templates/provider/new/src/lib/provider.ejs.t b/_templates/provider/new/src/lib/provider.ejs.t
diff --git a/_templates/provider/new/src/lib/test.provider.spec.ejs.t b/_templates/provider/new/src/lib/test.provider.spec.ejs.t
diff --git a/_templates/provider/new/tsconfig.json.ejs.t b/_templates/provider/new/tsconfig.json.ejs.t
diff --git a/_templates/provider/new/tsconfig.module.json.ejs.t b/_templates/provider/new/tsconfig.module.json.ejs.t
diff --git a/apps/api/src/app/auth/usecases/password-reset-request/password-reset-request.usecase.ts b/apps/api/src/app/auth/usecases/password-reset-request/password-reset-request.usecase.ts
@@ -60,7 +60,7 @@ export class PasswordResetRequest {
   private static getResetRedirectLink(token: string, user: UserEntity, src?: PasswordResetFlowEnum): string {
     // ensure that only users without passwords are allowed to reset
     if (src === PasswordResetFlowEnum.USER_PROFILE && !user.password) {
-      return `${process.env.FRONT_BASE_URL}/settings/profile?token=${token}`;
+      return `${process.env.FRONT_BASE_URL}/settings/profile?token=${token}&view=password`;
     }
 
     /**