diff --git a/docs/plugins/keewebhttp/manifest.json b/docs/plugins/keewebhttp/manifest.json index 7ad7219..2ac9ed6 100644 --- a/docs/plugins/keewebhttp/manifest.json +++ b/docs/plugins/keewebhttp/manifest.json @@ -1,6 +1,7 @@ { - "version": "0.1.3", + "version": "1.0.0", "manifestVersion": "0.1.0", + "versionMin": "1.11.0", "name": "keewebhttp", "description": "KeeWebHttp allows to use browser extensions with KeeWeb", "author": { @@ -11,7 +12,7 @@ "licence": "MIT", "url": "https://plugins.keeweb.info/plugins/keewebhttp", "resources": { - "js": "xRiIO2Y08FN8Qf/U1I+Ab3WI8UWNnRwVXmV5/XlxKDFUQIoWT1sMLP6pW7IrcUuFJ0zDwag+BlJuutnBt42+WgfRWCAZ2qRV5cRBCQYJ3q4W3JvkWSAfoTulgrmJ5C4ofiN9D8FL567+2eg7ni1BDA0sVrfLsA7SFNRfJ3vULKpeFjJHB6ypwO60v4xm1A8S+Cm3qckmvOA3Bp9WD1M8Gj1t9ULHKT9DYq6QG6rxwGWODqHsQRifFRojp73X5PM2j4GV1tEWASRGYCNmwmA7fCNHFmppk4W7ofpENF1/dbXrxDxqQ/unbHTixPp0oy+6R2Clnb3jOEYw6pnp0wxWLg==" + "js": "uhYCp/SeCQCaXNty/qLFyZLjjXYepQb7Z+D5y9R7gXgPoM8pe4ZALj1fuSr1M4rXFw6n2YJppKCrq3t4uCF6wcNP6Uwa2Fj6QDknnKUHaseJGQ/4EFMtUWuXHHMuJdDN6c/cQcPf6gBLXOlssXNs76QQYHCEcKiXeCdTiVpiazSK7c9tC4i2z2Dv+aiY76YxorJtm1+BzD3P6Hiv/Bwdl5zE+bPPV4frn1Lp80xF8bWWRId8e9vlpT7+riWDEwS90TrgmjceP51JlHu4jM0VoNQyqqFdZAKXMISbcj3Hb/Ndbw4LOOj7dbF0XTo4KznIb6f9YSHGEPrv1BJhQwtKrg==" }, "publicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0oZB2Kt7AzRFNqf8FuO3C3kepHPAIQYiDPYdQxHcsiaFCwyKVx6K1cE/3vBhb8/2rj+QIIWNfAAuu1Y+2VK90ZBeq6HciukWzQRO/HWhfdy0c7JwDAslmyGI5olj0ZQkNLhkde1MiMxjDPpRhZtdJaryVO5cFJaJESpv3dV6m0qXsaQCluWYOSNfSjP9C8o2zRVjSi3ZQZnZIV5pnk9K2MtlZIPXrN9iJiM5zZ9DTSnqApI6dC9mX4R3LvGN+GTovm9C8Crl+qb106nGRR3LcweicDnPyMtZLa/E0DBpWYxUVLDp6WeLhxoUBr+6+t3Xp9IDnPoANDQXJXD0f1vQxQIDAQAB", "desktop": true diff --git a/docs/plugins/keewebhttp/plugin.js b/docs/plugins/keewebhttp/plugin.js index be73ad9..8c44ebf 100644 --- a/docs/plugins/keewebhttp/plugin.js +++ b/docs/plugins/keewebhttp/plugin.js @@ -10,16 +10,16 @@ function run() { const crypto = nodeRequire('crypto'); const electron = nodeRequire('electron'); - const Backbone = require('backbone'); const kdbxweb = require('kdbxweb'); - const AppModel = require('models/app-model'); - const EntryModel = require('models/entry-model'); - const GroupModel = require('models/group-model'); - const AutoTypeFilter = require('auto-type/auto-type-filter'); - const Logger = require('util/logger'); - const Alerts = require('comp/alerts'); - const Generator = require('util/password-generator'); - const GeneratorPresets = require('comp/generator-presets'); + const Events = require('framework/events').Events; + const AppModel = require('models/app-model').AppModel; + const EntryModel = require('models/entry-model').EntryModel; + const GroupModel = require('models/group-model').GroupModel; + const AutoTypeFilter = require('auto-type/auto-type-filter').AutoTypeFilter; + const Logger = require('util/logger').Logger; + const Alerts = require('comp/ui/alerts').Alerts; + const PasswordGenerator = require('util/generators/password-generator').PasswordGenerator; + const GeneratorPresets = require('comp/app/generator-presets').GeneratorPresets; const Version = '1.8.4.2'; const DebugMode = localStorage.keewebhttpDebug; @@ -173,7 +173,7 @@ function run() { } let settingsEntry = getSettingsEntry(file); if (!settingsEntry) { - settingsEntry = EntryModel.newEntry(file.get('groups').first(), file); + settingsEntry = EntryModel.newEntry(file.groups[0], file); settingsEntry.entry.uuid = new kdbxweb.KdbxUuid(EntryUuid); settingsEntry.setField('Title', EntryTitle); } @@ -189,7 +189,7 @@ function run() { } } file.reload(); - Backbone.trigger('refresh'); + Events.emit('refresh'); } function getSettingsEntry(file) { @@ -446,15 +446,15 @@ function run() { let group, file; AppModel.instance.files.forEach(f => { f.forEachGroup(g => { - if (g.get('title') === CreatePasswordsGroupTitle) { + if (g.title === CreatePasswordsGroupTitle) { group = g; file = f; } }); }); if (!group) { - file = AppModel.instance.files.first(); - group = GroupModel.newGroup(file.get('groups').first(), file); + file = AppModel.instance.files[0]; + group = GroupModel.newGroup(file.groups[0], file); group.setName(CreatePasswordsGroupTitle); } const entry = EntryModel.newEntry(group, file); @@ -465,7 +465,7 @@ function run() { entry.setField('UserName', login); entry.setField('Password', kdbxweb.ProtectedValue.fromString(password)); } - Backbone.trigger('refresh'); + Events.emit('refresh'); this.createResponse(); } @@ -474,7 +474,7 @@ function run() { this.verifyRequest(); this.createResponse(); const preset = GeneratorPresets.all.filter(p => p.default)[0] || GeneratorPresets.defaultPreset; - const password = Generator.generate(preset); + const password = PasswordGenerator.generate(preset); const bits = Buffer.from(password, 'utf8').byteLength * 8; this.resp.Count = 1; this.resp.Entries = [{