graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-24 02:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(client): fix duplicate token request dialog in plugin install (#8612)

Browse source
This commit is contained in:
Andreas Nedbal 2022-05-05 11:21:38 +02:00 committed by GitHub
parent 9230334a31
commit d075ead80a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
packages/client/src/pages/settings/plugin.install.vue
View file

@ -78,37 +78,6 @@ async function install() {
return; 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) => { const token = permissions == null || permissions.length === 0 ? null : await new Promise((res, rej) => {
os.popup(defineAsyncComponent(() => import('@/components/token-generate-window.vue')), { os.popup(defineAsyncComponent(() => import('@/components/token-generate-window.vue')), {
title: i18n.ts.tokenRequested, title: i18n.ts.tokenRequested,
@ -128,6 +97,17 @@ async function install() {
}, 'closed'); }, 'closed');
}); });
installPlugin({
id: uuid(),
meta: {
name, version, author, description, permissions, config
},
token,
ast: serialize(ast)
});
os.success();
nextTick(() => { nextTick(() => {
unisonReload(); unisonReload();
}); });