fix(client): fix duplicate token request dialog in plugin install (#8612)
This commit is contained in:
		| @@ -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(); | ||||
| 	}); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Andreas Nedbal
					Andreas Nedbal