From bdb63e99d5d8a69aa80601ef7188aa1e827f1fa6 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Fri, 3 Nov 2023 23:30:46 +0530 Subject: [PATCH 1/6] fix: pin @lezer/highlight to 1.1.4 to prevent page breaks --- packages/codemirror-lang-graphql/package.json | 4 +- packages/hoppscotch-common/package.json | 6 +- pnpm-lock.yaml | 117 ++++++------------ 3 files changed, 42 insertions(+), 85 deletions(-) diff --git a/packages/codemirror-lang-graphql/package.json b/packages/codemirror-lang-graphql/package.json index af2c97d9b..b644e04e4 100644 --- a/packages/codemirror-lang-graphql/package.json +++ b/packages/codemirror-lang-graphql/package.json @@ -17,8 +17,8 @@ "types": "dist/index.d.ts", "sideEffects": false, "dependencies": { - "@codemirror/language": "^6.9.1", - "@lezer/highlight": "^1.1.6", + "@codemirror/language": "^6.9.2", + "@lezer/highlight": "1.1.4", "@lezer/lr": "^1.3.13" }, "devDependencies": { diff --git a/packages/hoppscotch-common/package.json b/packages/hoppscotch-common/package.json index 8cb17eb43..1427d26a7 100644 --- a/packages/hoppscotch-common/package.json +++ b/packages/hoppscotch-common/package.json @@ -27,12 +27,12 @@ "@codemirror/lang-javascript": "^6.2.1", "@codemirror/lang-json": "^6.0.1", "@codemirror/lang-xml": "^6.0.2", - "@codemirror/language": "^6.9.1", + "@codemirror/language": "^6.9.2", "@codemirror/legacy-modes": "^6.3.3", "@codemirror/lint": "^6.4.2", "@codemirror/search": "^6.5.4", "@codemirror/state": "^6.3.1", - "@codemirror/view": "^6.21.3", + "@codemirror/view": "^6.22.0", "@fontsource-variable/inter": "^5.0.8", "@fontsource-variable/material-symbols-rounded": "^5.0.7", "@fontsource-variable/roboto-mono": "^5.0.9", @@ -41,7 +41,7 @@ "@hoppscotch/js-sandbox": "workspace:^", "@hoppscotch/ui": "workspace:^", "@hoppscotch/vue-toasted": "^0.1.0", - "@lezer/highlight": "^1.1.6", + "@lezer/highlight": "1.1.4", "@urql/core": "^4.1.1", "@urql/devtools": "^2.0.3", "@urql/exchange-auth": "^2.1.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52774b8f9..56d85a873 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,11 +35,11 @@ importers: packages/codemirror-lang-graphql: dependencies: '@codemirror/language': - specifier: ^6.9.1 + specifier: ^6.9.2 version: 6.9.2 '@lezer/highlight': - specifier: ^1.1.6 - version: 1.1.6 + specifier: 1.1.4 + version: 1.1.4 '@lezer/lr': specifier: ^1.3.13 version: 1.3.13 @@ -372,7 +372,7 @@ importers: version: 10.1.0(openapi-types@12.1.3) '@codemirror/autocomplete': specifier: ^6.10.2 - version: 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.1.0) + version: 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.1.0) '@codemirror/commands': specifier: ^6.3.0 version: 6.3.0 @@ -384,9 +384,9 @@ importers: version: 6.0.1 '@codemirror/lang-xml': specifier: ^6.0.2 - version: 6.0.2(@codemirror/view@6.21.4) + version: 6.0.2(@codemirror/view@6.22.0) '@codemirror/language': - specifier: ^6.9.1 + specifier: ^6.9.2 version: 6.9.2 '@codemirror/legacy-modes': specifier: ^6.3.3 @@ -401,8 +401,8 @@ importers: specifier: ^6.3.1 version: 6.3.1 '@codemirror/view': - specifier: ^6.21.3 - version: 6.21.4 + specifier: ^6.22.0 + version: 6.22.0 '@fontsource-variable/inter': specifier: ^5.0.8 version: 5.0.8 @@ -428,8 +428,8 @@ importers: specifier: ^0.1.0 version: 0.1.0(vue@3.3.4) '@lezer/highlight': - specifier: ^1.1.6 - version: 1.1.6 + specifier: 1.1.4 + version: 1.1.4 '@urql/core': specifier: ^4.1.1 version: 4.1.1(graphql@16.8.0) @@ -800,7 +800,7 @@ importers: version: 5.2.2 vite: specifier: ^4.5.0 - version: 4.5.0(@types/node@17.0.27) + version: 4.5.0(@types/node@17.0.27)(sass@1.53.0)(terser@5.24.0) packages/hoppscotch-js-sandbox: dependencies: @@ -4182,7 +4182,7 @@ packages: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true - /@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.0.3): + /@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.0.3): resolution: {integrity: sha512-3dCL7b0j2GdtZzWN5j7HDpRAJ26ip07R4NGYz7QYthIYMiX8I4E4TNrYcdTayPJGeVQtd/xe7lWU4XL7THFb/w==} peerDependencies: '@codemirror/language': ^6.0.0 @@ -4192,11 +4192,11 @@ packages: dependencies: '@codemirror/language': 6.9.2 '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 '@lezer/common': 1.0.3 dev: false - /@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.1.0): + /@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.1.0): resolution: {integrity: sha512-3dCL7b0j2GdtZzWN5j7HDpRAJ26ip07R4NGYz7QYthIYMiX8I4E4TNrYcdTayPJGeVQtd/xe7lWU4XL7THFb/w==} peerDependencies: '@codemirror/language': ^6.0.0 @@ -4206,7 +4206,7 @@ packages: dependencies: '@codemirror/language': 6.9.2 '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 '@lezer/common': 1.1.0 dev: false @@ -4215,17 +4215,17 @@ packages: dependencies: '@codemirror/language': 6.9.2 '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 '@lezer/common': 1.1.0 /@codemirror/lang-javascript@6.2.1: resolution: {integrity: sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==} dependencies: - '@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.1.0) + '@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.1.0) '@codemirror/language': 6.9.2 '@codemirror/lint': 6.4.2 '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 '@lezer/common': 1.1.0 '@lezer/javascript': 1.4.5 dev: false @@ -4236,10 +4236,10 @@ packages: '@codemirror/language': 6.9.2 '@lezer/json': 1.0.1 - /@codemirror/lang-xml@6.0.2(@codemirror/view@6.21.4): + /@codemirror/lang-xml@6.0.2(@codemirror/view@6.22.0): resolution: {integrity: sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==} dependencies: - '@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.0.3) + '@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.0.3) '@codemirror/language': 6.9.2 '@codemirror/state': 6.3.1 '@lezer/common': 1.0.3 @@ -4252,11 +4252,11 @@ packages: resolution: {integrity: sha512-QGTQXSpAKDIzaSE96zNK1UfIUhPgkT1CLjh1N5qVzZuxgsEOhz5RqaN8QCIdyOQklGLx3MgHd9YrE3X3+Pl1ow==} dependencies: '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 '@lezer/common': 1.1.0 - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.1.4 '@lezer/lr': 1.3.13 - style-mod: 4.0.3 + style-mod: 4.1.0 /@codemirror/legacy-modes@6.3.3: resolution: {integrity: sha512-X0Z48odJ0KIoh/HY8Ltz75/4tDYc9msQf1E/2trlxFaFFhgjpVHjZ/BCXe1Lk7s4Gd67LL/CeEEHNI+xHOiESg==} @@ -4268,14 +4268,14 @@ packages: resolution: {integrity: sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==} dependencies: '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 crelt: 1.0.6 /@codemirror/search@6.5.4: resolution: {integrity: sha512-YoTrvjv9e8EbPs58opjZKyJ3ewFrVSUzQ/4WXlULQLSDDr1nGPJ67mMXFNNVYwdFhybzhrzrtqgHmtpJwIF+8g==} dependencies: '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 crelt: 1.0.6 dev: false @@ -4287,12 +4287,12 @@ packages: dependencies: '@codemirror/language': 6.9.2 '@codemirror/state': 6.3.1 - '@codemirror/view': 6.21.4 - '@lezer/highlight': 1.1.6 + '@codemirror/view': 6.22.0 + '@lezer/highlight': 1.1.4 dev: true - /@codemirror/view@6.21.4: - resolution: {integrity: sha512-WKVZ7nvN0lwWPfAf05WxWqTpwjC8YN3q5goj3CsSig7//DD81LULgOx3nBegqpqP0iygBqRmW8z0KSc2QTAdAg==} + /@codemirror/view@6.22.0: + resolution: {integrity: sha512-6zLj4YIoIpfTGKrDMTbeZRpa8ih4EymMCKmddEDcJWrCdp/N1D46B38YEz4creTb4T177AVS9EyXkLeC/HL2jA==} dependencies: '@codemirror/state': 6.3.1 style-mod: 4.1.0 @@ -7663,7 +7663,7 @@ packages: '@codemirror/lint': 6.4.2 '@codemirror/state': 6.3.1 '@codemirror/theme-one-dark': 6.1.0 - '@codemirror/view': 6.21.4 + '@codemirror/view': 6.22.0 '@histoire/vendors': 0.12.4 dev: true @@ -8652,9 +8652,6 @@ packages: resolution: {integrity: sha512-JH4wAXCgUOcCGNekQPLhVeUtIqjH0yPBs7vvUdSjyQama9618IOKFJwkv2kcqdhF0my8hQEgCTEJU0GIgnahvA==} dev: false - /@lezer/common@1.0.4: - resolution: {integrity: sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg==} - /@lezer/common@1.1.0: resolution: {integrity: sha512-XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw==} @@ -8666,22 +8663,22 @@ packages: '@lezer/lr': 1.3.13 dev: true - /@lezer/highlight@1.1.6: - resolution: {integrity: sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==} + /@lezer/highlight@1.1.4: + resolution: {integrity: sha512-IECkFmw2l7sFcYXrV8iT9GeY4W0fU4CxX0WMwhmhMIVjoDdD1Hr6q3G2NqVtLg/yVe5n7i4menG3tJ2r4eCrPQ==} dependencies: - '@lezer/common': 1.0.4 + '@lezer/common': 1.1.0 /@lezer/javascript@1.4.5: resolution: {integrity: sha512-FmBUHz8K1V22DgjTd6SrIG9owbzOYZ1t3rY6vGEmw+e2RVBd7sqjM8uXEVRFmfxKFn1Mx2ABJehHjrN3G2ZpmA==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.1.4 '@lezer/lr': 1.3.13 dev: false /@lezer/json@1.0.1: resolution: {integrity: sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.1.4 '@lezer/lr': 1.3.13 /@lezer/lr@1.3.13: @@ -8692,7 +8689,7 @@ packages: /@lezer/xml@1.0.2: resolution: {integrity: sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.1.4 '@lezer/lr': 1.3.13 dev: false @@ -22919,9 +22916,6 @@ packages: pick-util: 1.1.5 dev: false - /style-mod@4.0.3: - resolution: {integrity: sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw==} - /style-mod@4.1.0: resolution: {integrity: sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==} @@ -25308,7 +25302,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@4.5.0(@types/node@17.0.27): + /vite@4.5.0(@types/node@17.0.27)(sass@1.53.0)(terser@5.24.0): resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -25340,48 +25334,11 @@ packages: esbuild: 0.18.20 postcss: 8.4.31 rollup: 3.29.4 - optionalDependencies: - fsevents: 2.3.3 - dev: true - - /vite@4.5.0(@types/node@17.0.27)(sass@1.53.0)(terser@5.24.0): - resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 17.0.27 - esbuild: 0.18.20 - postcss: 8.4.28 - rollup: 3.29.4 sass: 1.53.0 terser: 5.24.0 optionalDependencies: fsevents: 2.3.3 dev: true - optional: true /vitest@0.29.8: resolution: {integrity: sha512-JIAVi2GK5cvA6awGpH0HvH/gEG9PZ0a/WoxdiV3PmqK+3CjQMf8c+J/Vhv4mdZ2nRyXFw66sAg6qz7VNkaHfDQ==} From 0aa5825d8b85476413b821762d1d98edbb67ff5b Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Mon, 6 Nov 2023 10:56:15 +0530 Subject: [PATCH 2/6] fix: cleanup ui and improve consistency in input elements (#3494) --- .../src/components/collections/index.vue | 9 ++++----- .../src/components/environments/Selector.vue | 2 +- .../hoppscotch-common/src/components/graphql/Sidebar.vue | 2 +- .../hoppscotch-common/src/components/history/index.vue | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/hoppscotch-common/src/components/collections/index.vue b/packages/hoppscotch-common/src/components/collections/index.vue index c19e6dbfe..c903a068f 100644 --- a/packages/hoppscotch-common/src/components/collections/index.vue +++ b/packages/hoppscotch-common/src/components/collections/index.vue @@ -18,13 +18,12 @@ " > - - diff --git a/packages/hoppscotch-common/src/components/environments/Selector.vue b/packages/hoppscotch-common/src/components/environments/Selector.vue index d9dcd1ad0..497076666 100644 --- a/packages/hoppscotch-common/src/components/environments/Selector.vue +++ b/packages/hoppscotch-common/src/components/environments/Selector.vue @@ -66,7 +66,7 @@ />
From 4a154e6569150b43baa71bb31c9f711103e719ec Mon Sep 17 00:00:00 2001 From: Anwarul Islam Date: Mon, 6 Nov 2023 11:55:03 +0600 Subject: [PATCH 3/6] chore: fix spelling mistake on type import (#3487) --- packages/hoppscotch-common/src/components/http/Headers.vue | 4 ++-- packages/hoppscotch-common/src/helpers/actions.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/hoppscotch-common/src/components/http/Headers.vue b/packages/hoppscotch-common/src/components/http/Headers.vue index da9a9561c..30e400b09 100644 --- a/packages/hoppscotch-common/src/components/http/Headers.vue +++ b/packages/hoppscotch-common/src/components/http/Headers.vue @@ -256,7 +256,7 @@ import * as E from "fp-ts/Either" import * as O from "fp-ts/Option" import * as A from "fp-ts/Array" import draggable from "vuedraggable-es" -import { RequestOptionTabs } from "./RequestOptions.vue" +import { RESTOptionTabs } from "./RequestOptions.vue" import { useCodemirror } from "@composables/codemirror" import { commonHeaders } from "~/helpers/headers" import { useI18n } from "@composables/i18n" @@ -295,7 +295,7 @@ const deletionToast = ref<{ goAway: (delay: number) => void } | null>(null) const props = defineProps<{ modelValue: HoppRESTRequest }>() const emit = defineEmits<{ - (e: "change-tab", value: RequestOptionTabs): void + (e: "change-tab", value: RESTOptionTabs): void (e: "update:modelValue", value: HoppRESTRequest): void }>() diff --git a/packages/hoppscotch-common/src/helpers/actions.ts b/packages/hoppscotch-common/src/helpers/actions.ts index d59df7839..2e1923845 100644 --- a/packages/hoppscotch-common/src/helpers/actions.ts +++ b/packages/hoppscotch-common/src/helpers/actions.ts @@ -6,7 +6,7 @@ import { Ref, onBeforeUnmount, onMounted, reactive, watch } from "vue" import { BehaviorSubject } from "rxjs" import { HoppRESTDocument } from "./rest/document" import { HoppGQLRequest, HoppRESTRequest } from "@hoppscotch/data" -import { RequestOptionTabs } from "~/components/http/RequestOptions.vue" +import { RESTOptionTabs } from "~/components/http/RequestOptions.vue" import { HoppGQLSaveContext } from "./graphql/document" import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue" import { computed } from "vue" @@ -113,7 +113,7 @@ type HoppActionArgsMap = { request: HoppGQLRequest } "request.open-tab": { - tab: RequestOptionTabs | GQLOptionTabs + tab: RESTOptionTabs | GQLOptionTabs } "tab.duplicate-tab": { From 5428a738117b6f14278d1109fdaaf28850c46e27 Mon Sep 17 00:00:00 2001 From: Nicolas Merget <104347736+nmerget@users.noreply.github.com> Date: Mon, 6 Nov 2023 06:55:39 +0100 Subject: [PATCH 4/6] fix: add optional chaining for teamMembers to handle undefined team (#3484) Co-authored-by: James George --- packages/hoppscotch-common/src/components/teams/Edit.vue | 4 ++-- packages/hoppscotch-common/src/components/teams/Invite.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/hoppscotch-common/src/components/teams/Edit.vue b/packages/hoppscotch-common/src/components/teams/Edit.vue index 90fc88656..28129a90b 100644 --- a/packages/hoppscotch-common/src/components/teams/Edit.vue +++ b/packages/hoppscotch-common/src/components/teams/Edit.vue @@ -35,12 +35,12 @@ v-if=" !teamDetails.loading && E.isRight(teamDetails.data) && - teamDetails.data.right.team.teamMembers + teamDetails.data.right.team?.teamMembers " class="border rounded border-divider" >
@@ -122,7 +122,7 @@ From 76af7d5e10952e61a26f475ad3ac48f8e35f4628 Mon Sep 17 00:00:00 2001 From: Balu Babu Date: Mon, 6 Nov 2023 17:25:36 +0530 Subject: [PATCH 5/6] fix: mailer template issue (#3475) --- .../src/admin/admin.service.ts | 2 +- .../src/auth/auth.service.ts | 2 +- .../src/mailer/MailDescriptions.ts | 4 +- .../src/mailer/mailer.service.ts | 2 +- .../src/mailer/templates/team-invitation.hbs | 114 +++++++++--------- ...{code-your-own.hbs => user-invitation.hbs} | 0 6 files changed, 62 insertions(+), 62 deletions(-) rename packages/hoppscotch-backend/src/mailer/templates/{code-your-own.hbs => user-invitation.hbs} (100%) diff --git a/packages/hoppscotch-backend/src/admin/admin.service.ts b/packages/hoppscotch-backend/src/admin/admin.service.ts index 1ac4102ae..98c5d254b 100644 --- a/packages/hoppscotch-backend/src/admin/admin.service.ts +++ b/packages/hoppscotch-backend/src/admin/admin.service.ts @@ -74,7 +74,7 @@ export class AdminService { try { await this.mailerService.sendUserInvitationEmail(inviteeEmail, { - template: 'code-your-own', + template: 'user-invitation', variables: { inviteeEmail: inviteeEmail, magicLink: `${process.env.VITE_BASE_URL}`, diff --git a/packages/hoppscotch-backend/src/auth/auth.service.ts b/packages/hoppscotch-backend/src/auth/auth.service.ts index 63e59ac2a..a794a1da2 100644 --- a/packages/hoppscotch-backend/src/auth/auth.service.ts +++ b/packages/hoppscotch-backend/src/auth/auth.service.ts @@ -229,7 +229,7 @@ export class AuthService { } await this.mailerService.sendEmail(email, { - template: 'code-your-own', + template: 'user-invitation', variables: { inviteeEmail: email, magicLink: `${url}/enter?token=${generatedTokens.token}`, diff --git a/packages/hoppscotch-backend/src/mailer/MailDescriptions.ts b/packages/hoppscotch-backend/src/mailer/MailDescriptions.ts index 864b01c79..6582e531a 100644 --- a/packages/hoppscotch-backend/src/mailer/MailDescriptions.ts +++ b/packages/hoppscotch-backend/src/mailer/MailDescriptions.ts @@ -8,7 +8,7 @@ export type MailDescription = { }; export type UserMagicLinkMailDescription = { - template: 'code-your-own'; + template: 'user-invitation'; variables: { inviteeEmail: string; magicLink: string; @@ -16,7 +16,7 @@ export type UserMagicLinkMailDescription = { }; export type AdminUserInvitationMailDescription = { - template: 'code-your-own'; + template: 'user-invitation'; variables: { inviteeEmail: string; magicLink: string; diff --git a/packages/hoppscotch-backend/src/mailer/mailer.service.ts b/packages/hoppscotch-backend/src/mailer/mailer.service.ts index 8a03d6e57..b61514225 100644 --- a/packages/hoppscotch-backend/src/mailer/mailer.service.ts +++ b/packages/hoppscotch-backend/src/mailer/mailer.service.ts @@ -27,7 +27,7 @@ export class MailerService { case 'team-invitation': return `${mailDesc.variables.invitee} invited you to join ${mailDesc.variables.invite_team_name} in Hoppscotch`; - case 'code-your-own': + case 'user-invitation': return 'Sign in to Hoppscotch'; } } diff --git a/packages/hoppscotch-backend/src/mailer/templates/team-invitation.hbs b/packages/hoppscotch-backend/src/mailer/templates/team-invitation.hbs index b1128a9ae..3618686ef 100644 --- a/packages/hoppscotch-backend/src/mailer/templates/team-invitation.hbs +++ b/packages/hoppscotch-backend/src/mailer/templates/team-invitation.hbs @@ -14,7 +14,7 @@ -->