diff --git a/app/scripts/comp/browser/auth-receiver.js b/app/scripts/comp/browser/auth-receiver.js index 8563d558..6c4cf79c 100644 --- a/app/scripts/comp/browser/auth-receiver.js +++ b/app/scripts/comp/browser/auth-receiver.js @@ -1,9 +1,8 @@ -import { Storage } from 'storage'; import { Features } from 'util/features'; const AuthReceiver = { receive() { - if (!Features.isPopup && !Features.isStandalone) { + if (!Features.isPopup) { return false; } const opener = window.opener || window.parent; @@ -12,16 +11,9 @@ const AuthReceiver = { if (!hasKeys) { return false; } - if (Features.isStandalone) { - if (sessionStorage.authStorage) { - Storage[sessionStorage.authStorage].handleOAuthReturnMessage(message); - } - return false; - } else { - opener.postMessage(message, window.location.origin); - window.close(); - return true; - } + opener.postMessage(message, window.location.origin); + window.close(); + return true; }, urlArgsToMessage(url) { diff --git a/app/scripts/storage/storage-base.js b/app/scripts/storage/storage-base.js index cb21dbb5..b93cb448 100644 --- a/app/scripts/storage/storage-base.js +++ b/app/scripts/storage/storage-base.js @@ -2,7 +2,6 @@ import { Events } from 'framework/events'; import { Links } from 'const/links'; import { AppSettingsModel } from 'models/app-settings-model'; import { RuntimeDataModel } from 'models/runtime-data-model'; -import { Features } from 'util/features'; import { Logger } from 'util/logger'; const MaxRequestRetries = 3; @@ -30,18 +29,6 @@ class StorageBase { } } this.logger = new Logger('storage-' + this.name); - if (this._oauthReturnMessage) { - this.logger.debug('OAuth return message', this._oauthReturnMessage); - this._oauthProcessReturn(this._oauthReturnMessage); - delete this._oauthReturnMessage; - delete sessionStorage.authStorage; - if (Features.isStandalone) { - const [url, urlParams] = location.href.split(/[?#]/); - if (urlParams) { - location.href = url; - } - } - } return this; } @@ -49,10 +36,6 @@ class StorageBase { this.enabled = enabled; } - handleOAuthReturnMessage(message) { - this._oauthReturnMessage = message; - } - _xhr(config) { const xhr = new XMLHttpRequest(); if (config.responseType) { @@ -135,9 +118,6 @@ class StorageBase { settings = Object.keys(settings) .map(key => key + '=' + settings[key]) .join(','); - if (Features.isStandalone) { - sessionStorage.authStorage = this.name; - } return window.open(url, title, settings); } diff --git a/app/scripts/util/kdbxweb/kdbxweb-init.js b/app/scripts/util/kdbxweb/kdbxweb-init.js index f9ddeef0..1c6ac4c5 100644 --- a/app/scripts/util/kdbxweb/kdbxweb-init.js +++ b/app/scripts/util/kdbxweb/kdbxweb-init.js @@ -115,7 +115,8 @@ const KdbxwebInit = { }); }, - workerPostRun() { + // eslint-disable-next-line object-shorthand + workerPostRun: function() { self.postMessage({ op: 'postRun' }); self.onmessage = e => { try { @@ -128,7 +129,8 @@ const KdbxwebInit = { }; }, - calcHash(Module, args) { + // eslint-disable-next-line object-shorthand + calcHash: function(Module, args) { let { password, salt } = args; const { memory, iterations, length, parallelism, type, version } = args; const passwordLen = password.byteLength; diff --git a/app/scripts/views/settings/settings-plugins-view.js b/app/scripts/views/settings/settings-plugins-view.js index 8a671cb5..ab95f260 100644 --- a/app/scripts/views/settings/settings-plugins-view.js +++ b/app/scripts/views/settings/settings-plugins-view.js @@ -235,7 +235,7 @@ class SettingsPluginsView extends View { pluginMatchesFilter(plugin) { const searchStr = this.searchStr; const manifest = plugin.manifest; - return ( + return !!( !searchStr || manifest.name.toLowerCase().indexOf(searchStr) >= 0 || (manifest.description && manifest.description.toLowerCase().indexOf(searchStr) >= 0) || diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 8b0488bb..408f335d 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.11.1", + "version": "1.11.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/desktop/package.json b/desktop/package.json index 1e1d1240..84428144 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.11.1", + "version": "1.11.2", "description": "Free cross-platform password manager compatible with KeePass", "main": "main.js", "homepage": "https://keeweb.info", diff --git a/package-lock.json b/package-lock.json index 0854608b..3c7e8ff7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.11.1", + "version": "1.11.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8fda3f5f..68459bd8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.11.1", + "version": "1.11.2", "description": "Free cross-platform password manager compatible with KeePass", "main": "Gruntfile.js", "private": true, diff --git a/release-notes.md b/release-notes.md index 210f1e77..44ac4fd5 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,10 @@ Release notes ------------- +##### v1.11.2 (2019-09-29) +`-` fix #1272: Argon2 error +`-` fixed Dropbox connection on iOS 13 homescreen +`-` fixed plugin search filtering + ##### v1.11.1 (2019-09-28) `-` fix #1270: password change control focus `-` fix #1271: loading custom plugins from config