From fafed69339841e66986907e5c7906d803d5a9c8d Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 29 Aug 2022 14:46:47 +0530 Subject: [PATCH] fix(gui-v2): update invite url Signed-off-by: Pranav C --- .../components/tabs/auth/user-management/UsersModal.vue | 2 +- packages/nc-gui-v2/package-lock.json | 3 +++ packages/nocodb/src/lib/meta/api/projectUserApis.ts | 2 +- packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/nc-gui-v2/components/tabs/auth/user-management/UsersModal.vue b/packages/nc-gui-v2/components/tabs/auth/user-management/UsersModal.vue index 29ced03638..b472a32975 100644 --- a/packages/nc-gui-v2/components/tabs/auth/user-management/UsersModal.vue +++ b/packages/nc-gui-v2/components/tabs/auth/user-management/UsersModal.vue @@ -103,7 +103,7 @@ const saveUser = async () => { } } -const inviteUrl = $computed(() => (usersData.invitationToken ? `${dashboardUrl}/signup/${usersData.invitationToken}` : null)) +const inviteUrl = $computed(() => (usersData.invitationToken ? `${dashboardUrl}#/signup/${usersData.invitationToken}` : null)) const copyUrl = async () => { if (!inviteUrl) return diff --git a/packages/nc-gui-v2/package-lock.json b/packages/nc-gui-v2/package-lock.json index 90b27462c7..850280afe5 100644 --- a/packages/nc-gui-v2/package-lock.json +++ b/packages/nc-gui-v2/package-lock.json @@ -78,6 +78,7 @@ }, "../nocodb-sdk": { "version": "0.92.4", + "hasInstallScript": true, "license": "MIT", "dependencies": { "axios": "^0.21.1", @@ -104,6 +105,7 @@ "open-cli": "^6.0.1", "prettier": "^2.1.1", "standard-version": "^9.0.0", + "swagger-typescript-api": "^10.0.1", "ts-node": "^9.0.0", "typedoc": "^0.22.17", "typescript": "^4.0.2" @@ -22961,6 +22963,7 @@ "open-cli": "^6.0.1", "prettier": "^2.1.1", "standard-version": "^9.0.0", + "swagger-typescript-api": "^10.0.1", "ts-node": "^9.0.0", "typedoc": "^0.22.17", "typescript": "^4.0.2" diff --git a/packages/nocodb/src/lib/meta/api/projectUserApis.ts b/packages/nocodb/src/lib/meta/api/projectUserApis.ts index a3cc55dc6a..99e93e8607 100644 --- a/packages/nocodb/src/lib/meta/api/projectUserApis.ts +++ b/packages/nocodb/src/lib/meta/api/projectUserApis.ts @@ -285,7 +285,7 @@ async function sendInviteEmail( html: ejs.render(template, { signupLink: `${req.ncSiteUrl}${ Noco.getConfig()?.dashboardPath - }#/user/authentication/signup/${token}`, + }#/signup/${token}`, projectName: req.body?.projectName, roles: (req.body?.roles || '') .split(',') diff --git a/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts b/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts index d9a44e7fe6..ab3f6df424 100644 --- a/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts +++ b/packages/nocodb/src/lib/v1-legacy/rest/RestAuthCtrl.ts @@ -1497,7 +1497,7 @@ export default class RestAuthCtrl { to: email, subject: 'Verify email', html: ejs.render(template, { - signupLink: `${req.ncSiteUrl}${this.config?.dashboardPath}#/user/authentication/signup/${token}`, + signupLink: `${req.ncSiteUrl}${this.config?.dashboardPath}#/signup/${token}`, projectName: req.body?.projectName, roles: (req.body?.roles || '') .split(',')