mirror of
https://github.com/keeweb/keeweb.git
synced 2024-06-21 07:06:39 +02:00
Merge branch 'release-1.11'
This commit is contained in:
commit
a275a895cb
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) ||
|
||||
|
|
2
desktop/package-lock.json
generated
2
desktop/package-lock.json
generated
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "KeeWeb",
|
||||
"version": "1.11.1",
|
||||
"version": "1.11.2",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -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",
|
||||
|
|
2
package-lock.json
generated
2
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "keeweb",
|
||||
"version": "1.11.1",
|
||||
"version": "1.11.2",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user