diff --git a/Gruntfile.js b/Gruntfile.js index 076ace12..ee973f59 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -10,7 +10,7 @@ const pkg = require('./package.json'); debug.enable('electron-notarize'); -module.exports = function(grunt) { +module.exports = function (grunt) { require('time-grunt')(grunt); require('load-grunt-tasks')(grunt); diff --git a/app/content/404.html b/app/content/404.html index f67b45a7..dc38b79e 100644 --- a/app/content/404.html +++ b/app/content/404.html @@ -1,27 +1,28 @@ - - - Not Found - - - -

404 Not Found

-

Sorry, the page you're looking for was not found.

- + + + Not Found + + + +

404 Not Found

+

Sorry, the page you're looking for was not found.

+ diff --git a/app/scripts/app.js b/app/scripts/app.js index 958c6149..f12ba917 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -46,7 +46,7 @@ ready(() => { .then(initStorage) .then(showApp) .then(postInit) - .catch(e => { + .catch((e) => { appModel.appLogger.error('Error starting app', e); }); @@ -57,7 +57,7 @@ ready(() => { ); } return FeatureTester.test() - .catch(e => { + .catch((e) => { Alerts.error({ header: Locale.appSettingsError, body: Locale.appNotSupportedError, @@ -119,7 +119,7 @@ ready(() => { .then(() => { SettingsManager.setBySettings(appModel.settings); }) - .catch(e => { + .catch((e) => { if (!appModel.settings.cacheConfigSettings) { showSettingsLoadError(); throw e; @@ -146,7 +146,7 @@ ready(() => { const protocolIsInsecure = ['https:', 'file:', 'app:'].indexOf(location.protocol) < 0; const hostIsInsecure = location.hostname !== 'localhost'; if (protocolIsInsecure && hostIsInsecure && !skipHttpsWarning) { - return new Promise(resolve => { + return new Promise((resolve) => { Alerts.error({ header: Locale.appSecWarn, icon: 'user-secret', @@ -163,7 +163,7 @@ ready(() => { }); } else { showView(); - return new Promise(resolve => requestAnimationFrame(resolve)); + return new Promise((resolve) => requestAnimationFrame(resolve)); } }); } diff --git a/app/scripts/auto-type/auto-type-filter.js b/app/scripts/auto-type/auto-type-filter.js index a2469051..335fd3e8 100644 --- a/app/scripts/auto-type/auto-type-filter.js +++ b/app/scripts/auto-type/auto-type-filter.js @@ -3,7 +3,7 @@ import { Ranking } from 'util/data/ranking'; const urlPartsRegex = /^(\w+:\/\/)?(?:(?:www|wwws|secure)\.)?([^\/]+)\/?(.*)/; -const AutoTypeFilter = function(windowInfo, appModel) { +const AutoTypeFilter = function (windowInfo, appModel) { this.title = windowInfo.title; this.url = windowInfo.url; this.text = ''; @@ -11,34 +11,34 @@ const AutoTypeFilter = function(windowInfo, appModel) { this.appModel = appModel; }; -AutoTypeFilter.prototype.getEntries = function() { +AutoTypeFilter.prototype.getEntries = function () { const filter = { text: this.text, autoType: true }; this.prepareFilter(); - let entries = this.appModel.getEntriesByFilter(filter).map(e => [e, this.getEntryRank(e)]); + let entries = this.appModel.getEntriesByFilter(filter).map((e) => [e, this.getEntryRank(e)]); if (!this.ignoreWindowInfo) { - entries = entries.filter(e => e[1]); + entries = entries.filter((e) => e[1]); } entries = entries.sort((x, y) => x[1] === y[1] ? x[0].title.localeCompare(y[0].title) : y[1] - x[1] ); - entries = entries.map(p => p[0]); + entries = entries.map((p) => p[0]); return new SearchResultCollection(entries, { comparator: 'none' }); }; -AutoTypeFilter.prototype.hasWindowInfo = function() { +AutoTypeFilter.prototype.hasWindowInfo = function () { return this.title || this.url; }; -AutoTypeFilter.prototype.prepareFilter = function() { +AutoTypeFilter.prototype.prepareFilter = function () { this.titleLower = this.title ? this.title.toLowerCase() : null; this.urlLower = this.url ? this.url.toLowerCase() : null; this.urlParts = this.url ? urlPartsRegex.exec(this.urlLower) : null; }; -AutoTypeFilter.prototype.getEntryRank = function(entry) { +AutoTypeFilter.prototype.getEntryRank = function (entry) { let rank = 0; if (this.titleLower && entry.title) { rank += Ranking.getStringRank(entry.title.toLowerCase(), this.titleLower); diff --git a/app/scripts/auto-type/auto-type-obfuscator.js b/app/scripts/auto-type/auto-type-obfuscator.js index b896e533..9d6fac11 100644 --- a/app/scripts/auto-type/auto-type-obfuscator.js +++ b/app/scripts/auto-type/auto-type-obfuscator.js @@ -11,7 +11,7 @@ const MaxSteps = 1000; const MaxCopy = 2; const FakeCharAlphabet = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz123456789O0oIl'; -const AutoTypeObfuscator = function(chars) { +const AutoTypeObfuscator = function (chars) { this.chars = chars; this.inputChars = []; this.inputCursor = 0; @@ -21,7 +21,7 @@ const AutoTypeObfuscator = function(chars) { this.copyCount = 0; }; -AutoTypeObfuscator.prototype.obfuscate = function() { +AutoTypeObfuscator.prototype.obfuscate = function () { while (!this.finished()) { this.step(); if (this.stepCount++ > MaxSteps) { @@ -35,16 +35,16 @@ AutoTypeObfuscator.prototype.obfuscate = function() { return this.ops; }; -AutoTypeObfuscator.prototype.finished = function() { +AutoTypeObfuscator.prototype.finished = function () { return ( this.chars.length === this.inputChars.length && - this.chars.every(function(ch, ix) { + this.chars.every(function (ch, ix) { return this.inputChars[ix].ch === ch; }, this) ); }; -AutoTypeObfuscator.prototype.step = function() { +AutoTypeObfuscator.prototype.step = function () { const isFake = this.stepCount < MaxFakeOps && Math.random() > this.stepCount / MaxFakeOps; if (isFake) { this.stepFake(); @@ -52,11 +52,11 @@ AutoTypeObfuscator.prototype.step = function() { this.stepReal(); } if (logger.getLevel() >= Logger.Level.Debug) { - logger.debug('value', this.inputChars.map(ic => ic.ch).join('')); + logger.debug('value', this.inputChars.map((ic) => ic.ch).join('')); } }; -AutoTypeObfuscator.prototype.stepFake = function() { +AutoTypeObfuscator.prototype.stepFake = function () { const pos = Math.floor(Math.random() * (this.inputChars.length + 1)); const ch = FakeCharAlphabet[Math.floor(Math.random() * FakeCharAlphabet.length)]; logger.info('step.fake', pos, ch); @@ -85,7 +85,7 @@ AutoTypeObfuscator.prototype.stepFake = function() { } }; -AutoTypeObfuscator.prototype.stepReal = function() { +AutoTypeObfuscator.prototype.stepReal = function () { const possibleActions = []; const inputRealPositions = []; let i; @@ -134,7 +134,7 @@ AutoTypeObfuscator.prototype.stepReal = function() { } }; -AutoTypeObfuscator.prototype.moveToPos = function(pos) { +AutoTypeObfuscator.prototype.moveToPos = function (pos) { logger.debug('moveToPos', pos); while (this.inputCursor > pos) { this.moveLeft(); @@ -144,21 +144,21 @@ AutoTypeObfuscator.prototype.moveToPos = function(pos) { } }; -AutoTypeObfuscator.prototype.moveLeft = function() { +AutoTypeObfuscator.prototype.moveLeft = function () { logger.debug('moveLeft'); this.ops.push({ type: 'key', value: 'left' }); this.inputCursor--; this.inputSel = 0; }; -AutoTypeObfuscator.prototype.moveRight = function() { +AutoTypeObfuscator.prototype.moveRight = function () { logger.debug('moveRight'); this.ops.push({ type: 'key', value: 'right' }); this.inputCursor++; this.inputSel = 0; }; -AutoTypeObfuscator.prototype.inputChar = function(ch) { +AutoTypeObfuscator.prototype.inputChar = function (ch) { logger.debug('inputChar', ch); this.ops.push({ type: 'text', value: ch }); this.inputChars.splice(this.inputCursor, this.inputSel, { ch }); @@ -166,7 +166,7 @@ AutoTypeObfuscator.prototype.inputChar = function(ch) { this.inputSel = 0; }; -AutoTypeObfuscator.prototype.copyPaste = function(ch) { +AutoTypeObfuscator.prototype.copyPaste = function (ch) { logger.debug('copyPaste', ch); this.ops.push({ type: 'cmd', value: 'copyPaste', arg: ch }); this.inputChars.splice(this.inputCursor, this.inputSel, { ch }); @@ -174,7 +174,7 @@ AutoTypeObfuscator.prototype.copyPaste = function(ch) { this.inputSel = 0; }; -AutoTypeObfuscator.prototype.selectText = function(backward, count) { +AutoTypeObfuscator.prototype.selectText = function (backward, count) { logger.debug('selectText', backward ? 'left' : 'right', count); const ops = []; for (let i = 0; i < count; i++) { @@ -192,7 +192,7 @@ AutoTypeObfuscator.prototype.selectText = function(backward, count) { this.inputSel = count; }; -AutoTypeObfuscator.prototype.deleteText = function(backward) { +AutoTypeObfuscator.prototype.deleteText = function (backward) { logger.debug('deleteText', backward ? 'left' : 'right'); this.ops.push({ type: 'key', value: backward ? 'bs' : 'del' }); if (this.inputSel) { diff --git a/app/scripts/auto-type/auto-type-parser.js b/app/scripts/auto-type/auto-type-parser.js index c7e98cb3..82f691c1 100644 --- a/app/scripts/auto-type/auto-type-parser.js +++ b/app/scripts/auto-type/auto-type-parser.js @@ -1,6 +1,6 @@ import { AutoTypeRunner } from 'auto-type/auto-type-runner'; -const AutoTypeParser = function(sequence) { +const AutoTypeParser = function (sequence) { this.sequence = sequence; this.ix = 0; this.states = []; @@ -8,7 +8,7 @@ const AutoTypeParser = function(sequence) { AutoTypeParser.opRegex = /^(.*?)(?:([\s:=])[\s:=]*(.*))?$/; -AutoTypeParser.prototype.parse = function() { +AutoTypeParser.prototype.parse = function () { const len = this.sequence.length; this.pushState(); while (this.ix < len) { @@ -45,14 +45,14 @@ AutoTypeParser.prototype.parse = function() { return new AutoTypeRunner(this.state().ops); }; -AutoTypeParser.prototype.pushState = function() { +AutoTypeParser.prototype.pushState = function () { this.states.unshift({ modifiers: null, ops: [] }); }; -AutoTypeParser.prototype.popState = function() { +AutoTypeParser.prototype.popState = function () { if (this.states.length <= 1) { throw 'Unexpected ")" at index ' + this.ix; } @@ -60,11 +60,11 @@ AutoTypeParser.prototype.popState = function() { this.addState(state); }; -AutoTypeParser.prototype.state = function() { +AutoTypeParser.prototype.state = function () { return this.states[0]; }; -AutoTypeParser.prototype.readOp = function() { +AutoTypeParser.prototype.readOp = function () { const toIx = this.sequence.indexOf('}', this.ix + 2); if (toIx < 0) { throw 'Mismatched "{" at index ' + this.ix; @@ -79,7 +79,7 @@ AutoTypeParser.prototype.readOp = function() { this.addOp(op, sep, arg); }; -AutoTypeParser.prototype.readModifier = function(modifier) { +AutoTypeParser.prototype.readModifier = function (modifier) { const state = this.state(); if (!state.modifiers) { state.modifiers = {}; @@ -91,14 +91,14 @@ AutoTypeParser.prototype.readModifier = function(modifier) { state.modifiers[modifier] = true; }; -AutoTypeParser.prototype.resetModifiers = function() { +AutoTypeParser.prototype.resetModifiers = function () { const state = this.state(); const modifiers = state.modifiers; state.modifiers = null; return modifiers; }; -AutoTypeParser.prototype.addState = function(state) { +AutoTypeParser.prototype.addState = function (state) { this.state().ops.push({ type: 'group', value: state.ops, @@ -106,7 +106,7 @@ AutoTypeParser.prototype.addState = function(state) { }); }; -AutoTypeParser.prototype.addChar = function(ch) { +AutoTypeParser.prototype.addChar = function (ch) { this.state().ops.push({ type: 'text', value: ch, @@ -114,7 +114,7 @@ AutoTypeParser.prototype.addChar = function(ch) { }); }; -AutoTypeParser.prototype.addOp = function(op, sep, arg) { +AutoTypeParser.prototype.addOp = function (op, sep, arg) { this.state().ops.push({ type: 'op', value: op, diff --git a/app/scripts/auto-type/auto-type-runner.js b/app/scripts/auto-type/auto-type-runner.js index 9ef3d65a..681dd915 100644 --- a/app/scripts/auto-type/auto-type-runner.js +++ b/app/scripts/auto-type/auto-type-runner.js @@ -9,7 +9,7 @@ const emitterLogger = new Logger( localStorage.debugAutoType ? Logger.Level.All : Logger.Level.Warn ); -const AutoTypeRunner = function(ops) { +const AutoTypeRunner = function (ops) { this.ops = ops; this.pendingResolvesCount = 0; this.entry = null; @@ -142,7 +142,7 @@ AutoTypeRunner.Substitutions = { } }; -AutoTypeRunner.prototype.resolve = function(entry, context, callback) { +AutoTypeRunner.prototype.resolve = function (entry, context, callback) { this.entry = entry; this.context = context; try { @@ -157,7 +157,7 @@ AutoTypeRunner.prototype.resolve = function(entry, context, callback) { } }; -AutoTypeRunner.prototype.resolveOps = function(ops) { +AutoTypeRunner.prototype.resolveOps = function (ops) { for (let i = 0, len = ops.length; i < len; i++) { const op = ops[i]; if (op.type === 'group') { @@ -168,7 +168,7 @@ AutoTypeRunner.prototype.resolveOps = function(ops) { } }; -AutoTypeRunner.prototype.resolveOp = function(op) { +AutoTypeRunner.prototype.resolveOp = function (op) { if (op.value.length === 1 && !op.sep) { // {x} op.type = 'text'; @@ -224,7 +224,7 @@ AutoTypeRunner.prototype.resolveOp = function(op) { } }; -AutoTypeRunner.prototype.tryParseCommand = function(op) { +AutoTypeRunner.prototype.tryParseCommand = function (op) { switch (op.value.toLowerCase()) { case 'clearfield': // {CLEARFIELD} @@ -263,7 +263,7 @@ AutoTypeRunner.prototype.tryParseCommand = function(op) { } }; -AutoTypeRunner.prototype.getEntryFieldKeys = function(field, op) { +AutoTypeRunner.prototype.getEntryFieldKeys = function (field, op) { if (!field || !this.entry) { return ''; } @@ -274,7 +274,7 @@ AutoTypeRunner.prototype.getEntryFieldKeys = function(field, op) { if (value.isProtected) { op.type = 'group'; const ops = []; - value.forEachChar(ch => { + value.forEachChar((ch) => { if (ch === 10 || ch === 13) { ops.push({ type: 'key', value: 'enter' }); } else { @@ -289,7 +289,7 @@ AutoTypeRunner.prototype.getEntryFieldKeys = function(field, op) { } op.type = 'group'; const partsOps = []; - parts.forEach(part => { + parts.forEach((part) => { if (partsOps.length) { partsOps.push({ type: 'key', value: 'enter' }); } @@ -301,11 +301,11 @@ AutoTypeRunner.prototype.getEntryFieldKeys = function(field, op) { } }; -AutoTypeRunner.prototype.getEntryGroupName = function() { +AutoTypeRunner.prototype.getEntryGroupName = function () { return this.entry && this.entry.group.title; }; -AutoTypeRunner.prototype.dt = function(part) { +AutoTypeRunner.prototype.dt = function (part) { switch (part) { case 'simple': return ( @@ -333,7 +333,7 @@ AutoTypeRunner.prototype.dt = function(part) { } }; -AutoTypeRunner.prototype.udt = function(part) { +AutoTypeRunner.prototype.udt = function (part) { switch (part) { case 'simple': return ( @@ -361,7 +361,7 @@ AutoTypeRunner.prototype.udt = function(part) { } }; -AutoTypeRunner.prototype.getOtp = function(op) { +AutoTypeRunner.prototype.getOtp = function (op) { if (!this.entry) { return ''; } @@ -375,7 +375,7 @@ AutoTypeRunner.prototype.getOtp = function(op) { return AutoTypeRunner.PendingResolve; }; -AutoTypeRunner.prototype.pendingResolved = function(op, value, error) { +AutoTypeRunner.prototype.pendingResolved = function (op, value, error) { const wasPending = op.value === AutoTypeRunner.PendingResolve; if (value) { op.value = value; @@ -390,11 +390,11 @@ AutoTypeRunner.prototype.pendingResolved = function(op, value, error) { } }; -AutoTypeRunner.prototype.obfuscate = function() { +AutoTypeRunner.prototype.obfuscate = function () { this.obfuscateOps(this.ops); }; -AutoTypeRunner.prototype.obfuscateOps = function(ops) { +AutoTypeRunner.prototype.obfuscateOps = function (ops) { for (let i = 0, len = ops.length; i < len; i++) { const op = ops[i]; if (op.mod) { @@ -403,7 +403,7 @@ AutoTypeRunner.prototype.obfuscateOps = function(ops) { if (op.type === 'text') { this.obfuscateOp(op); } else if (op.type === 'group') { - const onlyText = op.value.every(grOp => grOp.type === 'text' && !grOp.mod); + const onlyText = op.value.every((grOp) => grOp.type === 'text' && !grOp.mod); if (onlyText) { this.obfuscateOp(op); } else { @@ -413,7 +413,7 @@ AutoTypeRunner.prototype.obfuscateOps = function(ops) { } }; -AutoTypeRunner.prototype.obfuscateOp = function(op) { +AutoTypeRunner.prototype.obfuscateOp = function (op) { let letters = []; if (op.type === 'text') { if (!op.value || op.value.length <= 1) { @@ -421,7 +421,7 @@ AutoTypeRunner.prototype.obfuscateOp = function(op) { } letters = op.value.split(''); } else { - op.value.forEach(grOp => letters.push(...grOp.value.split(''))); + op.value.forEach((grOp) => letters.push(...grOp.value.split(''))); } if (letters.length <= 1) { return; @@ -431,7 +431,7 @@ AutoTypeRunner.prototype.obfuscateOp = function(op) { op.type = 'group'; }; -AutoTypeRunner.prototype.run = function(callback, windowId) { +AutoTypeRunner.prototype.run = function (callback, windowId) { this.emitter = AutoTypeEmitterFactory.create(this.emitNext.bind(this), windowId); this.emitterState = { callback, @@ -445,7 +445,7 @@ AutoTypeRunner.prototype.run = function(callback, windowId) { this.emitNext(); }; -AutoTypeRunner.prototype.emitNext = function(err) { +AutoTypeRunner.prototype.emitNext = function (err) { if (err) { this.emitterState.finished = true; this.emitterState.callback(err); @@ -518,8 +518,8 @@ AutoTypeRunner.prototype.emitNext = function(err) { } }; -AutoTypeRunner.prototype.setEmitterMod = function(addedMod) { - Object.keys(addedMod).forEach(function(mod) { +AutoTypeRunner.prototype.setEmitterMod = function (addedMod) { + Object.keys(addedMod).forEach(function (mod) { if (addedMod[mod] && !this.emitterState.activeMod[mod]) { emitterLogger.debug('mod', mod, true); this.emitter.setMod(mod, true); @@ -528,8 +528,8 @@ AutoTypeRunner.prototype.setEmitterMod = function(addedMod) { }, this); }; -AutoTypeRunner.prototype.resetEmitterMod = function(targetState) { - Object.keys(this.emitterState.activeMod).forEach(function(mod) { +AutoTypeRunner.prototype.resetEmitterMod = function (targetState) { + Object.keys(this.emitterState.activeMod).forEach(function (mod) { if (this.emitterState.activeMod[mod] && !targetState[mod]) { emitterLogger.debug('mod', mod, false); this.emitter.setMod(mod, false); diff --git a/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js b/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js index 0819d24b..427bcfce 100644 --- a/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js +++ b/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js @@ -59,13 +59,13 @@ const ModMap = { '^^': '^' }; -const AutoTypeEmitter = function(callback) { +const AutoTypeEmitter = function (callback) { this.callback = callback; this.mod = {}; this.pendingScript = []; }; -AutoTypeEmitter.prototype.setMod = function(mod, enabled) { +AutoTypeEmitter.prototype.setMod = function (mod, enabled) { if (enabled) { this.mod[ModMap[mod]] = true; } else { @@ -73,12 +73,12 @@ AutoTypeEmitter.prototype.setMod = function(mod, enabled) { } }; -AutoTypeEmitter.prototype.text = function(text) { +AutoTypeEmitter.prototype.text = function (text) { this.pendingScript.push('text ' + this.modString() + ' ' + text); this.callback(); }; -AutoTypeEmitter.prototype.key = function(key) { +AutoTypeEmitter.prototype.key = function (key) { if (typeof key !== 'number') { if (!KeyMap[key]) { return this.callback('Bad key: ' + key); @@ -89,17 +89,17 @@ AutoTypeEmitter.prototype.key = function(key) { this.callback(); }; -AutoTypeEmitter.prototype.copyPaste = function(text) { +AutoTypeEmitter.prototype.copyPaste = function (text) { this.pendingScript.push('copypaste ' + text); this.callback(); }; -AutoTypeEmitter.prototype.wait = function(time) { +AutoTypeEmitter.prototype.wait = function (time) { this.pendingScript.push('wait ' + time); this.callback(); }; -AutoTypeEmitter.prototype.waitComplete = function() { +AutoTypeEmitter.prototype.waitComplete = function () { if (this.pendingScript.length) { const script = this.pendingScript.join('\n'); this.pendingScript.length = 0; @@ -109,16 +109,16 @@ AutoTypeEmitter.prototype.waitComplete = function() { } }; -AutoTypeEmitter.prototype.setDelay = function(delay) { +AutoTypeEmitter.prototype.setDelay = function (delay) { this.delay = delay || 0; this.callback('Not implemented'); }; -AutoTypeEmitter.prototype.modString = function() { +AutoTypeEmitter.prototype.modString = function () { return Object.keys(this.mod).join(''); }; -AutoTypeEmitter.prototype.runScript = function(script) { +AutoTypeEmitter.prototype.runScript = function (script) { Launcher.spawn({ cmd: AutoTypeNativeHelper.getHelperPath(), data: script, diff --git a/app/scripts/auto-type/emitter/auto-type-emitter-linux.js b/app/scripts/auto-type/emitter/auto-type-emitter-linux.js index fc538b16..5d8167d4 100644 --- a/app/scripts/auto-type/emitter/auto-type-emitter-linux.js +++ b/app/scripts/auto-type/emitter/auto-type-emitter-linux.js @@ -59,7 +59,7 @@ const ModMap = { '^^': 'ctrl' }; -const AutoTypeEmitter = function(callback, windowId) { +const AutoTypeEmitter = function (callback, windowId) { this.callback = callback; if (typeof windowId !== 'undefined' && windowId) { this.windowParameter = '--window ' + windowId + ' '; @@ -70,7 +70,7 @@ const AutoTypeEmitter = function(callback, windowId) { this.pendingScript = []; }; -AutoTypeEmitter.prototype.setMod = function(mod, enabled) { +AutoTypeEmitter.prototype.setMod = function (mod, enabled) { if (enabled) { this.mod[ModMap[mod]] = true; } else { @@ -78,23 +78,23 @@ AutoTypeEmitter.prototype.setMod = function(mod, enabled) { } }; -AutoTypeEmitter.prototype.text = function(text) { +AutoTypeEmitter.prototype.text = function (text) { this.pendingScript.push('keyup ctrl alt shift t'); - Object.keys(this.mod).forEach(mod => { + Object.keys(this.mod).forEach((mod) => { this.pendingScript.push('keydown ' + this.windowParameter + ModMap[mod]); }); - text.split('').forEach(char => { + text.split('').forEach((char) => { this.pendingScript.push( 'key ' + this.windowParameter + 'U' + char.charCodeAt(0).toString(16) ); }); - Object.keys(this.mod).forEach(mod => { + Object.keys(this.mod).forEach((mod) => { this.pendingScript.push('keyup ' + this.windowParameter + ModMap[mod]); }); this.waitComplete(); }; -AutoTypeEmitter.prototype.key = function(key) { +AutoTypeEmitter.prototype.key = function (key) { const isSpecialKey = typeof key !== 'number'; if (isSpecialKey) { if (!KeyMap[key]) { @@ -112,7 +112,7 @@ AutoTypeEmitter.prototype.key = function(key) { } }; -AutoTypeEmitter.prototype.copyPaste = function(text) { +AutoTypeEmitter.prototype.copyPaste = function (text) { this.pendingScript.push('sleep 0.5'); Launcher.setClipboardText(text); this.pendingScript.push('key --clearmodifiers ' + this.windowParameter + 'shift+Insert'); @@ -120,12 +120,12 @@ AutoTypeEmitter.prototype.copyPaste = function(text) { this.waitComplete(); }; -AutoTypeEmitter.prototype.wait = function(time) { +AutoTypeEmitter.prototype.wait = function (time) { this.pendingScript.push('sleep ' + time / 1000); this.callback(); }; -AutoTypeEmitter.prototype.waitComplete = function(callback) { +AutoTypeEmitter.prototype.waitComplete = function (callback) { if (this.pendingScript.length) { const script = this.pendingScript.join(' '); this.pendingScript.length = 0; @@ -135,15 +135,15 @@ AutoTypeEmitter.prototype.waitComplete = function(callback) { } }; -AutoTypeEmitter.prototype.modString = function() { +AutoTypeEmitter.prototype.modString = function () { let mod = ''; - Object.keys(this.mod).forEach(key => { + Object.keys(this.mod).forEach((key) => { mod += key + '+'; }); return mod; }; -AutoTypeEmitter.prototype.runScript = function(script, callback) { +AutoTypeEmitter.prototype.runScript = function (script, callback) { Launcher.spawn({ cmd: 'xdotool', args: ['-'], diff --git a/app/scripts/auto-type/emitter/auto-type-emitter-win32.js b/app/scripts/auto-type/emitter/auto-type-emitter-win32.js index f53ec1a6..e6692b78 100644 --- a/app/scripts/auto-type/emitter/auto-type-emitter-win32.js +++ b/app/scripts/auto-type/emitter/auto-type-emitter-win32.js @@ -59,13 +59,13 @@ const ModMap = { '^^': '^' }; -const AutoTypeEmitter = function(callback) { +const AutoTypeEmitter = function (callback) { this.callback = callback; this.mod = {}; this.pendingScript = []; }; -AutoTypeEmitter.prototype.setMod = function(mod, enabled) { +AutoTypeEmitter.prototype.setMod = function (mod, enabled) { if (enabled) { this.mod[ModMap[mod]] = true; } else { @@ -73,14 +73,14 @@ AutoTypeEmitter.prototype.setMod = function(mod, enabled) { } }; -AutoTypeEmitter.prototype.text = function(text) { +AutoTypeEmitter.prototype.text = function (text) { if (text) { this.pendingScript.push('text ' + this.modStr() + ' ' + text); } this.callback(); }; -AutoTypeEmitter.prototype.key = function(key) { +AutoTypeEmitter.prototype.key = function (key) { if (typeof key !== 'number') { if (!KeyMap[key]) { return this.callback('Bad key: ' + key); @@ -91,17 +91,17 @@ AutoTypeEmitter.prototype.key = function(key) { this.callback(); }; -AutoTypeEmitter.prototype.copyPaste = function(text) { +AutoTypeEmitter.prototype.copyPaste = function (text) { this.pendingScript.push('copypaste ' + text); this.callback(); }; -AutoTypeEmitter.prototype.wait = function(time) { +AutoTypeEmitter.prototype.wait = function (time) { this.pendingScript.push('wait ' + time); this.callback(); }; -AutoTypeEmitter.prototype.waitComplete = function() { +AutoTypeEmitter.prototype.waitComplete = function () { if (this.pendingScript.length) { const script = this.pendingScript.join('\n'); this.pendingScript.length = 0; @@ -111,16 +111,16 @@ AutoTypeEmitter.prototype.waitComplete = function() { } }; -AutoTypeEmitter.prototype.setDelay = function(delay) { +AutoTypeEmitter.prototype.setDelay = function (delay) { this.delay = delay || 0; this.callback('Not implemented'); }; -AutoTypeEmitter.prototype.modStr = function() { +AutoTypeEmitter.prototype.modStr = function () { return Object.keys(this.mod).join(''); }; -AutoTypeEmitter.prototype.runScript = function(script) { +AutoTypeEmitter.prototype.runScript = function (script) { Launcher.spawn({ cmd: AutoTypeNativeHelper.getHelperPath(), data: script, diff --git a/app/scripts/auto-type/helper/auto-type-helper-darwin.js b/app/scripts/auto-type/helper/auto-type-helper-darwin.js index b26baa6c..b74434fe 100644 --- a/app/scripts/auto-type/helper/auto-type-helper-darwin.js +++ b/app/scripts/auto-type/helper/auto-type-helper-darwin.js @@ -23,9 +23,9 @@ const OtherAppsScript = ' end tell\n' + 'end tell'; -const AutoTypeHelper = function() {}; +const AutoTypeHelper = function () {}; -AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) { +AutoTypeHelper.prototype.getActiveWindowInfo = function (callback) { AutoTypeHelper.exec(ForeMostAppScript, (err, out) => { if (err) { return callback(err); @@ -81,7 +81,7 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) { }); }; -AutoTypeHelper.exec = function(script, callback) { +AutoTypeHelper.exec = function (script, callback) { Launcher.spawn({ cmd: 'osascript', args: ['-e', script], diff --git a/app/scripts/auto-type/helper/auto-type-helper-linux.js b/app/scripts/auto-type/helper/auto-type-helper-linux.js index 16514deb..65919692 100644 --- a/app/scripts/auto-type/helper/auto-type-helper-linux.js +++ b/app/scripts/auto-type/helper/auto-type-helper-linux.js @@ -1,8 +1,8 @@ import { Launcher } from 'comp/launcher'; -const AutoTypeHelper = function() {}; +const AutoTypeHelper = function () {}; -AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) { +AutoTypeHelper.prototype.getActiveWindowInfo = function (callback) { Launcher.spawn({ cmd: 'xdotool', args: ['getactivewindow', 'getwindowname', 'getactivewindow'], diff --git a/app/scripts/auto-type/helper/auto-type-helper-win32.js b/app/scripts/auto-type/helper/auto-type-helper-win32.js index 03dab0e9..a59a5fcf 100644 --- a/app/scripts/auto-type/helper/auto-type-helper-win32.js +++ b/app/scripts/auto-type/helper/auto-type-helper-win32.js @@ -1,9 +1,9 @@ import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper'; import { Launcher } from 'comp/launcher'; -const AutoTypeHelper = function() {}; +const AutoTypeHelper = function () {}; -AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) { +AutoTypeHelper.prototype.getActiveWindowInfo = function (callback) { Launcher.spawn({ cmd: AutoTypeNativeHelper.getHelperPath(), args: ['--window-info'], diff --git a/app/scripts/auto-type/index.js b/app/scripts/auto-type/index.js index c60a3055..7acd1192 100644 --- a/app/scripts/auto-type/index.js +++ b/app/scripts/auto-type/index.js @@ -26,11 +26,11 @@ const AutoType = { if (!this.enabled) { return; } - Events.on('auto-type', e => this.handleEvent(e)); - Events.on('main-window-blur', e => this.mainWindowBlur(e)); - Events.on('main-window-focus', e => this.mainWindowFocus(e)); - Events.on('main-window-will-close', e => this.mainWindowWillClose(e)); - Events.on('closed-open-view', e => this.processPendingEvent(e)); + Events.on('auto-type', (e) => this.handleEvent(e)); + Events.on('main-window-blur', (e) => this.mainWindowBlur(e)); + Events.on('main-window-focus', (e) => this.mainWindowFocus(e)); + Events.on('main-window-will-close', (e) => this.mainWindowWillClose(e)); + Events.on('closed-open-view', (e) => this.processPendingEvent(e)); }, handleEvent(e) { @@ -62,7 +62,7 @@ const AutoType = { }, runAndHandleResult(result, windowId) { - this.run(result, windowId, err => { + this.run(result, windowId, (err) => { if (err) { Alerts.error({ header: Locale.autoTypeError, @@ -86,7 +86,7 @@ const AutoType = { const parser = new AutoTypeParser(sequence); const runner = parser.parse(); logger.debug('Parsed', this.printOps(runner.ops)); - runner.resolve(result.entry, context, err => { + runner.resolve(result.entry, context, (err) => { if (err) { this.running = false; logger.error('Resolve error', err); @@ -103,7 +103,7 @@ const AutoType = { } logger.debug('Obfuscated'); } - runner.run(err => { + runner.run((err) => { this.running = false; if (err) { logger.error('Run error', err); @@ -237,7 +237,7 @@ const AutoType = { this.focusMainWindow(); evt.filter.ignoreWindowInfo = true; this.selectEntryView = new AutoTypeSelectView({ filter: evt.filter }); - this.selectEntryView.on('result', result => { + this.selectEntryView.on('result', (result) => { logger.debug('Entry selected', result); this.selectEntryView.off('result'); this.selectEntryView.remove(); diff --git a/app/scripts/collections/file-collection.js b/app/scripts/collections/file-collection.js index 5e7c6a64..9356dc44 100644 --- a/app/scripts/collections/file-collection.js +++ b/app/scripts/collections/file-collection.js @@ -5,19 +5,19 @@ class FileCollection extends Collection { static model = Model; hasOpenFiles() { - return this.some(file => file.active); + return this.some((file) => file.active); } hasUnsavedFiles() { - return this.some(file => file.modified); + return this.some((file) => file.modified); } hasDirtyFiles() { - return this.some(file => file.dirty); + return this.some((file) => file.dirty); } getByName(name) { - return this.find(file => file.name.toLowerCase() === name.toLowerCase()); + return this.find((file) => file.name.toLowerCase() === name.toLowerCase()); } } diff --git a/app/scripts/collections/file-info-collection.js b/app/scripts/collections/file-info-collection.js index 38c505d7..981462e9 100644 --- a/app/scripts/collections/file-info-collection.js +++ b/app/scripts/collections/file-info-collection.js @@ -6,7 +6,7 @@ class FileInfoCollection extends Collection { static model = FileInfoModel; load() { - return SettingsStore.load('file-info').then(data => { + return SettingsStore.load('file-info').then((data) => { if (data) { for (const item of data) { this.push(new FileInfoModel(item)); @@ -20,7 +20,7 @@ class FileInfoCollection extends Collection { } getMatch(storage, name, path) { - return this.find(fi => { + return this.find((fi) => { return ( (fi.storage || '') === (storage || '') && (fi.name || '') === (name || '') && @@ -30,7 +30,7 @@ class FileInfoCollection extends Collection { } getByName(name) { - return this.find(file => file.name.toLowerCase() === name.toLowerCase()); + return this.find((file) => file.name.toLowerCase() === name.toLowerCase()); } } diff --git a/app/scripts/comp/app/app-rights-checker.js b/app/scripts/comp/app/app-rights-checker.js index 15ea00c1..67054c26 100644 --- a/app/scripts/comp/app/app-rights-checker.js +++ b/app/scripts/comp/app/app-rights-checker.js @@ -17,7 +17,7 @@ const AppRightsChecker = { if (!Launcher.getAppPath().startsWith(this.AppPath)) { return; } - this.needRunInstaller(needRun => { + this.needRunInstaller((needRun) => { if (needRun) { this.showAlert(); this.runInstaller(); @@ -26,7 +26,7 @@ const AppRightsChecker = { }, needRunInstaller(callback) { - Launcher.statFile(this.AppPath, stat => { + Launcher.statFile(this.AppPath, (stat) => { const folderIsRoot = stat && stat.uid === 0; callback(!folderIsRoot); }); @@ -46,7 +46,7 @@ const AppRightsChecker = { { result: 'skip', title: Locale.alertDoNotAsk, error: true }, Alerts.buttons.ok ], - success: result => { + success: (result) => { if (result === 'skip') { this.dontAskAnymore(); } @@ -59,7 +59,7 @@ const AppRightsChecker = { Launcher.spawn({ cmd: this.AppPath + '/Contents/Installer/KeeWeb Installer.app/Contents/MacOS/applet', complete: () => { - this.needRunInstaller(needRun => { + this.needRunInstaller((needRun) => { if (this.alert && !needRun) { this.alert.closeWithResult('cancel'); } @@ -69,7 +69,7 @@ const AppRightsChecker = { }, dontAskAnymore() { - this.needRunInstaller(needRun => { + this.needRunInstaller((needRun) => { if (needRun) { AppSettingsModel.skipFolderRightsWarning = true; } diff --git a/app/scripts/comp/app/chal-resp-calculator.js b/app/scripts/comp/app/chal-resp-calculator.js index 7c4041a6..f3dc8094 100644 --- a/app/scripts/comp/app/chal-resp-calculator.js +++ b/app/scripts/comp/app/chal-resp-calculator.js @@ -20,7 +20,7 @@ const ChalRespCalculator = { if (!params) { return null; } - return challenge => { + return (challenge) => { return new Promise((resolve, reject) => { challenge = Buffer.from(challenge); const hexChallenge = challenge.toString('hex'); @@ -60,7 +60,7 @@ const ChalRespCalculator = { if (err) { if (err.noKey) { logger.info('YubiKey ChalResp: no key'); - this._showNoKeyAlert(params.serial, err => { + this._showNoKeyAlert(params.serial, (err) => { if (err) { return callback(err); } @@ -69,7 +69,7 @@ const ChalRespCalculator = { return; } else if (err.touchRequested) { logger.info('YubiKey ChalResp: touch requested'); - touchAlert = this._showTouchAlert(params.serial, err => { + touchAlert = this._showTouchAlert(params.serial, (err) => { touchAlert = null; userCanceled = true; @@ -114,7 +114,7 @@ const ChalRespCalculator = { logger.error('YubiKey list error', err); return; } - const isAttached = list.some(yk => yk.serial === serial); + const isAttached = list.some((yk) => yk.serial === serial); logger.info(isAttached ? 'YubiKey found' : 'YubiKey not found'); if (isAttached) { Events.off('usb-devices-changed', onUsbDevicesChanged); diff --git a/app/scripts/comp/app/dropbox-chooser.js b/app/scripts/comp/app/dropbox-chooser.js index 06c09158..4d14453b 100644 --- a/app/scripts/comp/app/dropbox-chooser.js +++ b/app/scripts/comp/app/dropbox-chooser.js @@ -3,19 +3,19 @@ import { UrlFormat } from 'util/formatting/url-format'; const ChooserAppKey = 'qp7ctun6qt5n9d6'; -const DropboxChooser = function(callback) { +const DropboxChooser = function (callback) { this.cb = callback; this.onMessage = this.onMessage.bind(this); }; -DropboxChooser.prototype.callback = function(err, res) { +DropboxChooser.prototype.callback = function (err, res) { if (this.cb) { this.cb(err, res); } this.cb = null; }; -DropboxChooser.prototype.choose = function() { +DropboxChooser.prototype.choose = function () { const windowFeatures = 'width=640,height=552,left=357,top=100,resizable=yes,location=yes'; const url = this.buildUrl(); this.popup = window.open(url, 'dropbox', windowFeatures); @@ -26,7 +26,7 @@ DropboxChooser.prototype.choose = function() { this.closeInt = setInterval(this.checkClose.bind(this), 200); }; -DropboxChooser.prototype.buildUrl = function() { +DropboxChooser.prototype.buildUrl = function () { return UrlFormat.makeUrl('https://www.dropbox.com/chooser', { origin: window.location.protocol + '//' + window.location.host, 'app_key': AppSettingsModel.dropboxAppKey || ChooserAppKey, @@ -40,7 +40,7 @@ DropboxChooser.prototype.buildUrl = function() { }); }; -DropboxChooser.prototype.onMessage = function(e) { +DropboxChooser.prototype.onMessage = function (e) { if (e.source !== this.popup || e.origin !== 'https://www.dropbox.com') { return; } @@ -69,7 +69,7 @@ DropboxChooser.prototype.onMessage = function(e) { } }; -DropboxChooser.prototype.checkClose = function() { +DropboxChooser.prototype.checkClose = function () { if (this.popup.closed) { clearInterval(this.closeInt); window.removeEventListener('message', this.onMessage); @@ -79,7 +79,7 @@ DropboxChooser.prototype.checkClose = function() { } }; -DropboxChooser.prototype.success = function(params) { +DropboxChooser.prototype.success = function (params) { if (!params || !params[0] || !params[0].link || params[0].is_dir) { return this.callback('bad result'); } @@ -87,7 +87,7 @@ DropboxChooser.prototype.success = function(params) { this.readFile(this.result.link); }; -DropboxChooser.prototype.readFile = function(url) { +DropboxChooser.prototype.readFile = function (url) { const xhr = new XMLHttpRequest(); xhr.addEventListener('load', () => { this.callback(null, { name: this.result.name, data: xhr.response }); diff --git a/app/scripts/comp/app/generator-presets.js b/app/scripts/comp/app/generator-presets.js index a3d05ab5..69c12cea 100644 --- a/app/scripts/comp/app/generator-presets.js +++ b/app/scripts/comp/app/generator-presets.js @@ -67,16 +67,16 @@ const GeneratorPresets = { get all() { let presets = this.builtIn; - presets.forEach(preset => { + presets.forEach((preset) => { preset.builtIn = true; }); const setting = AppSettingsModel.generatorPresets; if (setting) { if (setting.user) { - presets = presets.concat(setting.user.map(item => ({ ...item }))); + presets = presets.concat(setting.user.map((item) => ({ ...item }))); } let hasDefault = false; - presets.forEach(preset => { + presets.forEach((preset) => { if (setting.disabled && setting.disabled[preset.name]) { preset.disabled = true; } @@ -93,7 +93,7 @@ const GeneratorPresets = { }, get enabled() { - const allPresets = this.all.filter(preset => !preset.disabled); + const allPresets = this.all.filter((preset) => !preset.disabled); if (!allPresets.length) { allPresets.push(this.defaultPreset); } @@ -110,7 +110,7 @@ const GeneratorPresets = { add(preset) { const setting = this.getOrCreateSetting(); - if (preset.name && !setting.user.filter(p => p.name === preset.name).length) { + if (preset.name && !setting.user.filter((p) => p.name === preset.name).length) { setting.user.push(preset); this.save(setting); } @@ -118,13 +118,13 @@ const GeneratorPresets = { remove(name) { const setting = this.getOrCreateSetting(); - setting.user = setting.user.filter(p => p.name !== name); + setting.user = setting.user.filter((p) => p.name !== name); this.save(setting); }, setPreset(name, props) { const setting = this.getOrCreateSetting(); - const preset = setting.user.filter(p => p.name === name)[0]; + const preset = setting.user.filter((p) => p.name === name)[0]; if (preset) { Object.assign(preset, props); this.save(setting); diff --git a/app/scripts/comp/app/shortcuts.js b/app/scripts/comp/app/shortcuts.js index f90675f1..3a84e46c 100644 --- a/app/scripts/comp/app/shortcuts.js +++ b/app/scripts/comp/app/shortcuts.js @@ -56,7 +56,7 @@ const Shortcuts = { } return shortcutValue .split(/\+/g) - .map(part => { + .map((part) => { switch (part) { case 'Ctrl': return this.ctrlShortcutSymbol(formatting); diff --git a/app/scripts/comp/app/start-profiler.js b/app/scripts/comp/app/start-profiler.js index 1123f3ec..4c8ea9cd 100644 --- a/app/scripts/comp/app/start-profiler.js +++ b/app/scripts/comp/app/start-profiler.js @@ -30,7 +30,7 @@ const StartProfiler = { printReport(name, operations, totalTime) { const message = `${name} started in ${totalTime}ms: ` + - operations.map(op => `${op.name}=${Math.round(op.elapsed)}ms`).join(', '); + operations.map((op) => `${op.name}=${Math.round(op.elapsed)}ms`).join(', '); logger.info(message); }, diff --git a/app/scripts/comp/app/updater.js b/app/scripts/comp/app/updater.js index c48e52d4..127c5e82 100644 --- a/app/scripts/comp/app/updater.js +++ b/app/scripts/comp/app/updater.js @@ -43,7 +43,7 @@ const Updater = { if (!Launcher && navigator.serviceWorker && !RuntimeInfo.beta && !RuntimeInfo.devMode) { navigator.serviceWorker .register('service-worker.js') - .then(reg => { + .then((reg) => { logger.info('Service worker registered'); reg.addEventListener('updatefound', () => { if (reg.active) { @@ -52,7 +52,7 @@ const Updater = { } }); }) - .catch(e => { + .catch((e) => { logger.error('Failed to register a service worker', e); }); } @@ -99,7 +99,7 @@ const Updater = { Transport.httpGet({ url: Links.Manifest, utf8: true, - success: data => { + success: (data) => { const dt = new Date(); const match = data.match(/#\s*(\d+\-\d+\-\d+):v([\d+\.\w]+)/); logger.info('Update check: ' + (match ? match[0] : 'unknown')); @@ -145,7 +145,7 @@ const Updater = { UpdateModel.set({ updateStatus: 'found' }); } }, - error: e => { + error: (e) => { logger.error('Update check error', e); UpdateModel.set({ status: 'error', @@ -186,10 +186,10 @@ const Updater = { url: Links.UpdateDesktop.replace('{ver}', ver), file: 'KeeWeb-' + ver + '.zip', cache: !startedByUser, - success: filePath => { + success: (filePath) => { UpdateModel.set({ updateStatus: 'extracting' }); logger.info('Extracting update file', this.UpdateCheckFiles, filePath); - this.extractAppUpdate(filePath, err => { + this.extractAppUpdate(filePath, (err) => { if (err) { logger.error('Error extracting update', err); UpdateModel.set({ @@ -225,7 +225,7 @@ const Updater = { const zip = new StreamZip({ file: updateFile, storeEntries: true }); zip.on('error', cb); zip.on('ready', () => { - const containsAll = expectedFiles.every(expFile => { + const containsAll = expectedFiles.every((expFile) => { const entry = zip.entry(expFile); return entry && entry.isFile; }); @@ -234,7 +234,7 @@ const Updater = { } this.validateArchiveSignature(updateFile, zip) .then(() => { - zip.extract(null, appPath, err => { + zip.extract(null, appPath, (err) => { zip.close(); if (err) { return cb(err); @@ -243,7 +243,7 @@ const Updater = { cb(); }); }) - .catch(e => { + .catch((e) => { return cb('Invalid archive: ' + e); }); }); @@ -264,7 +264,7 @@ const Updater = { .catch(() => { throw new Error('Error verifying signature'); }) - .then(isValid => { + .then((isValid) => { if (!isValid) { throw new Error('Invalid signature'); } diff --git a/app/scripts/comp/app/usb-listener.js b/app/scripts/comp/app/usb-listener.js index 3f28c273..caedfcc9 100644 --- a/app/scripts/comp/app/usb-listener.js +++ b/app/scripts/comp/app/usb-listener.js @@ -46,7 +46,7 @@ const UsbListener = { this.attachedYubiKeys = this.usb .getDeviceList() .filter(this.isYubiKey) - .map(device => ({ device })); + .map((device) => ({ device })); if (this.attachedYubiKeys.length > 0) { logger.info(`${this.attachedYubiKeys.length} YubiKey(s) found`, logger.ts(ts)); @@ -89,7 +89,7 @@ const UsbListener = { deviceDetached(device) { if (UsbListener.isYubiKey(device)) { const index = UsbListener.attachedYubiKeys.findIndex( - yk => yk.device.deviceAddress === device.deviceAddress + (yk) => yk.device.deviceAddress === device.deviceAddress ); if (index >= 0) { UsbListener.attachedYubiKeys.splice(index, 1); diff --git a/app/scripts/comp/app/yubikey.js b/app/scripts/comp/app/yubikey.js index d53eef41..5dc5d81f 100644 --- a/app/scripts/comp/app/yubikey.js +++ b/app/scripts/comp/app/yubikey.js @@ -25,7 +25,7 @@ const YubiKey = { if (this.ykmanStatus === 'ok') { return Promise.resolve(this.ykmanStatus); } - return new Promise(resolve => { + return new Promise((resolve) => { this.ykmanStatus = 'checking'; Launcher.spawn({ cmd: 'ykman', @@ -121,13 +121,13 @@ const YubiKey = { const yubiKeysIncludingEmpty = stdout .trim() .split(/\n/g) - .map(line => { + .map((line) => { const fullName = line; const serial = (line.match(/\d{5,}$/g) || [])[0]; return { fullName, serial }; }); - const yubiKeys = yubiKeysIncludingEmpty.filter(s => s.serial); + const yubiKeys = yubiKeysIncludingEmpty.filter((s) => s.serial); if ( yubiKeysIncludingEmpty.length === 1 && @@ -176,7 +176,7 @@ const YubiKey = { cmd: 'ykman', args: ['config', 'usb', '-e', 'oath', '-f'], noStdOutLogging: true, - complete: err => { + complete: (err) => { logger.info('Repair complete', err ? 'with error' : 'OK'); if (err) { Events.off('usb-devices-changed', onDevicesChangedDuringRepair); diff --git a/app/scripts/comp/browser/key-handler.js b/app/scripts/comp/browser/key-handler.js index a2b88256..670f6928 100644 --- a/app/scripts/comp/browser/key-handler.js +++ b/app/scripts/comp/browser/key-handler.js @@ -44,7 +44,7 @@ class KeyHandler { offKey(key, handler, thisArg) { if (this.shortcuts[key]) { this.shortcuts[key] = this.shortcuts[key].filter( - sh => sh.handler !== handler || sh.thisArg !== thisArg + (sh) => sh.handler !== handler || sh.thisArg !== thisArg ); } } diff --git a/app/scripts/comp/browser/popup-notifier.js b/app/scripts/comp/browser/popup-notifier.js index fd504206..cdea954e 100644 --- a/app/scripts/comp/browser/popup-notifier.js +++ b/app/scripts/comp/browser/popup-notifier.js @@ -16,7 +16,7 @@ const PopupNotifier = { window.open = noop; } else { const windowOpen = window.open; - window.open = function(...args) { + window.open = function (...args) { const win = windowOpen.apply(window, args); if (win) { PopupNotifier.deferCheckClosed(win); diff --git a/app/scripts/comp/browser/secure-input.js b/app/scripts/comp/browser/secure-input.js index b13e6a09..f9e51b1f 100644 --- a/app/scripts/comp/browser/secure-input.js +++ b/app/scripts/comp/browser/secure-input.js @@ -1,6 +1,6 @@ import kdbxweb from 'kdbxweb'; -const SecureInput = function() { +const SecureInput = function () { this.el = null; this.minChar = 0x1400 + Math.round(Math.random() * 100); this.maxLen = 1024; @@ -9,13 +9,13 @@ const SecureInput = function() { this.salt = new Uint32Array(0); }; -SecureInput.prototype.setElement = function(el) { +SecureInput.prototype.setElement = function (el) { this.el = el; this.el.val(this.pseudoValue); this.el.on('input', this._input.bind(this)); }; -SecureInput.prototype.reset = function() { +SecureInput.prototype.reset = function () { this.el = null; this.length = 0; this.pseudoValue = ''; @@ -28,7 +28,7 @@ SecureInput.prototype.reset = function() { this.salt = new Uint32Array(0); }; -SecureInput.prototype._input = function() { +SecureInput.prototype._input = function () { const selStart = this.el[0].selectionStart; const value = this.el.val(); let newPs = ''; @@ -63,11 +63,11 @@ SecureInput.prototype._input = function() { this.el[0].selectionEnd = selStart; }; -SecureInput.prototype._getChar = function(ix) { +SecureInput.prototype._getChar = function (ix) { return String.fromCharCode(this.minChar + ix); }; -SecureInput.prototype._isSpecialChar = function(ch) { +SecureInput.prototype._isSpecialChar = function (ch) { return ch >= this.minChar && ch <= this.minChar + this.maxLen; }; diff --git a/app/scripts/comp/browser/transport.js b/app/scripts/comp/browser/transport.js index 48b030ec..5318d28c 100644 --- a/app/scripts/comp/browser/transport.js +++ b/app/scripts/comp/browser/transport.js @@ -27,7 +27,7 @@ const Transport = { logger.info('GET ' + config.url); const opts = Launcher.req('url').parse(config.url); opts.headers = { 'User-Agent': navigator.userAgent }; - Launcher.resolveProxy(config.url, proxy => { + Launcher.resolveProxy(config.url, (proxy) => { logger.info( 'Request to ' + config.url + @@ -41,7 +41,7 @@ const Transport = { opts.path = config.url; } Launcher.req(proto) - .get(opts, res => { + .get(opts, (res) => { logger.info('Response from ' + config.url + ': ' + res.statusCode); if (res.statusCode === 200) { if (config.file) { @@ -52,12 +52,12 @@ const Transport = { config.success(tmpFile); }); }); - file.on('error', err => { + file.on('error', (err) => { config.error(err); }); } else { let data = []; - res.on('data', chunk => { + res.on('data', (chunk) => { data.push(chunk); }); res.on('end', () => { @@ -79,7 +79,7 @@ const Transport = { config.error('HTTP status ' + res.statusCode); } }) - .on('error', e => { + .on('error', (e) => { logger.error('Cannot GET ' + config.url, e); if (tmpFile) { fs.unlink(tmpFile, noop); diff --git a/app/scripts/comp/format/kdbx-to-html.js b/app/scripts/comp/format/kdbx-to-html.js index 9aa19069..3214be26 100644 --- a/app/scripts/comp/format/kdbx-to-html.js +++ b/app/scripts/comp/format/kdbx-to-html.js @@ -31,13 +31,15 @@ function walkGroup(db, group, parents) { ) { return ''; } - const self = group.entries.map(entry => walkEntry(db, entry, parents)).join('\n'); - const children = group.groups.map(childGroup => walkGroup(db, childGroup, parents)).join('\n'); + const self = group.entries.map((entry) => walkEntry(db, entry, parents)).join('\n'); + const children = group.groups + .map((childGroup) => walkGroup(db, childGroup, parents)) + .join('\n'); return self + children; } function walkEntry(db, entry, parents) { - const path = parents.map(group => group.name).join(' / '); + const path = parents.map((group) => group.name).join(' / '); const fields = []; for (const field of FieldMapping) { const value = entryField(entry, field.name); @@ -78,7 +80,7 @@ function walkEntry(db, entry, parents) { } return { name, data }; }) - .filter(att => att.name && att.data); + .filter((att) => att.name && att.data); return Templates.entry({ path, @@ -99,7 +101,7 @@ function entryField(entry, fieldName) { const KdbxToHtml = { convert(db, options) { - const content = db.groups.map(group => walkGroup(db, group, [])).join('\n'); + const content = db.groups.map((group) => walkGroup(db, group, [])).join('\n'); return Templates.db({ name: options.name, date: DateFormat.dtStr(Date.now()), diff --git a/app/scripts/comp/format/otp-qr-reader.js b/app/scripts/comp/format/otp-qr-reader.js index 180497ff..d31b0c57 100644 --- a/app/scripts/comp/format/otp-qr-reader.js +++ b/app/scripts/comp/format/otp-qr-reader.js @@ -51,7 +51,7 @@ class OtpQrReader { click: '', enter: '', buttons, - complete: res => { + complete: (res) => { this.alert = null; this.stopListenClipboard(); if (res === 'select') { @@ -94,7 +94,7 @@ class OtpQrReader { pasteEvent(e) { const item = [...e.clipboardData.items].find( - item => item.kind === 'file' && item.type.indexOf('image') !== -1 + (item) => item.kind === 'file' && item.type.indexOf('image') !== -1 ); if (!item) { logger.debug('Paste without file'); diff --git a/app/scripts/comp/launcher/launcher-cordova.js b/app/scripts/comp/launcher/launcher-cordova.js index 55404fc3..9e8a65e5 100644 --- a/app/scripts/comp/launcher/launcher-cordova.js +++ b/app/scripts/comp/launcher/launcher-cordova.js @@ -31,7 +31,7 @@ const Launcher = { }, getDataPath(...args) { const storagePath = window.cordova.file.externalDataDirectory; - return [storagePath].concat(Array.from(args)).filter(s => !!s); + return [storagePath].concat(Array.from(args)).filter((s) => !!s); }, getUserDataPath(fileName) { return this.getDataPath('userdata', fileName).join('/'); @@ -52,10 +52,10 @@ const Launcher = { return [...parts].join('/'); }, writeFile(path, data, callback) { - const createFile = filePath => { + const createFile = (filePath) => { window.resolveLocalFileSystemURL( filePath.dir, - dir => { + (dir) => { dir.getFile(filePath.file, { create: true }, writeFile); }, callback, @@ -63,8 +63,8 @@ const Launcher = { ); }; - const writeFile = fileEntry => { - fileEntry.createWriter(fileWriter => { + const writeFile = (fileEntry) => { + fileEntry.createWriter((fileWriter) => { fileWriter.onerror = callback; fileWriter.onwriteend = () => callback(); fileWriter.write(data); @@ -85,9 +85,9 @@ const Launcher = { readFile(path, encoding, callback) { window.resolveLocalFileSystemURL( path, - fileEntry => { + (fileEntry) => { fileEntry.file( - file => { + (file) => { const reader = new FileReader(); reader.onerror = callback; reader.onloadend = () => { @@ -98,23 +98,23 @@ const Launcher = { }; reader.readAsArrayBuffer(file); }, - err => callback(undefined, err) + (err) => callback(undefined, err) ); }, - err => callback(undefined, err) + (err) => callback(undefined, err) ); }, fileExists(path, callback) { window.resolveLocalFileSystemURL( path, - fileEntry => callback(true), + (fileEntry) => callback(true), () => callback(false) ); }, deleteFile(path, callback) { window.resolveLocalFileSystemURL( path, - fileEntry => { + (fileEntry) => { fileEntry.remove(callback, callback, callback); }, callback @@ -123,18 +123,18 @@ const Launcher = { statFile(path, callback) { window.resolveLocalFileSystemURL( path, - fileEntry => { + (fileEntry) => { fileEntry.file( - file => { + (file) => { callback({ ctime: new Date(file.lastModified), mtime: new Date(file.lastModified) }); }, - err => callback(undefined, err) + (err) => callback(undefined, err) ); }, - err => callback(undefined, err) + (err) => callback(undefined, err) ); }, mkdir(dir, callback) { @@ -144,7 +144,7 @@ const Launcher = { dirEntry.getDirectory( name, { create: true }, - dirEntry => { + (dirEntry) => { if (path.length) { // there is more to create createDir(dirEntry, path, callback); @@ -159,12 +159,12 @@ const Launcher = { const localPath = dir .replace(basePath, '') .split('/') - .filter(s => !!s); + .filter((s) => !!s); if (localPath.length) { window.resolveLocalFileSystemURL( basePath, - dirEntry => { + (dirEntry) => { createDir(dirEntry, localPath, callback); }, callback @@ -229,9 +229,9 @@ const Launcher = { }, // spawn(config) {}, openFileChooser(callback) { - const onFileSelected = function(selected) { - window.resolveLocalFileSystemURL(selected.uri, fileEntry => { - fileEntry.file(file => { + const onFileSelected = function (selected) { + window.resolveLocalFileSystemURL(selected.uri, (fileEntry) => { + fileEntry.file((file) => { file.path = file.localURL; file.name = selected.name; callback(null, file); @@ -249,7 +249,7 @@ const Launcher = { }, register(fileId, password, callback) { - FingerprintAuth.isAvailable(result => { + FingerprintAuth.isAvailable((result) => { if (!result.isAvailable) { return; } @@ -260,7 +260,7 @@ const Launcher = { password: password.getText() }; - FingerprintAuth.encrypt(encryptConfig, result => { + FingerprintAuth.encrypt(encryptConfig, (result) => { callback(result.token); }); }); @@ -273,7 +273,7 @@ const Launcher = { const decryptConfig = { ...this.config, username: fileId, token }; - FingerprintAuth.decrypt(decryptConfig, result => { + FingerprintAuth.decrypt(decryptConfig, (result) => { callback(result.password); }); } diff --git a/app/scripts/comp/launcher/launcher-electron.js b/app/scripts/comp/launcher/launcher-electron.js index 8dfd2dba..15943993 100644 --- a/app/scripts/comp/launcher/launcher-electron.js +++ b/app/scripts/comp/launcher/launcher-electron.js @@ -36,9 +36,7 @@ const Launcher = { }, devTools: true, openDevTools() { - this.electron() - .remote.getCurrentWindow() - .webContents.openDevTools({ mode: 'bottom' }); + this.electron().remote.getCurrentWindow().webContents.openDevTools({ mode: 'bottom' }); }, getSaveFileName(defaultPath, callback) { if (defaultPath) { @@ -51,7 +49,7 @@ const Launcher = { defaultPath, filters: [{ name: Locale.launcherFileFilter, extensions: ['kdbx'] }] }) - .then(res => callback(res.filePath)); + .then((res) => callback(res.filePath)); }, getUserDataPath(fileName) { if (!this.userDataPath) { @@ -99,8 +97,8 @@ const Launcher = { const path = this.req('path'); const stack = []; - const collect = function(dir, stack, callback) { - fs.exists(dir, exists => { + const collect = function (dir, stack, callback) { + fs.exists(dir, (exists) => { if (exists) { return callback(); } @@ -115,12 +113,12 @@ const Launcher = { }); }; - const create = function(stack, callback) { + const create = function (stack, callback) { if (!stack.length) { return callback(); } - fs.mkdir(stack.shift(), err => (err ? callback(err) : create(stack, callback))); + fs.mkdir(stack.shift(), (err) => (err ? callback(err) : create(stack, callback))); }; collect(dir, stack, () => create(stack, callback)); @@ -211,7 +209,7 @@ const Launcher = { resolveProxy(url, callback) { const window = this.getMainWindow(); const session = window.webContents.session; - session.resolveProxy(url).then(proxy => { + session.resolveProxy(url).then((proxy) => { const match = /^proxy\s+([\w\.]+):(\d+)+\s*/i.exec(proxy); proxy = match && match[1] ? { host: match[1], port: +match[2] } : null; callback(proxy); @@ -235,10 +233,10 @@ const Launcher = { const ts = logger.ts(); let complete = config.complete; const ps = this.req('child_process').spawn(config.cmd, config.args); - [ps.stdin, ps.stdout, ps.stderr].forEach(s => s.setEncoding('utf-8')); + [ps.stdin, ps.stdout, ps.stderr].forEach((s) => s.setEncoding('utf-8')); let stderr = ''; let stdout = ''; - ps.stderr.on('data', d => { + ps.stderr.on('data', (d) => { stderr += d.toString('utf-8'); if (config.throwOnStdErr) { try { @@ -246,10 +244,10 @@ const Launcher = { } catch {} } }); - ps.stdout.on('data', d => { + ps.stdout.on('data', (d) => { stdout += d.toString('utf-8'); }); - ps.on('close', code => { + ps.on('close', (code) => { stdout = stdout.trim(); stderr = stderr.trim(); const msg = 'spawn ' + config.cmd + ': ' + code + ', ' + logger.ts(ts); @@ -263,7 +261,7 @@ const Launcher = { complete = null; } }); - ps.on('error', err => { + ps.on('error', (err) => { logger.error('spawn error: ' + config.cmd + ', ' + logger.ts(ts), err); if (complete) { complete(err); @@ -309,10 +307,10 @@ Events.on('launcher-exit-request', () => { }); Events.on('launcher-minimize', () => setTimeout(() => Events.emit('app-minimized'), 0)); Events.on('launcher-started-minimized', () => setTimeout(() => Launcher.minimizeApp(), 0)); -Events.on('start-profile', data => StartProfiler.reportAppProfile(data)); -Events.on('log', e => new Logger(e.category || 'remote-app')[e.method || 'info'](e.message)); +Events.on('start-profile', (data) => StartProfiler.reportAppProfile(data)); +Events.on('log', (e) => new Logger(e.category || 'remote-app')[e.method || 'info'](e.message)); -window.launcherOpen = file => Launcher.openFile(file); +window.launcherOpen = (file) => Launcher.openFile(file); if (window.launcherOpenedFile) { logger.info('Open file request', window.launcherOpenedFile); Launcher.openFile(window.launcherOpenedFile); @@ -328,7 +326,7 @@ Events.on('app-ready', () => }, 0) ); -Launcher.remoteApp().on('remote-app-event', e => { +Launcher.remoteApp().on('remote-app-event', (e) => { if (window.debugRemoteAppEvents) { logger.debug('remote-app-event', e.name); } diff --git a/app/scripts/comp/settings/settings-store.js b/app/scripts/comp/settings/settings-store.js index 59e5ad6e..542e21e0 100644 --- a/app/scripts/comp/settings/settings-store.js +++ b/app/scripts/comp/settings/settings-store.js @@ -15,15 +15,15 @@ const SettingsStore = { }); } return loadPromise - .then(data => (data ? JSON.parse(data) : null)) - .catch(err => { + .then((data) => (data ? JSON.parse(data) : null)) + .catch((err) => { logger.error(`Error loading ${key}`, err); }); }, save(key, data) { if (Launcher) { - return Launcher.saveConfig(key, JSON.stringify(data)).catch(err => { + return Launcher.saveConfig(key, JSON.stringify(data)).catch((err) => { logger.error(`Error saving ${key}`, err); }); } diff --git a/app/scripts/framework/collection.js b/app/scripts/framework/collection.js index a8028b12..3ba7bfa3 100644 --- a/app/scripts/framework/collection.js +++ b/app/scripts/framework/collection.js @@ -187,7 +187,7 @@ class Collection { } get(id) { - return this.find(model => model.id === id); + return this.find((model) => model.id === id); } remove(idOrModel) { diff --git a/app/scripts/framework/views/view.js b/app/scripts/framework/views/view.js index aa62d672..bc373768 100644 --- a/app/scripts/framework/views/view.js +++ b/app/scripts/framework/views/view.js @@ -130,7 +130,7 @@ class View extends EventEmitter { } for (const [event, handlers] of Object.entries(eventsMap)) { this.debugLogger?.debug('Bind', 'view', event, handlers); - const listener = e => this.eventListener(e, handlers); + const listener = (e) => this.eventListener(e, handlers); this.eventListeners[event] = listener; this.el.addEventListener(event, listener); } @@ -152,7 +152,7 @@ class View extends EventEmitter { for (const cfg of this.elementEventListeners) { const els = this.el.querySelectorAll(cfg.selector); this.debugLogger?.debug('Bind', 'element', cfg.event, cfg.selector, els.length); - cfg.listener = e => this.eventListener(e, [cfg]); + cfg.listener = (e) => this.eventListener(e, [cfg]); for (const el of els) { el.addEventListener(cfg.event, cfg.listener); cfg.els.push(el); @@ -209,7 +209,7 @@ class View extends EventEmitter { for (const view of Object.values(this.views)) { if (view) { if (view instanceof Array) { - view.forEach(v => v.remove()); + view.forEach((v) => v.remove()); } else { view.remove(); } diff --git a/app/scripts/hbs-helpers/cmp.js b/app/scripts/hbs-helpers/cmp.js index 4f819edb..a08cf60f 100644 --- a/app/scripts/hbs-helpers/cmp.js +++ b/app/scripts/hbs-helpers/cmp.js @@ -1,6 +1,6 @@ import Handlebars from 'hbs'; -Handlebars.registerHelper('cmp', function(lvalue, rvalue, op, options) { +Handlebars.registerHelper('cmp', function (lvalue, rvalue, op, options) { let cond; switch (op) { case '<': diff --git a/app/scripts/hbs-helpers/ifemptyoreq.js b/app/scripts/hbs-helpers/ifemptyoreq.js index aee4c4a3..8ef6aa74 100644 --- a/app/scripts/hbs-helpers/ifemptyoreq.js +++ b/app/scripts/hbs-helpers/ifemptyoreq.js @@ -1,5 +1,5 @@ import Handlebars from 'hbs'; -Handlebars.registerHelper('ifemptyoreq', function(lvalue, rvalue, options) { +Handlebars.registerHelper('ifemptyoreq', function (lvalue, rvalue, options) { return !lvalue || lvalue === rvalue ? options.fn(this) : options.inverse(this); }); diff --git a/app/scripts/hbs-helpers/ifeq.js b/app/scripts/hbs-helpers/ifeq.js index fe1e0d7a..c4596fec 100644 --- a/app/scripts/hbs-helpers/ifeq.js +++ b/app/scripts/hbs-helpers/ifeq.js @@ -1,5 +1,5 @@ import Handlebars from 'hbs'; -Handlebars.registerHelper('ifeq', function(lvalue, rvalue, options) { +Handlebars.registerHelper('ifeq', function (lvalue, rvalue, options) { return lvalue === rvalue ? options.fn(this) : options.inverse(this); }); diff --git a/app/scripts/hbs-helpers/ifneq.js b/app/scripts/hbs-helpers/ifneq.js index 19170fa3..2bceea2d 100644 --- a/app/scripts/hbs-helpers/ifneq.js +++ b/app/scripts/hbs-helpers/ifneq.js @@ -1,5 +1,5 @@ import Handlebars from 'hbs'; -Handlebars.registerHelper('ifneq', function(lvalue, rvalue, options) { +Handlebars.registerHelper('ifneq', function (lvalue, rvalue, options) { return lvalue !== rvalue ? options.fn(this) : options.inverse(this); }); diff --git a/app/scripts/hbs-helpers/res.js b/app/scripts/hbs-helpers/res.js index de701d45..adcad9a2 100644 --- a/app/scripts/hbs-helpers/res.js +++ b/app/scripts/hbs-helpers/res.js @@ -1,7 +1,7 @@ import Handlebars from 'hbs'; import { Locale } from 'util/locale'; -Handlebars.registerHelper('res', function(key, options) { +Handlebars.registerHelper('res', function (key, options) { let value = Locale[key]; if (value) { const ix = value.indexOf('{}'); @@ -12,7 +12,7 @@ Handlebars.registerHelper('res', function(key, options) { return value; }); -Handlebars.registerHelper('Res', key => { +Handlebars.registerHelper('Res', (key) => { let value = Locale[key]; if (value) { value = value[0].toUpperCase() + value.substr(1); diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js index a8ea7086..168f40fe 100644 --- a/app/scripts/models/app-model.js +++ b/app/scripts/models/app-model.js @@ -91,7 +91,7 @@ class AppModel { this.appLogger.error('Error loading app config', xhr.statusText, xhr.status); reject('Error loading app config'); }); - }).then(config => { + }).then((config) => { return this.applyUserConfig(config); }); } @@ -116,7 +116,7 @@ class AppModel { } config.files .filter( - file => + (file) => file && file.storage && file.name && @@ -124,7 +124,7 @@ class AppModel { !this.fileInfos.getMatch(file.storage, file.name, file.path) ) .map( - file => + (file) => new FileInfoModel({ id: IdGenerator.uuid(), name: file.name, @@ -134,10 +134,10 @@ class AppModel { }) ) .reverse() - .forEach(fi => this.fileInfos.unshift(fi)); + .forEach((fi) => this.fileInfos.unshift(fi)); } if (config.plugins) { - const pluginsPromises = config.plugins.map(plugin => + const pluginsPromises = config.plugins.map((plugin) => PluginManager.installIfNew(plugin.url, plugin.manifest, true) ); return Promise.all(pluginsPromises).then(() => { @@ -180,10 +180,10 @@ class AppModel { _addTags(file) { const tagsHash = {}; - this.tags.forEach(tag => { + this.tags.forEach((tag) => { tagsHash[tag.toLowerCase()] = true; }); - file.forEachEntry({}, entry => { + file.forEachEntry({}, (entry) => { for (const tag of entry.tags) { if (!tagsHash[tag.toLowerCase()]) { tagsHash[tag.toLowerCase()] = true; @@ -198,7 +198,7 @@ class AppModel { if (this.tags.length) { this.menu.tagsSection.scrollable = true; this.menu.tagsSection.setItems( - this.tags.map(tag => { + this.tags.map((tag) => { return { title: tag, icon: 'tag', @@ -226,7 +226,7 @@ class AppModel { } renameTag(from, to) { - this.files.forEach(file => file.renameTag && file.renameTag(from, to)); + this.files.forEach((file) => file.renameTag && file.renameTag(from, to)); this.updateTags(); } @@ -256,7 +256,7 @@ class AppModel { } emptyTrash() { - this.files.forEach(file => file.emptyTrash && file.emptyTrash()); + this.files.forEach((file) => file.emptyTrash && file.emptyTrash()); this.refresh(); } @@ -306,14 +306,14 @@ class AppModel { const preparedFilter = this.prepareFilter(filter); const entries = new SearchResultCollection(); - const devicesToMatchOtpEntries = this.files.filter(file => file.external); + const devicesToMatchOtpEntries = this.files.filter((file) => file.external); const matchedOtpEntrySet = this.settings.yubiKeyMatchEntries ? new Set() : undefined; this.files - .filter(file => !file.external) - .forEach(file => { - file.forEachEntry(preparedFilter, entry => { + .filter((file) => !file.external) + .forEach((file) => { + file.forEachEntry(preparedFilter, (entry) => { if (matchedOtpEntrySet) { for (const device of devicesToMatchOtpEntries) { const matchingEntry = device.getMatchingEntry(entry); @@ -328,7 +328,7 @@ class AppModel { if (devicesToMatchOtpEntries.length) { for (const device of devicesToMatchOtpEntries) { - device.forEachEntry(preparedFilter, entry => { + device.forEachEntry(preparedFilter, (entry) => { if (!matchedOtpEntrySet || !matchedOtpEntrySet.has(entry)) { entries.push(entry); } @@ -340,10 +340,10 @@ class AppModel { } addTrashGroups(collection) { - this.files.forEach(file => { + this.files.forEach((file) => { const trashGroup = file.getTrashGroup && file.getTrashGroup(); if (trashGroup) { - trashGroup.getOwnSubGroups().forEach(group => { + trashGroup.getOwnSubGroups().forEach((group) => { collection.unshift(GroupModel.fromGroup(group, file, trashGroup)); }); } @@ -359,10 +359,10 @@ class AppModel { const exact = filter.advanced && filter.advanced.exact; if (!exact && filter.text) { - const textParts = filter.text.split(/\s+/).filter(s => s); + const textParts = filter.text.split(/\s+/).filter((s) => s); if (textParts.length) { filter.textParts = textParts; - filter.textLowerParts = filter.textLower.split(/\s+/).filter(s => s); + filter.textLowerParts = filter.textLower.split(/\s+/).filter((s) => s); } } @@ -375,14 +375,14 @@ class AppModel { const selGroupId = this.filter.group; let file, group; if (selGroupId) { - this.files.some(f => { + this.files.some((f) => { file = f; group = f.getGroup(selGroupId); return group; }); } if (!group) { - file = this.files.find(f => f.active && !f.readOnly); + file = this.files.find((f) => f.active && !f.readOnly); group = file.groups[0]; } return { group, file }; @@ -390,10 +390,10 @@ class AppModel { completeUserNames(part) { const userNames = {}; - this.files.forEach(file => { + this.files.forEach((file) => { file.forEachEntry( { text: part, textLower: part.toLowerCase(), advanced: { user: true } }, - entry => { + (entry) => { const userName = entry.user; if (userName) { userNames[userName] = (userNames[userName] || 0) + 1; @@ -407,13 +407,13 @@ class AppModel { if (matches.length > maxResults) { matches.length = maxResults; } - return matches.map(m => m[0]); + return matches.map((m) => m[0]); } getEntryTemplates() { const entryTemplates = []; - this.files.forEach(file => { - file.forEachEntryTemplate?.(entry => { + this.files.forEach((file) => { + file.forEachEntryTemplate?.((entry) => { entryTemplates.push({ file, entry }); }); }); @@ -421,7 +421,7 @@ class AppModel { } canCreateEntries() { - return this.files.some(f => f.active && !f.readOnly); + return this.files.some((f) => f.active && !f.readOnly); } createNewEntry(args) { @@ -667,7 +667,7 @@ class AppModel { fingerprint: (fileInfo && fileInfo.fingerprint) || null, chalResp: params.chalResp }); - const openComplete = err => { + const openComplete = (err) => { if (err) { return callback(err); } @@ -723,7 +723,7 @@ class AppModel { storage: params.storage, path: params.path }); - file.importWithXml(params.fileXml, err => { + file.importWithXml(params.fileXml, (err) => { logger.info('Import xml complete ' + (err ? 'with error' : ''), err); if (err) { return callback(err); @@ -812,7 +812,7 @@ class AppModel { this.saveFileFingerprint(file, params.password); } if (this.settings.yubiKeyAutoOpen) { - if (this.attachedYubiKeysCount > 0 && !this.files.some(f => f.external)) { + if (this.attachedYubiKeysCount > 0 && !this.files.some((f) => f.external)) { this.tryOpenOtpDeviceInBackground(); } } @@ -882,7 +882,7 @@ class AppModel { }); } file.setSyncProgress(); - const complete = err => { + const complete = (err) => { if (!file.active) { return callback && callback('File is closed'); } @@ -922,7 +922,7 @@ class AppModel { if (err) { return complete(err); } - Storage.cache.save(fileInfo.id, null, data, err => { + Storage.cache.save(fileInfo.id, null, data, (err) => { logger.info('Saved to cache', err || 'no error'); complete(err); if (!err) { @@ -946,7 +946,7 @@ class AppModel { if (err) { return complete(err); } - file.mergeOrUpdate(data, options.remoteKey, err => { + file.mergeOrUpdate(data, options.remoteKey, (err) => { logger.info('Merge complete', err || 'no error'); this.refresh(); if (err) { @@ -966,7 +966,7 @@ class AppModel { saveToCacheAndStorage(); } else if (file.dirty) { logger.info('Saving not modified dirty file to cache'); - Storage.cache.save(fileInfo.id, null, data, err => { + Storage.cache.save(fileInfo.id, null, data, (err) => { if (err) { return complete(err); } @@ -981,7 +981,7 @@ class AppModel { }); }); }; - const saveToStorage = data => { + const saveToStorage = (data) => { logger.info('Save data to storage'); const storageRev = fileInfo.storage === storage ? fileInfo.rev : undefined; Storage[storage].save( @@ -1029,7 +1029,7 @@ class AppModel { saveToStorage(data); } else { logger.info('Saving to cache'); - Storage.cache.save(fileInfo.id, null, data, err => { + Storage.cache.save(fileInfo.id, null, data, (err) => { if (err) { return complete(err); } @@ -1056,7 +1056,7 @@ class AppModel { logger.error('Error getting file data', e); return complete(err); } - Storage.cache.save(fileInfo.id, null, data, e => { + Storage.cache.save(fileInfo.id, null, data, (e) => { if (e) { logger.error('Error saving to cache', e); } @@ -1129,7 +1129,7 @@ class AppModel { if (Storage[backup.storage].getPathForName) { path = Storage[backup.storage].getPathForName(path); } - Storage[backup.storage].save(path, opts, data, err => { + Storage[backup.storage].save(path, opts, data, (err) => { if (err) { logger.error('Backup error', err); } else { @@ -1147,14 +1147,14 @@ class AppModel { if (Storage[backup.storage].getPathForName) { folderPath = Storage[backup.storage].getPathForName(folderPath).replace('.kdbx', ''); } - Storage[backup.storage].stat(folderPath, opts, err => { + Storage[backup.storage].stat(folderPath, opts, (err) => { if (err) { if (err.notFound) { logger.info('Backup folder does not exist'); if (!Storage[backup.storage].mkdir) { return callback('Mkdir not supported by ' + backup.storage); } - Storage[backup.storage].mkdir(folderPath, err => { + Storage[backup.storage].mkdir(folderPath, (err) => { if (err) { logger.error('Error creating backup folder', err); callback('Error creating backup folder'); @@ -1227,7 +1227,7 @@ class AppModel { saveFileFingerprint(file, password) { if (Launcher && Launcher.fingerprints && !file.fingerprint) { const fileInfo = this.fileInfos.get(file.id); - Launcher.fingerprints.register(file.id, password, token => { + Launcher.fingerprints.register(file.id, password, (token) => { if (token) { fileInfo.fingerprint = token; this.fileInfos.save(); @@ -1246,7 +1246,7 @@ class AppModel { } const isNewYubiKey = UsbListener.attachedYubiKeys.length > attachedYubiKeysCount; - const hasOpenFiles = this.files.some(file => file.active && !file.external); + const hasOpenFiles = this.files.some((file) => file.active && !file.external); if (isNewYubiKey && hasOpenFiles && !this.openingOtpDevice) { this.tryOpenOtpDeviceInBackground(); @@ -1255,7 +1255,7 @@ class AppModel { tryOpenOtpDeviceInBackground() { this.appLogger.debug('Auto-opening a YubiKey'); - this.openOtpDevice(err => { + this.openOtpDevice((err) => { this.appLogger.debug('YubiKey auto-open complete', err); }); } @@ -1263,7 +1263,7 @@ class AppModel { openOtpDevice(callback) { this.openingOtpDevice = true; const device = new YubiKeyOtpModel(); - device.open(err => { + device.open((err) => { this.openingOtpDevice = false; if (!err) { this.addFile(device); diff --git a/app/scripts/models/app-settings-model.js b/app/scripts/models/app-settings-model.js index 692d362c..e312e3d1 100644 --- a/app/scripts/models/app-settings-model.js +++ b/app/scripts/models/app-settings-model.js @@ -9,7 +9,7 @@ class AppSettingsModel extends Model { } load() { - return SettingsStore.load('app-settings').then(data => { + return SettingsStore.load('app-settings').then((data) => { if (data) { this.upgrade(data); this.set(data, { silent: true }); diff --git a/app/scripts/models/entry-model.js b/app/scripts/models/entry-model.js index 5e5915ea..82469060 100644 --- a/app/scripts/models/entry-model.js +++ b/app/scripts/models/entry-model.js @@ -107,10 +107,10 @@ class EntryModel extends Model { text += value.toLowerCase() + '\n'; } } - this.entry.tags.forEach(tag => { + this.entry.tags.forEach((tag) => { text += tag.toLowerCase() + '\n'; }); - this.attachments.forEach(att => { + this.attachments.forEach((att) => { text += att.title.toLowerCase() + '\n'; }); this.searchText = text; @@ -128,7 +128,7 @@ class EntryModel extends Model { } _buildSearchTags() { - this.searchTags = this.entry.tags.map(tag => tag.toLowerCase()); + this.searchTags = this.entry.tags.map((tag) => tag.toLowerCase()); } _buildSearchColor() { @@ -217,7 +217,7 @@ class EntryModel extends Model { resolveFieldReferences() { this.hasFieldRefs = false; - FieldRefFields.forEach(field => { + FieldRefFields.forEach((field) => { const fieldValue = this[field]; const refValue = this._resolveFieldReference(fieldValue); if (refValue !== undefined) { @@ -230,7 +230,7 @@ class EntryModel extends Model { getFieldValue(field) { field = field.toLowerCase(); let resolvedField; - Object.keys(this.entry.fields).some(entryField => { + Object.keys(this.entry.fields).some((entryField) => { if (entryField.toLowerCase() === field) { resolvedField = entryField; return true; @@ -310,7 +310,7 @@ class EntryModel extends Model { } renameTag(from, to) { - const ix = this.entry.tags.findIndex(tag => tag.toLowerCase() === from.toLowerCase()); + const ix = this.entry.tags.findIndex((tag) => tag.toLowerCase() === from.toLowerCase()); if (ix < 0) { return; } @@ -350,7 +350,7 @@ class EntryModel extends Model { addAttachment(name, data) { this._entryModified(); - return this.file.db.createBinary(data).then(binaryRef => { + return this.file.db.createBinary(data).then((binaryRef) => { this.entry.binaries[name] = binaryRef; this._fillByEntry(); }); @@ -363,7 +363,7 @@ class EntryModel extends Model { } getHistory() { - const history = this.entry.history.map(function(rec) { + const history = this.entry.history.map(function (rec) { return EntryModel.fromEntry(rec, this.group, this.file); }, this); history.push(this); @@ -466,7 +466,7 @@ class EntryModel extends Model { } else if (otpUrl.toLowerCase().lastIndexOf('otpauth:', 0) !== 0) { // KeeOTP plugin format const args = {}; - otpUrl.split('&').forEach(part => { + otpUrl.split('&').forEach((part) => { const parts = part.split('=', 2); args[parts[0]] = decodeURIComponent(parts[1]).replace(/=/g, ''); }); diff --git a/app/scripts/models/external/external-otp-entry-model.js b/app/scripts/models/external/external-otp-entry-model.js index e6980a3c..7d8292ed 100644 --- a/app/scripts/models/external/external-otp-entry-model.js +++ b/app/scripts/models/external/external-otp-entry-model.js @@ -13,7 +13,7 @@ class ExternalOtpEntryModel extends ExternalEntryModel { return; } const gen = { - next: callback => { + next: (callback) => { if (gen.otp && gen.expires) { const timeLeft = gen.expires - Date.now(); if (timeLeft > 0) { @@ -26,7 +26,7 @@ class ExternalOtpEntryModel extends ExternalEntryModel { }); return; } - gen.promise = new Promise(resolve => { + gen.promise = new Promise((resolve) => { gen.otpState = this.device.getOtp(this, (err, otp, timeLeft) => { gen.otpState = null; gen.promise = null; diff --git a/app/scripts/models/external/yubikey-otp-model.js b/app/scripts/models/external/yubikey-otp-model.js index 25939b6a..302a6241 100644 --- a/app/scripts/models/external/yubikey-otp-model.js +++ b/app/scripts/models/external/yubikey-otp-model.js @@ -34,7 +34,7 @@ class YubiKeyOtpModel extends ExternalOtpDeviceModel { const openErrors = []; const openNextYubiKey = () => { const yubiKey = yubiKeys.shift(); - this._addYubiKey(yubiKey.serial, err => { + this._addYubiKey(yubiKey.serial, (err) => { if (YubiKey.aborted) { return callback('Aborted'); } diff --git a/app/scripts/models/file-model.js b/app/scripts/models/file-model.js index 08171317..6118a67f 100644 --- a/app/scripts/models/file-model.js +++ b/app/scripts/models/file-model.js @@ -29,7 +29,7 @@ class FileModel extends Model { const ts = logger.ts(); kdbxweb.Kdbx.load(fileData, credentials) - .then(db => { + .then((db) => { this.db = db; this.readModel(); this.setOpenFile({ passwordLength: password ? password.textLength : 0 }); @@ -50,7 +50,7 @@ class FileModel extends Model { ); callback(); }) - .catch(err => { + .catch((err) => { if ( err.code === kdbxweb.Consts.ErrorCodes.InvalidKey && password && @@ -74,14 +74,14 @@ class FileModel extends Model { if (header.kdfParameters) { return header.kdfParameters .keys() - .map(key => { + .map((key) => { const val = header.kdfParameters.get(key); if (val instanceof ArrayBuffer) { return undefined; } return key + '=' + val; }) - .filter(p => p) + .filter((p) => p) .join('&'); } else if (header.keyEncryptionRounds) { return header.keyEncryptionRounds + ' rounds'; @@ -105,14 +105,14 @@ class FileModel extends Model { const password = kdbxweb.ProtectedValue.fromString(''); const credentials = new kdbxweb.Credentials(password); kdbxweb.Kdbx.loadXml(fileXml, credentials) - .then(db => { + .then((db) => { this.db = db; this.readModel(); this.set({ active: true, created: true }); logger.info('Imported file ' + this.name + ': ' + logger.ts(ts)); callback(); }) - .catch(err => { + .catch((err) => { logger.error('Error importing file', err.code, err.message, err); callback(err); }); @@ -128,7 +128,7 @@ class FileModel extends Model { const demoFile = kdbxweb.ByteUtils.arrayToBuffer( kdbxweb.ByteUtils.base64ToBytes(demoFileData) ); - kdbxweb.Kdbx.load(demoFile, credentials).then(db => { + kdbxweb.Kdbx.load(demoFile, credentials).then((db) => { this.db = db; this.name = 'Demo'; this.readModel(); @@ -169,7 +169,7 @@ class FileModel extends Model { }, { silent: true } ); - this.db.groups.forEach(function(group) { + this.db.groups.forEach(function (group) { let groupModel = this.getGroup(this.subId(group.uuid.id)); if (groupModel) { groupModel.setGroup(group, this); @@ -235,9 +235,9 @@ class FileModel extends Model { const entryMap = {}; const groupMap = {}; this.forEachGroup( - group => { + (group) => { groupMap[group.id] = group; - group.forEachOwnEntry(null, entry => { + group.forEachOwnEntry(null, (entry) => { entryMap[entry.id] = entry; }); }, @@ -249,7 +249,7 @@ class FileModel extends Model { resolveFieldReferences() { const entryMap = this.entryMap; - Object.keys(entryMap).forEach(e => { + Object.keys(entryMap).forEach((e) => { entryMap[e].resolveFieldReferences(); }); } @@ -297,7 +297,7 @@ class FileModel extends Model { } credentialsPromise.then(() => { kdbxweb.Kdbx.load(fileData, credentials) - .then(remoteDb => { + .then((remoteDb) => { if (this.modified) { try { if (remoteKey && remoteDb.meta.keyChanged > this.db.meta.keyChanged) { @@ -319,7 +319,7 @@ class FileModel extends Model { this.reload(); callback(); }) - .catch(err => { + .catch((err) => { logger.error('Error opening file to merge', err.code, err.message, err); callback(err); }); @@ -374,7 +374,7 @@ class FileModel extends Model { top.forEachOwnEntry(filter, callback); } if (!filter.group || filter.subGroups) { - top.forEachGroup(group => { + top.forEachGroup((group) => { group.forEachOwnEntry(filter, callback); }, filter); } @@ -382,7 +382,7 @@ class FileModel extends Model { } forEachGroup(callback, filter) { - this.groups.forEach(group => { + this.groups.forEach((group) => { if (callback(group) !== false) { group.forEachGroup(callback, filter); } @@ -426,17 +426,17 @@ class FileModel extends Model { this.db.cleanup({ binaries: true }); this.db .save() - .then(data => { + .then((data) => { cb(data); }) - .catch(err => { + .catch((err) => { logger.error('Error saving file', this.name, err); cb(undefined, err); }); } getXml(cb) { - this.db.saveXml(true).then(xml => { + this.db.saveXml(true).then((xml) => { cb(xml); }); } @@ -493,7 +493,7 @@ class FileModel extends Model { return; } this.setOpenFile({ passwordLength: this.passwordLength }); - this.forEachEntry({ includeDisabled: true }, entry => entry.setSaved()); + this.forEachEntry({ includeDisabled: true }, (entry) => entry.setSaved()); } setPassword(password) { @@ -649,11 +649,11 @@ class FileModel extends Model { trashGroup .getOwnSubGroups() .slice() - .forEach(function(group) { + .forEach(function (group) { this.db.move(group, null); modified = true; }, this); - trashGroup.group.entries.slice().forEach(function(entry) { + trashGroup.group.entries.slice().forEach(function (entry) { this.db.move(entry, null); modified = true; }, this); @@ -666,7 +666,7 @@ class FileModel extends Model { } getCustomIcons() { - return mapObject(this.db.meta.customIcons, customIcon => + return mapObject(this.db.meta.customIcons, (customIcon) => IconUrlFormat.toDataUrl(customIcon) ); } @@ -680,7 +680,7 @@ class FileModel extends Model { } renameTag(from, to) { - this.forEachEntry({}, entry => entry.renameTag(from, to)); + this.forEachEntry({}, (entry) => entry.renameTag(from, to)); } setFormatVersion(version) { diff --git a/app/scripts/models/group-model.js b/app/scripts/models/group-model.js index f82dd952..bb9a7c4d 100644 --- a/app/scripts/models/group-model.js +++ b/app/scripts/models/group-model.js @@ -39,7 +39,7 @@ class GroupModel extends MenuItemModel { const items = this.items; const entries = this.entries; - const itemsArray = group.groups.map(subGroup => { + const itemsArray = group.groups.map((subGroup) => { let g = file.getGroup(file.subId(subGroup.uuid.id)); if (g) { g.setGroup(subGroup, file, this); @@ -50,7 +50,7 @@ class GroupModel extends MenuItemModel { }, this); items.push(...itemsArray); - const entriesArray = group.entries.map(entry => { + const entriesArray = group.entries.map((entry) => { let e = file.getEntry(file.subId(entry.uuid.id)); if (e) { e.setEntry(entry, this, file); @@ -101,7 +101,7 @@ class GroupModel extends MenuItemModel { forEachGroup(callback, filter) { let result = true; - this.items.forEach(group => { + this.items.forEach((group) => { if (group.matches(filter)) { result = callback(group) !== false && group.forEachGroup(callback, filter) !== false; @@ -111,7 +111,7 @@ class GroupModel extends MenuItemModel { } forEachOwnEntry(filter, callback) { - this.entries.forEach(function(entry) { + this.entries.forEach(function (entry) { if (entry.matches(filter)) { callback(entry, this); } diff --git a/app/scripts/models/menu/menu-model.js b/app/scripts/models/menu/menu-model.js index 33d961da..9c0b00d0 100644 --- a/app/scripts/models/menu/menu-model.js +++ b/app/scripts/models/menu/menu-model.js @@ -49,7 +49,7 @@ class MenuModel extends Model { drop: true } ]); - Colors.AllColors.forEach(color => { + Colors.AllColors.forEach((color) => { const option = { cls: 'fa ' + color + '-color', value: color, @@ -96,7 +96,7 @@ class MenuModel extends Model { this.aboutSection, this.helpSection, this.filesSection - ].filter(s => s) + ].filter((s) => s) ); this.sections = this.menus.app; @@ -113,7 +113,7 @@ class MenuModel extends Model { this._select(section, sel.item); } if (sections === this.menus.app) { - this.colorsItem.options.forEach(opt => { + this.colorsItem.options.forEach((opt) => { opt.active = opt === sel.option; }); const selColor = @@ -135,7 +135,7 @@ class MenuModel extends Model { _selectPrevious() { let previousItem = null; - const processSection = section => { + const processSection = (section) => { if (section.visible === false) { return true; } @@ -144,7 +144,7 @@ class MenuModel extends Model { } const items = section.items; if (items) { - items.forEach(it => { + items.forEach((it) => { if (it.active && previousItem) { this.select({ item: previousItem }); return false; @@ -155,13 +155,13 @@ class MenuModel extends Model { }; const sections = this.sections; - sections.forEach(section => processSection(section)); + sections.forEach((section) => processSection(section)); } _selectNext() { let activeItem = null; - const processSection = section => { + const processSection = (section) => { if (section.visible === false) { return true; } @@ -172,7 +172,7 @@ class MenuModel extends Model { } const items = section.items; if (items) { - items.forEach(it => { + items.forEach((it) => { if (it.active) { activeItem = it; } @@ -182,7 +182,7 @@ class MenuModel extends Model { }; const sections = this.sections; - sections.forEach(section => processSection(section)); + sections.forEach((section) => processSection(section)); } _select(item, selectedItem) { diff --git a/app/scripts/models/menu/menu-section-model.js b/app/scripts/models/menu/menu-section-model.js index a515a153..0ba6093f 100644 --- a/app/scripts/models/menu/menu-section-model.js +++ b/app/scripts/models/menu/menu-section-model.js @@ -19,14 +19,14 @@ class MenuSectionModel extends Model { removeAllItems() { this.items.length = 0; if (this.defaultItems) { - this.items.push(...this.defaultItems.map(item => new MenuItemModel(item))); + this.items.push(...this.defaultItems.map((item) => new MenuItemModel(item))); } this.emit('change-items'); } removeByFile(file) { const items = this.items; - items.find(item => { + items.find((item) => { if (item.file === file || item.file === file) { items.remove(item); return true; diff --git a/app/scripts/models/runtime-data-model.js b/app/scripts/models/runtime-data-model.js index d39d64cb..1d81a116 100644 --- a/app/scripts/models/runtime-data-model.js +++ b/app/scripts/models/runtime-data-model.js @@ -8,7 +8,7 @@ class RuntimeDataModel extends Model { } load() { - return SettingsStore.load('runtime-data').then(data => { + return SettingsStore.load('runtime-data').then((data) => { if (data) { this.set(data, { silent: true }); } diff --git a/app/scripts/models/update-model.js b/app/scripts/models/update-model.js index 0ba19bb1..d0f6eca3 100644 --- a/app/scripts/models/update-model.js +++ b/app/scripts/models/update-model.js @@ -3,7 +3,7 @@ import { SettingsStore } from 'comp/settings/settings-store'; class UpdateModel extends Model { load() { - return SettingsStore.load('update-info').then(data => { + return SettingsStore.load('update-info').then((data) => { if (data) { try { for (const [key, val] of Object.entries(data)) { diff --git a/app/scripts/plugins/plugin-gallery.js b/app/scripts/plugins/plugin-gallery.js index a3a96fe7..b22a55af 100644 --- a/app/scripts/plugins/plugin-gallery.js +++ b/app/scripts/plugins/plugin-gallery.js @@ -19,7 +19,7 @@ const PluginGallery = { this.loading = true; this.loadError = false; const ts = this.logger.ts(); - return new Promise(resolve => { + return new Promise((resolve) => { this.logger.debug('Loading plugins...'); const xhr = new XMLHttpRequest(); xhr.open('GET', Links.Plugins + '/plugins.json'); @@ -34,14 +34,14 @@ const PluginGallery = { resolve(); }); }) - .then(data => { + .then((data) => { this.loading = false; if (!data) { this.loadError = true; Events.emit('plugin-gallery-load-complete'); return; } - return this.verifySignature(data).then(gallery => { + return this.verifySignature(data).then((gallery) => { this.loadError = !gallery; if (gallery) { this.logger.debug( @@ -55,7 +55,7 @@ const PluginGallery = { return gallery; }); }) - .catch(e => { + .catch((e) => { this.loadError = true; this.logger.error('Error loading plugin gallery', e); Events.emit('plugin-gallery-load-complete'); @@ -68,22 +68,22 @@ const PluginGallery = { kdbxweb.ByteUtils.stringToBytes(dataToVerify), gallery.signature ) - .then(isValid => { + .then((isValid) => { if (isValid) { return gallery; } this.logger.error('JSON signature invalid'); }) - .catch(e => { + .catch((e) => { this.logger.error('Error verifying plugins signature', e); }); }, getCachedGallery() { const ts = this.logger.ts(); - return SettingsStore.load('plugin-gallery').then(data => { + return SettingsStore.load('plugin-gallery').then((data) => { if (data) { - return this.verifySignature(data).then(gallery => { + return this.verifySignature(data).then((gallery) => { this.logger.debug(`Loaded cached plugin gallery`, this.logger.ts(ts)); return gallery; }); diff --git a/app/scripts/plugins/plugin-manager.js b/app/scripts/plugins/plugin-manager.js index 7b84fc03..ba8cd87c 100644 --- a/app/scripts/plugins/plugin-manager.js +++ b/app/scripts/plugins/plugin-manager.js @@ -21,7 +21,7 @@ class PluginManager extends Model { init() { const ts = logger.ts(); - return SettingsStore.load('plugins').then(state => { + return SettingsStore.load('plugins').then((state) => { if (!state) { return; } @@ -32,10 +32,10 @@ class PluginManager extends Model { if (!state || !state.plugins || !state.plugins.length) { return; } - return PluginGallery.getCachedGallery().then(gallery => { - const promises = state.plugins.map(plugin => this.loadPlugin(plugin, gallery)); - return Promise.all(promises).then(loadedPlugins => { - this.plugins.push(...loadedPlugins.filter(plugin => plugin)); + return PluginGallery.getCachedGallery().then((gallery) => { + const promises = state.plugins.map((plugin) => this.loadPlugin(plugin, gallery)); + return Promise.all(promises).then((loadedPlugins) => { + this.plugins.push(...loadedPlugins.filter((plugin) => plugin)); logger.info(`Loaded ${this.plugins.length} plugins`, logger.ts(ts)); }); }); @@ -45,7 +45,7 @@ class PluginManager extends Model { install(url, expectedManifest, skipSignatureValidation) { this.emit('change'); return Plugin.loadFromUrl(url, expectedManifest) - .then(plugin => { + .then((plugin) => { return this.uninstall(plugin.id).then(() => { if (skipSignatureValidation) { plugin.skipSignatureValidation = true; @@ -57,14 +57,14 @@ class PluginManager extends Model { }); }); }) - .catch(e => { + .catch((e) => { this.emit('change'); throw e; }); } installIfNew(url, expectedManifest, skipSignatureValidation) { - const plugin = this.plugins.find(p => p.url === url); + const plugin = this.plugins.find((p) => p.url === url); if (plugin && plugin.status !== 'invalid') { return Promise.resolve(); } @@ -123,19 +123,19 @@ class PluginManager extends Model { const url = oldPlugin.url; this.emit('change'); return Plugin.loadFromUrl(url) - .then(newPlugin => { + .then((newPlugin) => { return oldPlugin .update(newPlugin) .then(() => { this.emit('change'); this.saveState(); }) - .catch(e => { + .catch((e) => { this.emit('change'); throw e; }); }) - .catch(e => { + .catch((e) => { this.emit('change'); throw e; }); @@ -152,7 +152,7 @@ class PluginManager extends Model { } runAutoUpdate() { - const queue = this.plugins.filter(p => p.autoUpdate).map(p => p.id); + const queue = this.plugins.filter((p) => p.autoUpdate).map((p) => p.id); if (!queue.length) { return Promise.resolve(); } @@ -172,9 +172,7 @@ class PluginManager extends Model { const updateNext = () => { const pluginId = queue.shift(); if (pluginId) { - return this.update(pluginId) - .catch(noop) - .then(updateNext); + return this.update(pluginId).catch(noop).then(updateNext); } }; return updateNext(); @@ -189,7 +187,7 @@ class PluginManager extends Model { let enabled = desc.enabled; if (enabled) { const galleryPlugin = gallery - ? gallery.plugins.find(pl => pl.manifest.name === desc.manifest.name) + ? gallery.plugins.find((pl) => pl.manifest.name === desc.manifest.name) : null; const expectedPublicKeys = galleryPlugin ? [galleryPlugin.manifest.publicKey] @@ -206,7 +204,7 @@ class PluginManager extends Model { SettingsStore.save('plugins', { autoUpdateAppVersion: this.autoUpdateAppVersion, autoUpdateDate: this.autoUpdateDate, - plugins: this.plugins.map(plugin => ({ + plugins: this.plugins.map((plugin) => ({ manifest: plugin.manifest, url: plugin.url, enabled: plugin.status === 'active', diff --git a/app/scripts/plugins/plugin.js b/app/scripts/plugins/plugin.js index 2ed9228e..5272a141 100644 --- a/app/scripts/plugins/plugin.js +++ b/app/scripts/plugins/plugin.js @@ -64,7 +64,7 @@ class Plugin extends Model { .then(() => { this.installTime = this.logger.ts() - ts; }) - .catch(err => { + .catch((err) => { this.logger.error('Error installing plugin', err); this.set({ status: PluginStatus.STATUS_ERROR, @@ -166,7 +166,7 @@ class Plugin extends Model { ); this.resources = {}; const ts = this.logger.ts(); - const results = Object.keys(manifest.resources).map(res => + const results = Object.keys(manifest.resources).map((res) => this.loadResource(res, local, manifest) ); return Promise.all(results) @@ -209,9 +209,9 @@ class Plugin extends Model { const url = this.url + this.getResourcePath(type) + '?v=' + manifest.version; res = httpGet(url, true); } - return res.then(data => { + return res.then((data) => { this.logger.debug('Resource data loaded', type, this.logger.ts(ts)); - return this.verifyResource(data, type).then(data => { + return this.verifyResource(data, type).then((data) => { this.resources[type] = data; }); }); @@ -222,7 +222,7 @@ class Plugin extends Model { const manifest = this.manifest; const signature = manifest.resources[type]; return SignatureVerifier.verify(data, signature, manifest.publicKey) - .then(valid => { + .then((valid) => { if (valid) { this.logger.debug('Resource signature validated', type, this.logger.ts(ts)); return data; @@ -254,7 +254,7 @@ class Plugin extends Model { .then(() => { this.status = PluginStatus.STATUS_ACTIVE; }) - .catch(e => { + .catch((e) => { this.logger.info('Install error', e); this.status = PluginStatus.STATUS_ERROR; return this.disable().then(() => { @@ -268,7 +268,7 @@ class Plugin extends Model { for (const key of Object.keys(this.resources)) { resourceSavePromises.push(this.saveResource(key, this.resources[key])); } - return Promise.all(resourceSavePromises).catch(e => { + return Promise.all(resourceSavePromises).catch((e) => { this.logger.debug('Error saving plugin resources', e); return this.uninstall().then(() => { throw 'Error saving plugin resources'; @@ -279,7 +279,7 @@ class Plugin extends Model { saveResource(key, value) { return new Promise((resolve, reject) => { const storageKey = this.getStorageResourcePath(key); - io.save(storageKey, value, e => { + io.save(storageKey, value, (e) => { if (e) { reject(e); } else { @@ -298,7 +298,7 @@ class Plugin extends Model { } deleteResource(key) { - return new Promise(resolve => { + return new Promise((resolve) => { const storageKey = this.getStorageResourcePath(key); io.remove(storageKey, () => resolve()); }); @@ -567,7 +567,7 @@ class Plugin extends Model { }); this.logger.info('Update complete', this.logger.ts(ts)); }) - .catch(err => { + .catch((err) => { this.logger.error('Error updating plugin', err); if (prevStatus === PluginStatus.STATUS_ACTIVE) { this.logger.info('Activating previous version'); @@ -606,7 +606,7 @@ class Plugin extends Model { const settings = this.module.exports.getSettings(); const settingsPrefix = this.getSettingPrefix(); if (settings instanceof Array) { - return settings.map(setting => { + return settings.map((setting) => { setting = { ...setting }; const value = AppSettingsModel[settingsPrefix + setting.name]; if (value !== undefined) { @@ -642,11 +642,11 @@ class Plugin extends Model { commonLogger.info('Installing plugin from url', url); const manifestUrl = url + 'manifest.json'; return httpGet(manifestUrl) - .catch(e => { + .catch((e) => { commonLogger.error('Error loading plugin manifest', e); throw 'Error loading plugin manifest'; }) - .then(manifest => { + .then((manifest) => { try { manifest = JSON.parse(manifest); } catch (e) { diff --git a/app/scripts/plugins/theme-vars.js b/app/scripts/plugins/theme-vars.js index d6c65a33..f9b50c55 100644 --- a/app/scripts/plugins/theme-vars.js +++ b/app/scripts/plugins/theme-vars.js @@ -41,14 +41,14 @@ const ThemeVars = { const locals = []; while (replaced) { replaced = false; - result = result.replace(/([\w\-]+)\([^()]+\)/, fnText => { + result = result.replace(/([\w\-]+)\([^()]+\)/, (fnText) => { replaced = true; const [, name, argsStr] = fnText.match(/([\w\-]+)\((.*)\)/); const args = argsStr .trim() .split(/\s*,\s*/) - .filter(arg => arg) - .map(arg => this.resolveArg(arg, cssStyle, locals)); + .filter((arg) => arg) + .map((arg) => this.resolveArg(arg, cssStyle, locals)); locals.push(this.fn[name](...args)); return 'L' + (locals.length - 1); }); diff --git a/app/scripts/presenters/entry-presenter.js b/app/scripts/presenters/entry-presenter.js index f0d8c8fe..d1028138 100644 --- a/app/scripts/presenters/entry-presenter.js +++ b/app/scripts/presenters/entry-presenter.js @@ -1,7 +1,7 @@ import { DateFormat } from 'util/formatting/date-format'; import { Locale } from 'util/locale'; -const EntryPresenter = function(descField, noColor, activeEntryId) { +const EntryPresenter = function (descField, noColor, activeEntryId) { this.entry = null; this.descField = descField; this.noColor = noColor || ''; @@ -85,7 +85,7 @@ EntryPresenter.prototype = { return this.updated; case 'attachments': return ( - this.entry.attachments.map(a => a.title).join(', ') || + this.entry.attachments.map((a) => a.title).join(', ') || '(' + Locale.listNoAttachments + ')' ); default: diff --git a/app/scripts/storage/impl/storage-dropbox.js b/app/scripts/storage/impl/storage-dropbox.js index 68dda5bd..ef33936f 100644 --- a/app/scripts/storage/impl/storage-dropbox.js +++ b/app/scripts/storage/impl/storage-dropbox.js @@ -236,12 +236,12 @@ class StorageDropbox extends StorageBase { _encodeJsonHttpHeader(json) { return json.replace( /[\u007f-\uffff]/g, - c => '\\u' + ('000' + c.charCodeAt(0).toString(16)).slice(-4) + (c) => '\\u' + ('000' + c.charCodeAt(0).toString(16)).slice(-4) ); } _apiCall(args) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return args.error(err); } @@ -307,7 +307,7 @@ class StorageDropbox extends StorageBase { this._apiCall({ method: 'files/get_metadata', data: { path }, - success: stat => { + success: (stat) => { if (stat['.tag'] === 'file') { stat = { rev: stat.rev }; } else if (stat['.tag'] === 'folder') { @@ -341,7 +341,7 @@ class StorageDropbox extends StorageBase { apiArg: arg, data, responseType: 'json', - success: stat => { + success: (stat) => { this.logger.debug('Saved', path, stat.rev, this.logger.ts(ts)); callback(null, { rev: stat.rev }); }, @@ -358,9 +358,9 @@ class StorageDropbox extends StorageBase { path: this._toFullPath(dir || ''), recursive: false }, - success: data => { + success: (data) => { this.logger.debug('Listed', this.logger.ts(ts)); - const fileList = data.entries.map(f => ({ + const fileList = data.entries.map((f) => ({ name: f.name, path: this._toRelPath(f.path_display), rev: f.rev, diff --git a/app/scripts/storage/impl/storage-file-cache.js b/app/scripts/storage/impl/storage-file-cache.js index 250e6332..b107f3c0 100644 --- a/app/scripts/storage/impl/storage-file-cache.js +++ b/app/scripts/storage/impl/storage-file-cache.js @@ -19,7 +19,7 @@ class StorageFileCache extends StorageBase { const path = Launcher.getUserDataPath('OfflineFiles'); - const setPath = err => { + const setPath = (err) => { this.path = err ? null : path; if (err) { this.logger.error('Error opening local offline storage', err); @@ -27,7 +27,7 @@ class StorageFileCache extends StorageBase { return callback && callback(err); }; - Launcher.fileExists(path, exists => { + Launcher.fileExists(path, (exists) => { if (exists) { setPath(); } else { @@ -38,12 +38,12 @@ class StorageFileCache extends StorageBase { save(id, opts, data, callback) { this.logger.debug('Save', id); - this.initFs(err => { + this.initFs((err) => { if (err) { return callback && callback(err); } const ts = this.logger.ts(); - Launcher.writeFile(this.getPath(id), data, err => { + Launcher.writeFile(this.getPath(id), data, (err) => { if (err) { this.logger.error('Error saving to cache', id, err); return callback && callback(err); @@ -58,7 +58,7 @@ class StorageFileCache extends StorageBase { load(id, opts, callback) { this.logger.debug('Load', id); - this.initFs(err => { + this.initFs((err) => { if (err) { return callback && callback(null, err); } @@ -78,7 +78,7 @@ class StorageFileCache extends StorageBase { remove(id, opts, callback) { this.logger.debug('Remove', id); - this.initFs(err => { + this.initFs((err) => { if (err) { return callback && callback(err); } @@ -86,9 +86,9 @@ class StorageFileCache extends StorageBase { const ts = this.logger.ts(); const path = this.getPath(id); - Launcher.fileExists(path, exists => { + Launcher.fileExists(path, (exists) => { if (exists) { - Launcher.deleteFile(path, err => { + Launcher.deleteFile(path, (err) => { if (err) { this.logger.error('Error removing from cache', id, err); } else { diff --git a/app/scripts/storage/impl/storage-file.js b/app/scripts/storage/impl/storage-file.js index eee6d82c..1fc24d4f 100644 --- a/app/scripts/storage/impl/storage-file.js +++ b/app/scripts/storage/impl/storage-file.js @@ -14,7 +14,7 @@ class StorageFile extends StorageBase { this.logger.debug('Load', path); const ts = this.logger.ts(); - const onError = e => { + const onError = (e) => { this.logger.error('Error reading local file', path, e); if (callback) { callback(e, null); @@ -62,7 +62,7 @@ class StorageFile extends StorageBase { this.logger.debug('Save', path, rev); const ts = this.logger.ts(); - const onError = e => { + const onError = (e) => { if (Object.prototype.hasOwnProperty.call(e, 'code') && e.code === 'EISDIR') { e.isDir = true; } @@ -73,7 +73,7 @@ class StorageFile extends StorageBase { }; const write = () => { - Launcher.writeFile(path, data, err => { + Launcher.writeFile(path, data, (err) => { if (err) { return onError(err); } @@ -111,7 +111,7 @@ class StorageFile extends StorageBase { this.logger.debug('Make dir', path); const ts = this.logger.ts(); - Launcher.mkdir(path, err => { + Launcher.mkdir(path, (err) => { if (err) { this.logger.error('Error making local dir', path, err); if (callback) { @@ -158,7 +158,7 @@ class StorageFile extends StorageBase { const names = Launcher.parsePath(path); const watcher = fileWatchers[names.dir]; if (watcher) { - const ix = watcher.callbacks.findIndex(cb => cb.file === names.file); + const ix = watcher.callbacks.findIndex((cb) => cb.file === names.file); if (ix >= 0) { watcher.callbacks.splice(ix, 1); } @@ -173,7 +173,7 @@ class StorageFile extends StorageBase { fsWatcherChange(dirname, evt, fileName) { const watcher = fileWatchers[dirname]; if (watcher) { - watcher.callbacks.forEach(cb => { + watcher.callbacks.forEach((cb) => { if (cb.file === fileName && typeof cb.callback === 'function') { this.logger.debug('File changed', dirname, evt, fileName); cb.callback(); diff --git a/app/scripts/storage/impl/storage-gdrive.js b/app/scripts/storage/impl/storage-gdrive.js index 7228e416..ab27f468 100644 --- a/app/scripts/storage/impl/storage-gdrive.js +++ b/app/scripts/storage/impl/storage-gdrive.js @@ -35,11 +35,11 @@ class StorageGDrive extends StorageBase { this._xhr({ url, responseType: 'arraybuffer', - success: response => { + success: (response) => { this.logger.debug('Loaded', path, stat.rev, this.logger.ts(ts)); return callback && callback(null, response, { rev: stat.rev }); }, - error: err => { + error: (err) => { this.logger.error('Load error', path, err, this.logger.ts(ts)); return callback && callback(err); } @@ -51,7 +51,7 @@ class StorageGDrive extends StorageBase { if (path.lastIndexOf(NewFileIdPrefix, 0) === 0) { return callback && callback({ notFound: true }); } - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -61,12 +61,12 @@ class StorageGDrive extends StorageBase { this._xhr({ url, responseType: 'json', - success: response => { + success: (response) => { const rev = response.headRevisionId; this.logger.debug('Stated', path, rev, this.logger.ts(ts)); return callback && callback(null, { rev }); }, - error: err => { + error: (err) => { this.logger.error('Stat error', this.logger.ts(ts), err); return callback && callback(err); } @@ -75,7 +75,7 @@ class StorageGDrive extends StorageBase { } save(path, opts, data, callback, rev) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -134,7 +134,7 @@ class StorageGDrive extends StorageBase { data, dataType, dataIsMultipart, - success: response => { + success: (response) => { this.logger.debug('Saved', path, this.logger.ts(ts)); const newRev = response.headRevisionId; if (!newRev) { @@ -145,7 +145,7 @@ class StorageGDrive extends StorageBase { callback(null, { rev: newRev, path: isNew ? response.id : null }) ); }, - error: err => { + error: (err) => { this.logger.error('Save error', path, err, this.logger.ts(ts)); return callback && callback(err); } @@ -155,7 +155,7 @@ class StorageGDrive extends StorageBase { } list(dir, callback) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -179,13 +179,13 @@ class StorageGDrive extends StorageBase { this._xhr({ url, responseType: 'json', - success: response => { + success: (response) => { if (!response) { this.logger.error('List error', this.logger.ts(ts)); return callback && callback('list error'); } this.logger.debug('Listed', this.logger.ts(ts)); - const fileList = response.files.map(f => ({ + const fileList = response.files.map((f) => ({ name: f.name, path: f.id, rev: f.headRevisionId, @@ -201,7 +201,7 @@ class StorageGDrive extends StorageBase { } return callback && callback(null, fileList); }, - error: err => { + error: (err) => { this.logger.error('List error', this.logger.ts(ts), err); return callback && callback(err); } @@ -222,7 +222,7 @@ class StorageGDrive extends StorageBase { this.logger.debug('Removed', path, this.logger.ts(ts)); return callback && callback(); }, - error: err => { + error: (err) => { this.logger.error('Remove error', path, err, this.logger.ts(ts)); return callback && callback(err); } diff --git a/app/scripts/storage/impl/storage-onedrive.js b/app/scripts/storage/impl/storage-onedrive.js index 588f5645..f4cbc5c3 100644 --- a/app/scripts/storage/impl/storage-onedrive.js +++ b/app/scripts/storage/impl/storage-onedrive.js @@ -17,7 +17,7 @@ class StorageOneDrive extends StorageBase { } load(path, opts, callback) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -27,7 +27,7 @@ class StorageOneDrive extends StorageBase { this._xhr({ url, responseType: 'json', - success: response => { + success: (response) => { const downloadUrl = response['@microsoft.graph.downloadUrl']; let rev = response.eTag; if (!downloadUrl || !response.eTag) { @@ -49,13 +49,13 @@ class StorageOneDrive extends StorageBase { this.logger.debug('Loaded', path, rev, this.logger.ts(ts)); return callback && callback(null, response, { rev }); }, - error: err => { + error: (err) => { this.logger.error('Load error', path, err, this.logger.ts(ts)); return callback && callback(err); } }); }, - error: err => { + error: (err) => { this.logger.error('Load error', path, err, this.logger.ts(ts)); return callback && callback(err); } @@ -64,7 +64,7 @@ class StorageOneDrive extends StorageBase { } stat(path, opts, callback) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -74,7 +74,7 @@ class StorageOneDrive extends StorageBase { this._xhr({ url, responseType: 'json', - success: response => { + success: (response) => { const rev = response.eTag; if (!rev) { this.logger.error('Stat error', path, 'no eTag', this.logger.ts(ts)); @@ -96,7 +96,7 @@ class StorageOneDrive extends StorageBase { } save(path, opts, data, callback, rev) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -123,7 +123,7 @@ class StorageOneDrive extends StorageBase { this.logger.debug('Saved', path, rev, this.logger.ts(ts)); return callback && callback(null, { rev }); }, - error: err => { + error: (err) => { this.logger.error('Save error', path, err, this.logger.ts(ts)); return callback && callback(err); } @@ -132,7 +132,7 @@ class StorageOneDrive extends StorageBase { } list(dir, callback) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -142,15 +142,15 @@ class StorageOneDrive extends StorageBase { this._xhr({ url, responseType: 'json', - success: response => { + success: (response) => { if (!response || !response.value) { this.logger.error('List error', this.logger.ts(ts), response); return callback && callback('list error'); } this.logger.debug('Listed', this.logger.ts(ts)); const fileList = response.value - .filter(f => f.name) - .map(f => ({ + .filter((f) => f.name) + .map((f) => ({ name: f.name, path: f.parentReference.path + '/' + f.name, rev: f.eTag, @@ -158,7 +158,7 @@ class StorageOneDrive extends StorageBase { })); return callback && callback(null, fileList); }, - error: err => { + error: (err) => { this.logger.error('List error', this.logger.ts(ts), err); return callback && callback(err); } @@ -179,7 +179,7 @@ class StorageOneDrive extends StorageBase { this.logger.debug('Removed', path, this.logger.ts(ts)); return callback && callback(); }, - error: err => { + error: (err) => { this.logger.error('Remove error', path, err, this.logger.ts(ts)); return callback && callback(err); } @@ -187,7 +187,7 @@ class StorageOneDrive extends StorageBase { } mkdir(path, callback) { - this._oauthAuthorize(err => { + this._oauthAuthorize((err) => { if (err) { return callback && callback(err); } @@ -206,7 +206,7 @@ class StorageOneDrive extends StorageBase { this.logger.debug('Made dir', path, this.logger.ts(ts)); return callback && callback(); }, - error: err => { + error: (err) => { this.logger.error('Make dir error', path, err, this.logger.ts(ts)); return callback && callback(err); } diff --git a/app/scripts/storage/impl/storage-webdav.js b/app/scripts/storage/impl/storage-webdav.js index 879671af..0cfb4fdc 100644 --- a/app/scripts/storage/impl/storage-webdav.js +++ b/app/scripts/storage/impl/storage-webdav.js @@ -92,13 +92,13 @@ class StorageWebDav extends StorageBase { } save(path, opts, data, callback, rev) { - const cb = function(err, xhr, stat) { + const cb = function (err, xhr, stat) { if (callback) { callback(err, stat); callback = null; } }; - const tmpPath = path.replace(/[^\/]+$/, m => '.' + m) + '.' + Date.now(); + const tmpPath = path.replace(/[^\/]+$/, (m) => '.' + m) + '.' + Date.now(); const saveOpts = { path, user: opts ? opts.user : null, @@ -134,7 +134,7 @@ class StorageWebDav extends StorageBase { data, nostat: true }, - err => { + (err) => { if (err) { return cb(err); } @@ -193,7 +193,7 @@ class StorageWebDav extends StorageBase { 'Overwrite': 'T' } }, - err => { + (err) => { if (err) { return cb(err); } @@ -222,7 +222,7 @@ class StorageWebDav extends StorageBase { data, nostat: true }, - err => { + (err) => { if (err) { return cb(err); } diff --git a/app/scripts/storage/io-browser-cache.js b/app/scripts/storage/io-browser-cache.js index 6fbcb63f..b1d31437 100644 --- a/app/scripts/storage/io-browser-cache.js +++ b/app/scripts/storage/io-browser-cache.js @@ -1,6 +1,6 @@ const idb = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB; -const IoBrowserCache = function(config) { +const IoBrowserCache = function (config) { this.db = null; this.cacheName = config.cacheName; this.logger = config.logger; @@ -13,19 +13,19 @@ Object.assign(IoBrowserCache.prototype, { } try { const req = idb.open(this.cacheName); - req.onerror = e => { + req.onerror = (e) => { this.logger.error('Error opening indexed db', e); if (callback) { callback(e); } }; - req.onsuccess = e => { + req.onsuccess = (e) => { this.db = e.target.result; if (callback) { callback(); } }; - req.onupgradeneeded = e => { + req.onupgradeneeded = (e) => { const db = e.target.result; db.createObjectStore('files'); }; @@ -39,7 +39,7 @@ Object.assign(IoBrowserCache.prototype, { save(id, data, callback) { this.logger.debug('Save', id); - this.initDb(err => { + this.initDb((err) => { if (err) { return callback && callback(err); } @@ -72,16 +72,13 @@ Object.assign(IoBrowserCache.prototype, { load(id, callback) { this.logger.debug('Load', id); - this.initDb(err => { + this.initDb((err) => { if (err) { return callback && callback(err, null); } try { const ts = this.logger.ts(); - const req = this.db - .transaction(['files'], 'readonly') - .objectStore('files') - .get(id); + const req = this.db.transaction(['files'], 'readonly').objectStore('files').get(id); req.onsuccess = () => { this.logger.debug('Loaded', id, this.logger.ts(ts)); if (callback) { @@ -105,7 +102,7 @@ Object.assign(IoBrowserCache.prototype, { remove(id, callback) { this.logger.debug('Remove', id); - this.initDb(err => { + this.initDb((err) => { if (err) { return callback && callback(err); } diff --git a/app/scripts/storage/io-file-cache.js b/app/scripts/storage/io-file-cache.js index 912aa185..580666e5 100644 --- a/app/scripts/storage/io-file-cache.js +++ b/app/scripts/storage/io-file-cache.js @@ -1,6 +1,6 @@ import { Launcher } from 'comp/launcher'; -const IoFileCache = function(config) { +const IoFileCache = function (config) { this.basePath = null; this.cacheName = config.cacheName; this.logger = config.logger; @@ -12,7 +12,7 @@ Object.assign(IoFileCache.prototype, { return callback(); } const basePath = Launcher.getUserDataPath(this.cacheName); - Launcher.mkdir(basePath, err => { + Launcher.mkdir(basePath, (err) => { if (err) { this.logger.error('Error creating plugin folder'); } else { @@ -27,14 +27,14 @@ Object.assign(IoFileCache.prototype, { }, save(id, data, callback) { - this.initFs(err => { + this.initFs((err) => { if (err) { return callback && callback(err, null); } this.logger.debug('Save', id); const ts = this.logger.ts(); const path = this.resolvePath(id); - Launcher.writeFile(path, data, err => { + Launcher.writeFile(path, data, (err) => { if (err) { this.logger.error('Error saving file', id, err); if (callback) { @@ -51,7 +51,7 @@ Object.assign(IoFileCache.prototype, { }, load(id, callback) { - this.initFs(err => { + this.initFs((err) => { if (err) { return callback && callback(err, null); } @@ -75,14 +75,14 @@ Object.assign(IoFileCache.prototype, { }, remove(id, callback) { - this.initFs(err => { + this.initFs((err) => { if (err) { return callback && callback(err, null); } this.logger.debug('Remove', id); const ts = this.logger.ts(); const path = this.resolvePath(id); - Launcher.deleteFile(path, err => { + Launcher.deleteFile(path, (err) => { if (err) { this.logger.error('Error removing file', id, err); if (callback) { diff --git a/app/scripts/storage/pkce.js b/app/scripts/storage/pkce.js index 566661a9..3d18507f 100644 --- a/app/scripts/storage/pkce.js +++ b/app/scripts/storage/pkce.js @@ -11,7 +11,7 @@ function createOAuthSession() { const codeVerifierBytes = kdbxweb.ByteUtils.arrayToBuffer( kdbxweb.ByteUtils.stringToBytes(codeVerifier) ); - kdbxweb.CryptoEngine.sha256(codeVerifierBytes).then(hash => { + kdbxweb.CryptoEngine.sha256(codeVerifierBytes).then((hash) => { const codeChallenge = kdbxweb.ByteUtils.bytesToBase64(hash) .replace(/\+/g, '-') .replace(/\//g, '_') diff --git a/app/scripts/storage/storage-base.js b/app/scripts/storage/storage-base.js index 2192c579..6e00dbce 100644 --- a/app/scripts/storage/storage-base.js +++ b/app/scripts/storage/storage-base.js @@ -69,14 +69,14 @@ class StorageBase { 'Authorization': 'Bearer ' + this._oauthToken.accessToken }; } - this._httpRequest(config, response => { + this._httpRequest(config, (response) => { this.logger.info('HTTP response', response.status); const statuses = config.statuses || [200]; if (statuses.indexOf(response.status) >= 0) { return config.success && config.success(response.response, response); } if (response.status === 401 && this._oauthToken) { - this._oauthGetNewToken(err => { + this._oauthGetNewToken((err) => { if (err) { return config.error && config.error('unauthorized', response); } else { @@ -112,7 +112,7 @@ class StorageBase { onLoad({ status: xhr.status, response: xhr.response, - getResponseHeader: name => xhr.getResponseHeader(name) + getResponseHeader: (name) => xhr.getResponseHeader(name) }); }); xhr.addEventListener('error', () => { @@ -152,7 +152,7 @@ class StorageBase { let data; if (config.data) { if (config.dataIsMultipart) { - data = Buffer.concat(config.data.map(chunk => Buffer.from(chunk))); + data = Buffer.concat(config.data.map((chunk) => Buffer.from(chunk))); } else { data = Buffer.from(config.data); } @@ -167,7 +167,7 @@ class StorageBase { closed = true; }); - req.on('response', res => { + req.on('response', (res) => { const chunks = []; const onClose = () => { this.logger.debug( @@ -194,10 +194,10 @@ class StorageBase { onLoad({ status: res.statusCode, response, - getResponseHeader: name => res.headers[name.toLowerCase()] + getResponseHeader: (name) => res.headers[name.toLowerCase()] }); }; - res.on('data', chunk => { + res.on('data', (chunk) => { chunks.push(chunk); if (closed && !res.readable) { // sometimes 'close' event arrives faster in Electron @@ -207,7 +207,7 @@ class StorageBase { // in Electron it's not res.on('end'), like in node.js, which is a bit weird req.on('close', onClose); }); - req.on('error', e => { + req.on('error', (e) => { this.logger.error('HTTP error', opts.method, config.url, e); return config.error && config.error('network error', {}); }); @@ -250,7 +250,7 @@ class StorageBase { location: 'yes' }; settings = Object.keys(settings) - .map(key => key + '=' + settings[key]) + .map((key) => key + '=' + settings[key]) .join(','); return window.open(url, title, settings, extras); @@ -310,8 +310,8 @@ class StorageBase { Launcher.openLink(url); callback('browser-auth-started'); }); - listener.on('error', err => callback(err)); - listener.on('result', result => this._oauthCodeReceived(result, session)); + listener.on('error', (err) => callback(err)); + listener.on('result', (result) => this._oauthCodeReceived(result, session)); return; } @@ -329,7 +329,7 @@ class StorageBase { callback('OAuth: popup closed'); }; - const windowMessage = e => { + const windowMessage = (e) => { if (e.origin !== location.origin) { return; } @@ -462,7 +462,7 @@ class StorageBase { ...pkceParams }), dataType: 'application/x-www-form-urlencoded', - success: response => { + success: (response) => { this.logger.debug('OAuth code exchanged', response); const token = this._oauthProcessReturn(response); if (token && token.error) { @@ -470,7 +470,7 @@ class StorageBase { } callback?.(); }, - error: err => { + error: (err) => { this.logger.error('Error exchanging OAuth code', err); callback?.('OAuth code exchange error: ' + err); } @@ -493,7 +493,7 @@ class StorageBase { 'refresh_token': refreshToken }), dataType: 'application/x-www-form-urlencoded', - success: response => { + success: (response) => { this.logger.debug('Refresh token exchanged'); this._oauthProcessReturn({ 'refresh_token': refreshToken, diff --git a/app/scripts/storage/storage-oauth-listener.js b/app/scripts/storage/storage-oauth-listener.js index 8e80dc5d..16cc3c29 100644 --- a/app/scripts/storage/storage-oauth-listener.js +++ b/app/scripts/storage/storage-oauth-listener.js @@ -15,7 +15,7 @@ const StorageOAuthListener = { } const listener = {}; - Object.keys(EventEmitter.prototype).forEach(key => { + Object.keys(EventEmitter.prototype).forEach((key) => { listener[key] = EventEmitter.prototype[key]; }); @@ -38,7 +38,7 @@ const StorageOAuthListener = { logger.info(`Starting OAuth listener on port ${port}...`); server.listen(port); - server.on('error', err => { + server.on('error', (err) => { logger.error('Failed to start OAuth listener', err); listener.emit('error', 'Failed to start OAuth listener: ' + err); server.close(); diff --git a/app/scripts/util/data/color.js b/app/scripts/util/data/color.js index 85a3d3b6..890920e6 100644 --- a/app/scripts/util/data/color.js +++ b/app/scripts/util/data/color.js @@ -2,7 +2,7 @@ import { Colors } from 'const/colors'; const KnownColors = {}; -const Color = function(arg) { +const Color = function (arg) { const rgbaMatch = /^rgba?\((\d+),\s*(\d+),\s*(\d+)(,\s*([\d.]+))?\)$/.exec(arg); if (rgbaMatch) { this.r = +rgbaMatch[1]; @@ -35,7 +35,7 @@ const Color = function(arg) { } }; -Color.prototype.setHsl = function() { +Color.prototype.setHsl = function () { const r = this.r / 255; const g = this.g / 255; const b = this.b / 255; @@ -70,25 +70,25 @@ Color.prototype.setHsl = function() { this.l = l; }; -Color.prototype.toHex = function() { +Color.prototype.toHex = function () { return '#' + hex(this.r) + hex(this.g) + hex(this.b); }; -Color.prototype.toRgba = function() { +Color.prototype.toRgba = function () { return `rgba(${Math.round(this.r)},${Math.round(this.g)},${Math.round(this.b)},${this.a})`; }; -Color.prototype.toHsla = function() { +Color.prototype.toHsla = function () { return `hsla(${Math.round(this.h * 100)},${Math.round(this.s * 100)}%,${Math.round( this.l * 100 )}%,${this.a})`; }; -Color.prototype.distanceTo = function(color) { +Color.prototype.distanceTo = function (color) { return Math.abs(this.h - color.h); }; -Color.prototype.mix = function(another, weight) { +Color.prototype.mix = function (another, weight) { const res = new Color(this); const anotherWeight = 1 - weight; res.r = this.r * weight + another.r * anotherWeight; @@ -98,7 +98,7 @@ Color.prototype.mix = function(another, weight) { return res; }; -Color.getNearest = function(colorStr) { +Color.getNearest = function (colorStr) { const color = new Color(colorStr); if (!color.s) { return null; @@ -115,7 +115,7 @@ Color.getNearest = function(colorStr) { return selected; }; -Color.getKnownBgColor = function(knownColor) { +Color.getKnownBgColor = function (knownColor) { return Colors.BgColors[knownColor] ? '#' + Colors.BgColors[knownColor] : undefined; }; diff --git a/app/scripts/util/data/comparators.js b/app/scripts/util/data/comparators.js index 2f8ee7f1..d568bf8b 100644 --- a/app/scripts/util/data/comparators.js +++ b/app/scripts/util/data/comparators.js @@ -8,29 +8,29 @@ const ciCompare = const Comparators = { stringComparator(field, asc) { if (asc) { - return function(x, y) { + return function (x, y) { return ciCompare(x[field] || LastChar, y[field] || LastChar); }; } else { - return function(x, y) { + return function (x, y) { return ciCompare(y[field], x[field]); }; } }, rankComparator() { - return function(x, y) { + return function (x, y) { return y.getRank(this.filter) - x.getRank(this.filter); }; }, dateComparator(field, asc) { if (asc) { - return function(x, y) { + return function (x, y) { return x[field] - y[field]; }; } else { - return function(x, y) { + return function (x, y) { return y[field] - x[field]; }; } diff --git a/app/scripts/util/data/otp.js b/app/scripts/util/data/otp.js index 0a891e9b..2566157c 100644 --- a/app/scripts/util/data/otp.js +++ b/app/scripts/util/data/otp.js @@ -2,7 +2,7 @@ import { Logger } from 'util/logger'; const logger = new Logger('otp'); -const Otp = function(url, params) { +const Otp = function (url, params) { if (['hotp', 'totp'].indexOf(params.type) < 0) { throw 'Bad type: ' + params.type; } @@ -39,7 +39,7 @@ const Otp = function(url, params) { } }; -Otp.prototype.next = function(callback) { +Otp.prototype.next = function (callback) { let valueForHashing; let timeLeft; if (this.type === 'totp') { @@ -71,33 +71,33 @@ Otp.prototype.next = function(callback) { }); }; -Otp.prototype.hmac = function(data, callback) { +Otp.prototype.hmac = function (data, callback) { const subtle = window.crypto.subtle || window.crypto.webkitSubtle; const algo = { name: 'HMAC', hash: { name: this.algorithm.replace('SHA', 'SHA-') } }; subtle .importKey('raw', this.key, algo, false, ['sign']) - .then(key => { + .then((key) => { subtle .sign(algo, key, data) - .then(sig => { + .then((sig) => { callback(sig); }) - .catch(err => { + .catch((err) => { callback(null, err); }); }) - .catch(err => { + .catch((err) => { callback(null, err); }); }; -Otp.hmacToDigits = function(hmac, length) { +Otp.hmacToDigits = function (hmac, length) { let code = hmac.toString(); code = Otp.leftPad(code.substr(code.length - length), length); return code; }; -Otp.hmacToSteamCode = function(hmac) { +Otp.hmacToSteamCode = function (hmac) { const steamChars = '23456789BCDFGHJKMNPQRTVWXY'; let code = ''; for (let i = 0; i < 5; ++i) { @@ -107,7 +107,7 @@ Otp.hmacToSteamCode = function(hmac) { return code; }; -Otp.fromBase32 = function(str) { +Otp.fromBase32 = function (str) { str = str.replace(/\s/g, ''); const alphabet = 'abcdefghijklmnopqrstuvwxyz234567'; let bin = ''; @@ -127,14 +127,14 @@ Otp.fromBase32 = function(str) { return hex.buffer; }; -Otp.leftPad = function(str, len) { +Otp.leftPad = function (str, len) { while (str.length < len) { str = '0' + str; } return str; }; -Otp.parseUrl = function(url) { +Otp.parseUrl = function (url) { const match = /^otpauth:\/\/(\w+)\/([^\?]+)\?(.*)/i.exec(url); if (!match) { throw 'Not OTP url'; @@ -149,18 +149,18 @@ Otp.parseUrl = function(url) { } } params.type = match[1].toLowerCase(); - match[3].split('&').forEach(part => { + match[3].split('&').forEach((part) => { const parts = part.split('=', 2); params[parts[0].toLowerCase()] = decodeURIComponent(parts[1]); }); return new Otp(url, params); }; -Otp.isSecret = function(str) { +Otp.isSecret = function (str) { return !!Otp.fromBase32(str); }; -Otp.makeUrl = function(secret, period, digits) { +Otp.makeUrl = function (secret, period, digits) { return ( 'otpauth://totp/default?secret=' + secret + diff --git a/app/scripts/util/data/signature-verifier.js b/app/scripts/util/data/signature-verifier.js index e1896072..e1d9b90c 100644 --- a/app/scripts/util/data/signature-verifier.js +++ b/app/scripts/util/data/signature-verifier.js @@ -11,7 +11,7 @@ const SignatureVerifier = { verify(data, signature, pk) { if (!pk) { const pks = this.getPublicKeys(); - return this.verify(data, signature, pks[0]).then(isValid => { + return this.verify(data, signature, pks[0]).then((isValid) => { if (isValid || !pks[1]) { return isValid; } @@ -29,7 +29,7 @@ const SignatureVerifier = { pk = kdbxweb.ByteUtils.base64ToBytes(pk); subtle .importKey(keyFormat, pk, algo, false, ['verify']) - .then(cryptoKey => { + .then((cryptoKey) => { try { subtle .verify( @@ -38,10 +38,10 @@ const SignatureVerifier = { kdbxweb.ByteUtils.arrayToBuffer(signature), kdbxweb.ByteUtils.arrayToBuffer(data) ) - .then(isValid => { + .then((isValid) => { resolve(isValid); }) - .catch(e => { + .catch((e) => { this.logger.error('Verify error', e); reject(e); }); @@ -50,7 +50,7 @@ const SignatureVerifier = { reject(e); } }) - .catch(e => { + .catch((e) => { this.logger.error('ImportKey error', e); reject(e); }); @@ -63,7 +63,7 @@ const SignatureVerifier = { getPublicKeys() { if (!this.publicKeys) { - this.publicKeys = [publicKeyData, publicKeyDataNew].map(pk => + this.publicKeys = [publicKeyData, publicKeyDataNew].map((pk) => pk.match(/-+BEGIN PUBLIC KEY-+([\s\S]+?)-+END PUBLIC KEY-+/)[1].replace(/\s+/g, '') ); } diff --git a/app/scripts/util/entry-search.js b/app/scripts/util/entry-search.js index 8646d352..a44031c2 100644 --- a/app/scripts/util/entry-search.js +++ b/app/scripts/util/entry-search.js @@ -159,7 +159,7 @@ class EntrySearch { let matches = false; if (adv.other || adv.protect) { const fieldNames = Object.keys(fields); - matches = fieldNames.some(field => { + matches = fieldNames.some((field) => { if (BuiltInFields.indexOf(field) >= 0) { return false; } diff --git a/app/scripts/util/formatting/password-presenter.js b/app/scripts/util/formatting/password-presenter.js index 4408908a..c97b4e3b 100644 --- a/app/scripts/util/formatting/password-presenter.js +++ b/app/scripts/util/formatting/password-presenter.js @@ -21,7 +21,7 @@ const PasswordPresenter = { return ''; } let result = ''; - value.forEachChar(ch => { + value.forEachChar((ch) => { result += ch === 10 ? '\n' : '•'; }); return result; @@ -33,7 +33,7 @@ const PasswordPresenter = { const gen = new RandomNameGenerator(); let ix = 0; - value.forEachChar(char => { + value.forEachChar((char) => { const charHtml = charCodeToHtml(char); items.push({ html: charHtml, order: ix }); diff --git a/app/scripts/util/formatting/string-format.js b/app/scripts/util/formatting/string-format.js index 4dce6ad1..4264a7a3 100644 --- a/app/scripts/util/formatting/string-format.js +++ b/app/scripts/util/formatting/string-format.js @@ -24,11 +24,11 @@ const StringFormat = { }, camelCase(str) { - return str.replace(this.camelCaseRegex, match => match[1].toUpperCase()); + return str.replace(this.camelCaseRegex, (match) => match[1].toUpperCase()); }, pascalCase(str) { - return this.capFirst(str.replace(this.camelCaseRegex, match => match[1].toUpperCase())); + return this.capFirst(str.replace(this.camelCaseRegex, (match) => match[1].toUpperCase())); } }; diff --git a/app/scripts/util/generators/password-generator.js b/app/scripts/util/generators/password-generator.js index b65f296e..bf7f6762 100644 --- a/app/scripts/util/generators/password-generator.js +++ b/app/scripts/util/generators/password-generator.js @@ -31,8 +31,8 @@ const PasswordGenerator = { return this.generatePronounceable(opts); } const ranges = Object.keys(CharRanges) - .filter(r => opts[r]) - .map(r => CharRanges[r]); + .filter((r) => opts[r]) + .map((r) => CharRanges[r]); if (opts.include && opts.include.length) { ranges.push(opts.include); } @@ -84,7 +84,7 @@ const PasswordGenerator = { let length = 0; if (password) { const charRanges = CharRanges; - password.forEachChar(ch => { + password.forEachChar((ch) => { length++; ch = String.fromCharCode(ch); for (const [range, chars] of Object.entries(charRanges)) { diff --git a/app/scripts/util/kdbxweb/kdbxweb-init.js b/app/scripts/util/kdbxweb/kdbxweb-init.js index e3cef17f..af7829bb 100644 --- a/app/scripts/util/kdbxweb/kdbxweb-init.js +++ b/app/scripts/util/kdbxweb/kdbxweb-init.js @@ -13,9 +13,9 @@ const KdbxwebInit = { argon2(password, salt, memory, iterations, length, parallelism, type, version) { const args = { password, salt, memory, iterations, length, parallelism, type, version }; - return this.loadRuntime(memory).then(runtime => { + return this.loadRuntime(memory).then((runtime) => { const ts = logger.ts(); - return runtime.hash(args).then(hash => { + return runtime.hash(args).then((hash) => { logger.debug('Hash computed', logger.ts(ts)); return hash; }); @@ -108,7 +108,7 @@ const KdbxwebInit = { const blob = new Blob([script], { type: 'application/javascript' }); const objectUrl = URL.createObjectURL(blob); const worker = new Worker(objectUrl); - const onMessage = e => { + const onMessage = (e) => { switch (e.data.op) { case 'log': logger.debug(...e.data.args); @@ -125,7 +125,7 @@ const KdbxwebInit = { hash(args) { return new Promise((resolve, reject) => { worker.postMessage(args); - const onHashMessage = e => { + const onHashMessage = (e) => { worker.removeEventListener( 'message', onHashMessage @@ -164,7 +164,7 @@ const KdbxwebInit = { }); global.Module = { wasmJSMethod: 'native-wasm', - wasmBinary: Uint8Array.from(atob(wasmBinaryBase64), c => c.charCodeAt(0)), + wasmBinary: Uint8Array.from(atob(wasmBinaryBase64), (c) => c.charCodeAt(0)), print(...args) { logger.debug(...args); }, @@ -175,7 +175,7 @@ const KdbxwebInit = { logger.debug('WebAssembly runtime loaded (main thread)', logger.ts(ts)); clearTimeout(loadTimeout); resolve({ - hash: args => { + hash: (args) => { const hash = this.calcHash(global.Module, args); global.Module.unloadRuntime(); global.Module = undefined; @@ -193,16 +193,16 @@ const KdbxwebInit = { } catch (err) { reject(err); } - }).catch(err => { + }).catch((err) => { logger.warn('WebAssembly error', err); throw new Error('WebAssembly error'); }); }, // eslint-disable-next-line object-shorthand - workerPostRun: function() { + workerPostRun: function () { self.postMessage({ op: 'postRun' }); - self.onmessage = e => { + self.onmessage = (e) => { try { /* eslint-disable-next-line no-undef */ const hash = Module.calcHash(Module, e.data); @@ -214,7 +214,7 @@ const KdbxwebInit = { }, // eslint-disable-next-line object-shorthand - calcHash: function(Module, args) { + 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/util/kdbxweb/protected-value-ex.js b/app/scripts/util/kdbxweb/protected-value-ex.js index 22deb9b0..67e86f47 100644 --- a/app/scripts/util/kdbxweb/protected-value-ex.js +++ b/app/scripts/util/kdbxweb/protected-value-ex.js @@ -5,7 +5,7 @@ const ExpectedFieldRefByteLength = ExpectedFieldRefChars.length; kdbxweb.ProtectedValue.prototype.isProtected = true; -kdbxweb.ProtectedValue.prototype.forEachChar = function(fn) { +kdbxweb.ProtectedValue.prototype.forEachChar = function (fn) { const value = this._value; const salt = this._salt; let b, b1, b2, b3; @@ -79,16 +79,16 @@ Object.defineProperty(kdbxweb.ProtectedValue.prototype, 'textLength', { } }); -kdbxweb.ProtectedValue.prototype.includesLower = function(findLower) { +kdbxweb.ProtectedValue.prototype.includesLower = function (findLower) { return this.indexOfLower(findLower) !== -1; }; -kdbxweb.ProtectedValue.prototype.indexOfLower = function(findLower) { +kdbxweb.ProtectedValue.prototype.indexOfLower = function (findLower) { let index = -1; const foundSeqs = []; const len = findLower.length; let chIndex = -1; - this.forEachChar(ch => { + this.forEachChar((ch) => { chIndex++; ch = String.fromCharCode(ch).toLowerCase(); if (index !== -1) { @@ -117,12 +117,12 @@ kdbxweb.ProtectedValue.prototype.indexOfLower = function(findLower) { return index; }; -kdbxweb.ProtectedValue.prototype.indexOfSelfInLower = function(targetLower) { +kdbxweb.ProtectedValue.prototype.indexOfSelfInLower = function (targetLower) { let firstCharIndex = -1; let found = false; do { let chIndex = -1; - this.forEachChar(ch => { + this.forEachChar((ch) => { chIndex++; ch = String.fromCharCode(ch).toLowerCase(); if (chIndex === 0) { @@ -141,7 +141,7 @@ kdbxweb.ProtectedValue.prototype.indexOfSelfInLower = function(targetLower) { window.PV = kdbxweb.ProtectedValue; -kdbxweb.ProtectedValue.prototype.equals = function(other) { +kdbxweb.ProtectedValue.prototype.equals = function (other) { if (!other) { return false; } @@ -163,12 +163,12 @@ kdbxweb.ProtectedValue.prototype.equals = function(other) { return true; }; -kdbxweb.ProtectedValue.prototype.isFieldReference = function() { +kdbxweb.ProtectedValue.prototype.isFieldReference = function () { if (this.byteLength !== ExpectedFieldRefByteLength) { return false; } let ix = 0; - this.forEachChar(ch => { + this.forEachChar((ch) => { const expected = ExpectedFieldRefChars[ix++]; if (expected !== '0' && ch !== expected) { return false; diff --git a/app/scripts/util/logger.js b/app/scripts/util/logger.js index bf6162de..beb9f868 100644 --- a/app/scripts/util/logger.js +++ b/app/scripts/util/logger.js @@ -11,12 +11,12 @@ const MaxLogsToSave = 100; const lastLogs = []; -const Logger = function(name, id, level = Level.All) { +const Logger = function (name, id, level = Level.All) { this.prefix = name ? name + (id ? ':' + id : '') : 'default'; this.level = level; }; -Logger.prototype.ts = function(ts) { +Logger.prototype.ts = function (ts) { if (ts) { return Math.round(performance.now() - ts) + 'ms'; } else { @@ -24,11 +24,11 @@ Logger.prototype.ts = function(ts) { } }; -Logger.prototype.getPrefix = function() { +Logger.prototype.getPrefix = function () { return new Date().toISOString() + ' [' + this.prefix + '] '; }; -Logger.prototype.debug = function(...args) { +Logger.prototype.debug = function (...args) { args[0] = this.getPrefix() + args[0]; if (this.level >= Level.Debug) { Logger.saveLast('debug', args); @@ -36,7 +36,7 @@ Logger.prototype.debug = function(...args) { } }; -Logger.prototype.info = function(...args) { +Logger.prototype.info = function (...args) { args[0] = this.getPrefix() + args[0]; if (this.level >= Level.Info) { Logger.saveLast('info', args); @@ -44,7 +44,7 @@ Logger.prototype.info = function(...args) { } }; -Logger.prototype.warn = function(...args) { +Logger.prototype.warn = function (...args) { args[0] = this.getPrefix() + args[0]; if (this.level >= Level.Warn) { Logger.saveLast('warn', args); @@ -52,7 +52,7 @@ Logger.prototype.warn = function(...args) { } }; -Logger.prototype.error = function(...args) { +Logger.prototype.error = function (...args) { args[0] = this.getPrefix() + args[0]; if (this.level >= Level.Error) { Logger.saveLast('error', args); @@ -60,22 +60,22 @@ Logger.prototype.error = function(...args) { } }; -Logger.prototype.setLevel = function(level) { +Logger.prototype.setLevel = function (level) { this.level = level; }; -Logger.prototype.getLevel = function() { +Logger.prototype.getLevel = function () { return this.level; }; -Logger.saveLast = function(level, args) { +Logger.saveLast = function (level, args) { lastLogs.push({ level, args: Array.prototype.slice.call(args) }); if (lastLogs.length > MaxLogsToSave) { lastLogs.shift(); } }; -Logger.getLast = function() { +Logger.getLast = function () { return lastLogs; }; diff --git a/app/scripts/util/ui/tip.js b/app/scripts/util/ui/tip.js index 9c9fcb01..1765fa4e 100644 --- a/app/scripts/util/ui/tip.js +++ b/app/scripts/util/ui/tip.js @@ -2,7 +2,7 @@ import { Events } from 'framework/events'; import { Features } from 'util/features'; import { pick } from 'util/fn'; -const Tip = function(el, config) { +const Tip = function (el, config) { this.el = el; this.title = (config && config.title) || el.attr('title'); this.placement = (config && config.placement) || el.attr('tip-placement'); @@ -19,7 +19,7 @@ const Tip = function(el, config) { Tip.enabled = !Features.isMobile; -Tip.prototype.init = function() { +Tip.prototype.init = function () { if (!Tip.enabled) { return; } @@ -29,7 +29,7 @@ Tip.prototype.init = function() { this.el.click(this.mouseleave); }; -Tip.prototype.show = function() { +Tip.prototype.show = function () { if ((!Tip.enabled && !this.force) || !this.title) { return; } @@ -41,10 +41,7 @@ Tip.prototype.show = function() { this.hideTimeout = null; } } - const tipEl = (this.tipEl = $('
') - .addClass('tip') - .appendTo('body') - .text(this.title)); + const tipEl = (this.tipEl = $('
').addClass('tip').appendTo('body').text(this.title)); const rect = this.el[0].getBoundingClientRect(); const tipRect = this.tipEl[0].getBoundingClientRect(); const placement = this.placement || this.getAutoPlacement(rect, tipRect); @@ -80,7 +77,7 @@ Tip.prototype.show = function() { tipEl.css({ top, left }); }; -Tip.prototype.hide = function() { +Tip.prototype.hide = function () { if (this.tipEl) { this.tipEl.remove(); this.tipEl = null; @@ -88,7 +85,7 @@ Tip.prototype.hide = function() { } }; -Tip.prototype.destroy = function() { +Tip.prototype.destroy = function () { this.hide(); this.el.off('mouseenter', this.mouseenter); @@ -105,7 +102,7 @@ Tip.prototype.destroy = function() { } }; -Tip.prototype.mouseenter = function() { +Tip.prototype.mouseenter = function () { if (this.showTimeout) { return; } @@ -115,7 +112,7 @@ Tip.prototype.mouseenter = function() { }, 200); }; -Tip.prototype.mouseleave = function() { +Tip.prototype.mouseleave = function () { if (this.tipEl) { this.tipEl.addClass('tip--hide'); this.hideTimeout = setTimeout(() => { @@ -129,7 +126,7 @@ Tip.prototype.mouseleave = function() { } }; -Tip.prototype.getAutoPlacement = function(rect, tipRect) { +Tip.prototype.getAutoPlacement = function (rect, tipRect) { const padding = 20; const bodyRect = document.body.getBoundingClientRect(); const canShowToBottom = bodyRect.bottom - rect.bottom > padding + tipRect.height; @@ -155,7 +152,7 @@ Tip.prototype.getAutoPlacement = function(rect, tipRect) { } }; -Tip.createTips = function(container) { +Tip.createTips = function (container) { if (!Tip.enabled) { return; } @@ -164,7 +161,7 @@ Tip.createTips = function(container) { }); }; -Tip.createTip = function(el, options) { +Tip.createTip = function (el, options) { if (!Tip.enabled && (!options || !options.force)) { return; } @@ -176,7 +173,7 @@ Tip.createTip = function(el, options) { return tip; }; -Tip.hideTips = function(container) { +Tip.hideTips = function (container) { if (!Tip.enabled || !container) { return; } @@ -185,13 +182,13 @@ Tip.hideTips = function(container) { }); }; -Tip.hideTip = function(el) { +Tip.hideTip = function (el) { if (el._tip) { el._tip.hide(); } }; -Tip.updateTip = function(el, props) { +Tip.updateTip = function (el, props) { if (el._tip) { el._tip.hide(); Object.assign( @@ -201,7 +198,7 @@ Tip.updateTip = function(el, props) { } }; -Tip.destroyTips = function(container) { +Tip.destroyTips = function (container) { $('[data-title]', container).each((ix, el) => { if (el._tip) { el._tip.destroy(); diff --git a/app/scripts/views/app-view.js b/app/scripts/views/app-view.js index b4efae22..9c8e8dd4 100644 --- a/app/scripts/views/app-view.js +++ b/app/scripts/views/app-view.js @@ -314,7 +314,9 @@ class AppView extends View { } showFileSettings(e) { - const menuItem = this.model.menu.filesSection.items.find(item => item.file.id === e.fileId); + const menuItem = this.model.menu.filesSection.items.find( + (item) => item.file.id === e.fileId + ); if (this.views.settings) { if (this.views.settings.file === menuItem.file) { this.showEntries(); @@ -380,7 +382,7 @@ class AppView extends View { if (Launcher) { if (!this.exitAlertShown) { if (this.model.settings.autoSave) { - this.saveAndLock(result => { + this.saveAndLock((result) => { if (result) { exit(); } @@ -396,9 +398,9 @@ class AppView extends View { { result: 'exit', title: Locale.discardChanges, error: true }, { result: '', title: Locale.appDontExitBtn } ], - success: result => { + success: (result) => { if (result === 'save') { - this.saveAndLock(result => { + this.saveAndLock((result) => { if (result) { exit(); } @@ -532,7 +534,7 @@ class AppView extends View { let pendingCallbacks = 0; const errorFiles = []; const that = this; - this.model.files.forEach(function(file) { + this.model.files.forEach(function (file) { if (!file.dirty) { return; } @@ -573,7 +575,7 @@ class AppView extends View { closeAllFilesAndShowFirst() { let fileToShow = this.model.files.find( - file => !file.demo && !file.created && !file.external + (file) => !file.demo && !file.created && !file.external ); this.model.closeAllFiles(); if (!fileToShow) { @@ -599,7 +601,7 @@ class AppView extends View { } saveAll() { - this.model.files.forEach(function(file) { + this.model.files.forEach(function (file) { this.model.syncFile(file); }, this); } @@ -729,8 +731,8 @@ class AppView extends View { position: { left: e.pageX, top: e.pageY }, options: e.options }); - menu.on('cancel', e => this.hideContextMenu()); - menu.on('select', e => this.contextMenuSelect(e)); + menu.on('cancel', (e) => this.hideContextMenu()); + menu.on('select', (e) => this.contextMenuSelect(e)); this.views.contextMenu = menu; } } @@ -801,7 +803,7 @@ class AppView extends View { const reader = new FileReader(); const logger = new Logger('import-csv'); logger.info('Reading CSV...'); - reader.onload = e => { + reader.onload = (e) => { logger.info('Parsing CSV...'); const ts = logger.ts(); const parser = new CsvParser(); diff --git a/app/scripts/views/auto-type/auto-type-select-view.js b/app/scripts/views/auto-type/auto-type-select-view.js index 1a3bcf5c..0d96e19d 100644 --- a/app/scripts/views/auto-type/auto-type-select-view.js +++ b/app/scripts/views/auto-type/auto-type-select-view.js @@ -75,7 +75,7 @@ class AutoTypeSelectView extends View { const presenter = new EntryPresenter(null, noColor, this.result && this.result.id); let itemsHtml = ''; const itemTemplate = this.itemTemplate; - this.entries.forEach(entry => { + this.entries.forEach((entry) => { presenter.present(entry); itemsHtml += itemTemplate(presenter, DefaultTemplateOptions); }); diff --git a/app/scripts/views/details/details-attachment-view.js b/app/scripts/views/details/details-attachment-view.js index 81852ec5..a637f356 100644 --- a/app/scripts/views/details/details-attachment-view.js +++ b/app/scripts/views/details/details-attachment-view.js @@ -23,18 +23,14 @@ class DetailsAttachmentView extends View { case 'text': { const reader = new FileReader(); reader.addEventListener('loadend', () => { - $('
')
-                        .text(reader.result)
-                        .appendTo(dataEl);
+                    $('
').text(reader.result).appendTo(dataEl);
                     complete();
                 });
                 reader.readAsText(blob);
                 return;
             }
             case 'image':
-                $('')
-                    .attr('src', URL.createObjectURL(blob))
-                    .appendTo(dataEl);
+                $('').attr('src', URL.createObjectURL(blob)).appendTo(dataEl);
                 complete();
                 return;
         }
diff --git a/app/scripts/views/details/details-auto-type-view.js b/app/scripts/views/details/details-auto-type-view.js
index 52983350..50584ba9 100644
--- a/app/scripts/views/details/details-auto-type-view.js
+++ b/app/scripts/views/details/details-auto-type-view.js
@@ -36,7 +36,7 @@ class DetailsAutoTypeView extends View {
     seqInput(e) {
         const el = e.target;
         const seq = el.value.trim();
-        AutoType.validate(this.model, seq, err => {
+        AutoType.validate(this.model, seq, (err) => {
             $(el).toggleClass('input--error', !!err);
             if (!err) {
                 this.model.setAutoTypeSeq(seq);
diff --git a/app/scripts/views/details/details-fields.js b/app/scripts/views/details/details-fields.js
index 82c3b4a5..5b090afa 100644
--- a/app/scripts/views/details/details-fields.js
+++ b/app/scripts/views/details/details-fields.js
@@ -57,10 +57,10 @@ function createDetailsFields(detailsView) {
         );
     } else {
         const writeableFiles = AppModel.instance.files.filter(
-            file => file.active && !file.readOnly
+            (file) => file.active && !file.readOnly
         );
         if (model.isJustCreated && writeableFiles.length > 1) {
-            const fileNames = writeableFiles.map(file => {
+            const fileNames = writeableFiles.map((file) => {
                 return { id: file.id, value: file.name, selected: file === model.file };
             });
             fieldViews.push(
diff --git a/app/scripts/views/details/details-history-view.js b/app/scripts/views/details/details-history-view.js
index 1a63a1df..0109ab17 100644
--- a/app/scripts/views/details/details-history-view.js
+++ b/app/scripts/views/details/details-history-view.js
@@ -93,14 +93,14 @@ class DetailsHistoryView extends View {
         this.buildTimeline();
         this.timelineEl = this.$el.find('.details__history-timeline');
         this.bodyEl = this.$el.find('.details__history-body');
-        this.timeline.forEach(function(item, ix) {
+        this.timeline.forEach(function (item, ix) {
             $('')
                 .addClass('fa fa-circle details__history-timeline-item')
                 .css('left', item.pos * 100 + '%')
                 .attr('data-id', ix)
                 .appendTo(this.timelineEl);
         }, this);
-        this.labels.forEach(function(label) {
+        this.labels.forEach(function (label) {
             $('
')
                 .addClass('details__history-timeline-label')
                 .css('left', label.pos * 100 + '%')
@@ -115,7 +115,7 @@ class DetailsHistoryView extends View {
     }
 
     removeFieldViews() {
-        this.fieldViews.forEach(fieldView => fieldView.remove());
+        this.fieldViews.forEach((fieldView) => fieldView.remove());
         this.fieldViews = [];
     }
 
@@ -209,11 +209,11 @@ class DetailsHistoryView extends View {
                 new FieldViewReadOnly({
                     name: 'Attachments',
                     title: Locale.detAttachments,
-                    value: this.record.attachments.map(att => att.title).join(', ')
+                    value: this.record.attachments.map((att) => att.title).join(', ')
                 })
             );
         }
-        this.fieldViews.forEach(fieldView => {
+        this.fieldViews.forEach((fieldView) => {
             fieldView.parent = this.bodyEl[0];
             fieldView.render();
             fieldView.on('copy', this.fieldCopied.bind(this));
@@ -232,9 +232,7 @@ class DetailsHistoryView extends View {
     }
 
     timelineItemClick(e) {
-        const id = $(e.target)
-            .closest('.details__history-timeline-item')
-            .data('id');
+        const id = $(e.target).closest('.details__history-timeline-item').data('id');
         this.showRecord(id);
     }
 
@@ -253,7 +251,7 @@ class DetailsHistoryView extends View {
     buildTimeline() {
         const firstRec = this.history[0];
         const lastRec = this.history[this.history.length - 1];
-        this.timeline = this.history.map(rec => ({
+        this.timeline = this.history.map((rec) => ({
             pos: (rec.updated - firstRec.updated) / (lastRec.updated - firstRec.updated),
             rec
         }));
@@ -263,7 +261,7 @@ class DetailsHistoryView extends View {
             firstRec.updated.getTime(),
             lastRec.updated.getTime(),
             format.round
-        ).map(label => ({
+        ).map((label) => ({
             pos: (label - firstRec.updated) / (lastRec.updated - firstRec.updated),
             val: label,
             text: format.format(new Date(label))
diff --git a/app/scripts/views/details/details-view.js b/app/scripts/views/details/details-view.js
index 6167a724..ec67b15e 100644
--- a/app/scripts/views/details/details-view.js
+++ b/app/scripts/views/details/details-view.js
@@ -96,7 +96,7 @@ class DetailsView extends View {
     }
 
     removeFieldViews() {
-        this.fieldViews.forEach(fieldView => fieldView.remove());
+        this.fieldViews.forEach((fieldView) => fieldView.remove());
         this.fieldViews = [];
         this.hideFieldCopyTip();
     }
@@ -136,7 +136,7 @@ class DetailsView extends View {
     }
 
     getFieldView(name) {
-        return this.fieldViews.find(fv => fv.model.name === name);
+        return this.fieldViews.find((fv) => fv.model.name === name);
     }
 
     addFieldViews() {
@@ -152,7 +152,7 @@ class DetailsView extends View {
                 fieldView.render();
                 fieldView.on('change', this.fieldChanged.bind(this));
                 fieldView.on('copy', this.fieldCopied.bind(this));
-                fieldView.on('autotype', e => this.autoType(e.source.model.sequence));
+                fieldView.on('autotype', (e) => this.autoType(e.source.model.sequence));
                 if (hideEmptyFields) {
                     const value = fieldView.model.value();
                     if (!value || value.length === 0 || value.byteLength === 0) {
@@ -223,7 +223,7 @@ class DetailsView extends View {
                 const hideEmptyFields = AppSettingsModel.hideEmptyFields;
                 const moreOptions = [];
                 if (hideEmptyFields) {
-                    this.fieldViews.forEach(fieldView => {
+                    this.fieldViews.forEach((fieldView) => {
                         if (fieldView.isHidden()) {
                             moreOptions.push({
                                 value: 'add:' + fieldView.model.name,
@@ -306,7 +306,7 @@ class DetailsView extends View {
             default:
                 if (e.item.lastIndexOf('add:', 0) === 0) {
                     const fieldName = e.item.substr(4);
-                    const fieldView = this.fieldViews.find(f => f.model.name === fieldName);
+                    const fieldView = this.fieldViews.find((f) => f.model.name === fieldName);
                     fieldView.show();
                     fieldView.edit();
                 }
@@ -336,9 +336,7 @@ class DetailsView extends View {
     }
 
     selectColor(e) {
-        let color = $(e.target)
-            .closest('.details__colors-popup-item')
-            .data('color');
+        let color = $(e.target).closest('.details__colors-popup-item').data('color');
         if (!color) {
             return;
         }
@@ -579,7 +577,7 @@ class DetailsView extends View {
                 }
             }
             this.entryUpdated(true);
-            this.fieldViews.forEach(function(fieldView, ix) {
+            this.fieldViews.forEach(function (fieldView, ix) {
                 if (
                     fieldView instanceof FieldViewCustom &&
                     !fieldView.model.newField &&
@@ -927,7 +925,7 @@ class DetailsView extends View {
 
     otpEnterManually() {
         if (this.model.fields.otp) {
-            const otpField = this.fieldViews.find(f => f.model.name === '$otp');
+            const otpField = this.fieldViews.find((f) => f.model.name === '$otp');
             if (otpField) {
                 otpField.edit();
             }
@@ -967,7 +965,7 @@ class DetailsView extends View {
         const hasOtp = sequence?.includes('{TOTP}') || (entry.external && !sequence);
         if (hasOtp) {
             const otpField = this.getFieldView('$otp');
-            otpField.refreshOtp(err => {
+            otpField.refreshOtp((err) => {
                 if (!err) {
                     Events.emit('auto-type', {
                         entry,
diff --git a/app/scripts/views/fields/field-view-otp.js b/app/scripts/views/fields/field-view-otp.js
index 1ba7b620..93026e34 100644
--- a/app/scripts/views/fields/field-view-otp.js
+++ b/app/scripts/views/fields/field-view-otp.js
@@ -153,7 +153,7 @@ class FieldViewOtp extends FieldViewText {
     }
 
     copyValue() {
-        this.refreshOtp(err => {
+        this.refreshOtp((err) => {
             if (!err) {
                 super.copyValue();
             }
diff --git a/app/scripts/views/fields/field-view-select.js b/app/scripts/views/fields/field-view-select.js
index 8f2e52d4..41e72525 100644
--- a/app/scripts/views/fields/field-view-select.js
+++ b/app/scripts/views/fields/field-view-select.js
@@ -8,7 +8,7 @@ class FieldViewSelect extends FieldView {
         return (
             '