From d075ead80a7bbec84de2129b6579b9410e0b1154 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <andreas.nedbal@in2code.de>
Date: Thu, 5 May 2022 11:21:38 +0200
Subject: [PATCH] fix(client): fix duplicate token request dialog in plugin
 install (#8612)

---
 .../src/pages/settings/plugin.install.vue     | 42 +++++--------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue
index 5cf427d18f..6ece531462 100644
--- a/packages/client/src/pages/settings/plugin.install.vue
+++ b/packages/client/src/pages/settings/plugin.install.vue
@@ -78,37 +78,6 @@ async function install() {
 		return;
 	}
 
-	const token = permissions == null || permissions.length === 0 ? null : await new Promise((res, rej) => {
-		os.popup(import('@/components/token-generate-window.vue'), {
-			title: i18n.ts.tokenRequested,
-			information: i18n.ts.pluginTokenRequestedDescription,
-			initialName: name,
-			initialPermissions: permissions
-		}, {
-			done: async result => {
-				const { name, permissions } = result;
-				const { token } = await os.api('miauth/gen-token', {
-					session: null,
-					name: name,
-					permission: permissions,
-				});
-
-				res(token);
-			}
-		}, 'closed');
-	});
-
-	installPlugin({
-		id: uuid(),
-		meta: {
-			name, version, author, description, permissions, config
-		},
-		token,
-		ast: serialize(ast)
-	});
-
-	os.success();
-
 	const token = permissions == null || permissions.length === 0 ? null : await new Promise((res, rej) => {
 		os.popup(defineAsyncComponent(() => import('@/components/token-generate-window.vue')), {
 			title: i18n.ts.tokenRequested,
@@ -128,6 +97,17 @@ async function install() {
 		}, 'closed');
 	});
 
+	installPlugin({
+		id: uuid(),
+		meta: {
+			name, version, author, description, permissions, config
+		},
+		token,
+		ast: serialize(ast)
+	});
+
+	os.success();
+
 	nextTick(() => {
 		unisonReload();
 	});