From 2dbc350b532f54aa4b41467ed3564650b532856d Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 31 Mar 2016 23:52:04 +0300 Subject: [PATCH] reading otp qr codes --- Gruntfile.js | 3 +- LICENSE.txt | 233 ++++++++++++++++++ MIT-LICENSE.txt | 20 -- README.md | 2 +- app/scripts/comp/alerts.js | 4 +- app/scripts/comp/otp-qr-reader.js | 125 ++++++++++ app/scripts/comp/otp.js | 56 +++++ app/scripts/const/links.js | 3 +- app/scripts/util/feature-detector.js | 15 +- app/scripts/util/locale.js | 14 ++ app/scripts/views/details/details-view.js | 14 ++ app/scripts/views/modal-view.js | 6 + .../views/settings/settings-about-view.js | 1 + app/templates/settings/settings-about.hbs | 2 + bower.json | 3 +- 15 files changed, 475 insertions(+), 26 deletions(-) create mode 100644 LICENSE.txt delete mode 100644 MIT-LICENSE.txt create mode 100644 app/scripts/comp/otp-qr-reader.js create mode 100644 app/scripts/comp/otp.js diff --git a/Gruntfile.js b/Gruntfile.js index 79daed33..3e60a5b9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -187,7 +187,7 @@ module.exports = function(grunt) { js: { entry: { app: 'app', - vendor: ['jquery', 'underscore', 'backbone', 'kdbxweb', 'baron', 'dropbox', 'pikaday', 'filesaver'] + vendor: ['jquery', 'underscore', 'backbone', 'kdbxweb', 'baron', 'dropbox', 'pikaday', 'filesaver', 'qrcode'] }, output: { path: 'tmp/js', @@ -213,6 +213,7 @@ module.exports = function(grunt) { baron: 'baron/baron.min.js', pikaday: 'pikaday/pikaday.js', filesaver: 'FileSaver.js/FileSaver.min.js', + qrcode: 'jsqrcode/dist/qrcode.min.js', templates: path.join(__dirname, 'app/templates') } }, diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..3bb76632 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,233 @@ +Copyright (C) 2015 Antelle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +====================================================================================== + + Dependencies Licenses + +====================================================================================== + +jsqrcode license: Apache-2.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +================================================================================ diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt deleted file mode 100644 index c05bce57..00000000 --- a/MIT-LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (C) 2015 Antelle - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index c56057e2..5c69911a 100644 --- a/README.md +++ b/README.md @@ -53,4 +53,4 @@ For pull requests: branch is important! `master` is only for hotfixes, `develop` # License -[MIT](https://github.com/antelle/keeweb/blob/master/MIT-LICENSE.txt) +[MIT](https://github.com/antelle/keeweb/blob/master/LICENSE.txt) diff --git a/app/scripts/comp/alerts.js b/app/scripts/comp/alerts.js index 91c0e877..80168155 100644 --- a/app/scripts/comp/alerts.js +++ b/app/scripts/comp/alerts.js @@ -9,7 +9,8 @@ var Alerts = { buttons: { ok: {result: 'yes', title: Locale.alertOk}, yes: {result: 'yes', title: Locale.alertYes}, - no: {result: '', title: Locale.alertNo} + no: {result: '', title: Locale.alertNo}, + cancel: {result: '', title: Locale.alertCancel} }, alert: function(config) { @@ -28,6 +29,7 @@ var Alerts = { config.complete(res, check); } }); + return view; }, notImplemented: function() { diff --git a/app/scripts/comp/otp-qr-reader.js b/app/scripts/comp/otp-qr-reader.js new file mode 100644 index 00000000..82616d6f --- /dev/null +++ b/app/scripts/comp/otp-qr-reader.js @@ -0,0 +1,125 @@ +'use strict'; + +var Backbone = require('backbone'), + Alerts = require('./alerts'), + Locale = require('../util/locale'), + Logger = require('../util/logger'), + FeatureDetector = require('../util/feature-detector'), + Otp = require('../comp/otp'), + QrCode = require('qrcode'); + +var logger = new Logger('otp-qr-reader'); + +var OtpQrReader = { + alert: null, + + read: function() { + var screenshotKey = FeatureDetector.screenshotToClipboardShortcut(); + if (screenshotKey) { + screenshotKey = Locale.detSetupOtpAlertBodyWith.replace('{}', '' + screenshotKey + ''); + } + var pasteKey = FeatureDetector.isMobile() ? '' : + Locale.detSetupOtpAlertBodyWith.replace('{}', + '' + FeatureDetector.actionShortcutSymbol() + 'V'); + OtpQrReader.startListenClipoard(); + OtpQrReader.alert = Alerts.alert({ + icon: 'qrcode', + header: Locale.detSetupOtpAlert, + body: [Locale.detSetupOtpAlertBody, + Locale.detSetupOtpAlertBody1, + Locale.detSetupOtpAlertBody2.replace('{}', screenshotKey || ''), + Locale.detSetupOtpAlertBody3.replace('{}', pasteKey || '') + ].join('
'), + esc: '', + click: '', + enter: '', + buttons: [Alerts.buttons.cancel], + complete: function() { + OtpQrReader.alert = null; + OtpQrReader.stopListenClipboard(); + } + }); + // var BrowserWindow = require('../../comp/launcher').remReq('browser-window'); + // var win = new BrowserWindow({ width: 800, height: 600, show: false, alwaysOnTop: true, backgroundColor: '#80FFFFFF', + // transparent: true }); + // win.on('closed', function() { win = null; }); + // win.loadURL('https://github.com'); + // win.show(); + }, + + startListenClipoard: function() { + document.addEventListener('paste', OtpQrReader.pasteEvent); + }, + + stopListenClipboard: function() { + document.removeEventListener('paste', OtpQrReader.pasteEvent); + }, + + pasteEvent: function(e) { + logger.debug('Paste event'); + var item = _.find(e.clipboardData.items, function(item) { + return item.kind === 'file' && item.type.indexOf('image') !== -1; + }); + if (!item) { + return; + } + logger.info('Reading image', item.type); + if (OtpQrReader.alert) { + OtpQrReader.alert.change({ + header: Locale.detOtpImageReading + }); + } + var blob = item.getAsFile(); + var reader = new FileReader(); + reader.onload = function() { + logger.debug('Image data loaded'); + OtpQrReader.readQr(reader.result); + }; + reader.readAsDataURL(blob); + }, + + readQr: function(imageData) { + var image = new Image(); + image.onload = function() { + logger.debug('Image format loaded'); + try { + var ts = logger.ts(); + var url = new QrCode(image).decode(); + logger.info('QR code read', logger.ts(ts), url); + OtpQrReader.alert.remove(); + OtpQrReader.stopListenClipboard(); + try { + var otp = Otp.parseUrl(url); + OtpQrReader.trigger('qr-read', otp); + } catch (err) { + Alerts.error({ + header: Locale.detOtpQrWrong, + body: Locale.detOtpQrWrongBody + '
' + _.escape(err.toString()) +'
' + }); + } + } catch (e) { + logger.error('Error reading QR code', e); + OtpQrReader.alert.remove(); + OtpQrReader.stopListenClipboard(); + Alerts.error({ + header: Locale.detOtpQrError, + body: Locale.detOtpQrErrorBody + }); + } + }; + image.onerror = function() { + logger.debug('Image load error'); + OtpQrReader.alert.remove(); + OtpQrReader.stopListenClipboard(); + Alerts.error({ + header: Locale.detOtpImageError, + body: Locale.detOtpImageErrorBody + }); + }; + image.src = imageData; + } +}; + +_.extend(OtpQrReader, Backbone.Events); + +module.exports = OtpQrReader; diff --git a/app/scripts/comp/otp.js b/app/scripts/comp/otp.js new file mode 100644 index 00000000..393df4af --- /dev/null +++ b/app/scripts/comp/otp.js @@ -0,0 +1,56 @@ +'use strict'; + +var Otp = function(url, params) { + if (['hotp', 'totp'].indexOf(params.type) < 0) { + throw 'Bad type: ' + params.type; + } + if (!params.secret) { + throw 'Empty secret'; + } + if (params.algorithm && ['SHA1', 'SHA256', 'SHA512'].indexOf(params.algorithm) < 0) { + throw 'Bad algorithm: ' + params.algorithm; + } + if (params.digits && ['6', '8'].indexOf(params.digits) < 0) { + throw 'Bad digits: ' + params.digits; + } + if (params.type === 'hotp' && !params.counter) { + throw 'Bad counter: ' + params.counter; + } + if (params.period && isNaN(params.period) || params.period < 1) { + throw 'Bad period: ' + params.period; + } + this.url = url; + this.type = params.type; + this.issuer = params.issuer; + this.account = params.account; + this.secret = params.secret; + this.issuer = params.issuer; + this.algorithm = params.algorithm ? params.algorithm.toUpperCase() : 'SHA1'; + this.digits = params.digits ? +params.digits : 6; + this.counter = params.counter; + this.period = params.period ? +params.period : 30; +}; + +Otp.parseUrl = function(url) { + var match = /^otpauth:\/\/(\w+)\/([^\?]+)\?(.*)/i.exec(url); + if (!match) { + throw 'Not OTP url'; + } + var params = {}; + var label = decodeURIComponent(match[2]); + if (label) { + var parts = label.split(':'); + params.issuer = parts[0].trim(); + if (parts.length > 1) { + params.account = parts[1].trim(); + } + } + params.type = match[1].toLowerCase(); + match[3].split('&').forEach(function(part) { + var parts = part.split('=', 2); + params[parts[0].toLowerCase()] = decodeURIComponent(parts[1]); + }); + return new Otp(url, params); +}; + +module.exports = Otp; diff --git a/app/scripts/const/links.js b/app/scripts/const/links.js index 27169ead..2096e496 100644 --- a/app/scripts/const/links.js +++ b/app/scripts/const/links.js @@ -4,7 +4,8 @@ var Links = { Repo: 'https://github.com/antelle/keeweb', Desktop: 'https://github.com/antelle/keeweb/releases/latest', WebApp: 'https://app.keeweb.info', - License: 'https://github.com/antelle/keeweb/blob/master/MIT-LICENSE.txt', + License: 'https://github.com/antelle/keeweb/blob/master/LICENSE.txt', + LicenseApache: 'https://opensource.org/licenses/Apache-2.0', UpdateDesktop: 'https://github.com/antelle/keeweb/releases/download/v{ver}/UpdateDesktop.zip', ReleaseNotes: 'https://github.com/antelle/keeweb/blob/master/release-notes.md#release-notes', SelfHostedDropbox: 'https://github.com/antelle/keeweb#self-hosting', diff --git a/app/scripts/util/feature-detector.js b/app/scripts/util/feature-detector.js index 50888143..dff2baad 100644 --- a/app/scripts/util/feature-detector.js +++ b/app/scripts/util/feature-detector.js @@ -4,6 +4,12 @@ var FeatureDetector = { isMac: function() { return navigator.platform.indexOf('Mac') >= 0; }, + isWindows: function() { + return navigator.platform.indexOf('Win') >= 0; + }, + isiOS: function() { + return /(iPad|iPhone)/i.test(navigator.userAgent); + }, isMobile: function() { return typeof window.orientation !== 'undefined'; }, @@ -22,8 +28,15 @@ var FeatureDetector = { globalShortcutIsLarge: function() { return !this.isMac(); }, + screenshotToClipboardShortcut: function() { + if (this.isiOS()) { return 'Sleep+Home'; } + if (this.isMobile()) { return ''; } + if (this.isMac()) { return 'Command-Shift-Control-4'; } + if (this.isWindows()) { return 'Alt+PrintScreen'; } + return ''; + }, shouldMoveHiddenInputToCopySource: function() { - return /(iPad|iPhone)/i.test(navigator.userAgent); + return this.isiOS(); }, canCopyReadonlyInput: function() { return !(/CriOS/i.test(navigator.userAgent)); diff --git a/app/scripts/util/locale.js b/app/scripts/util/locale.js index f89053fa..0189e0c4 100644 --- a/app/scripts/util/locale.js +++ b/app/scripts/util/locale.js @@ -200,6 +200,20 @@ var Locale = { detMenuShowEmpty: 'Show empty fields', detMenuHideEmpty: 'Hide empty fields', detMenuAddField: 'Add {}', + detSetupOtp: 'One-time passwords', + detSetupOtpAlert: 'Scan the QR code', + detSetupOtpAlertBody: 'Please copy the QR code which is displayed on the authorization page.', + detSetupOtpAlertBody1: '1. go to the authorization page', + detSetupOtpAlertBody2: '2. make a screenshot of the QR code {}', + detSetupOtpAlertBody3: '3. paste it here {}', + detSetupOtpAlertBodyWith: 'with {}', + detOtpImageError: 'Error reading image', + detOtpImageErrorBody: 'Sorry, we could not read the image format, please contact the app authors with error details.', + detOtpImageReading: 'Reading QR code...', + detOtpQrError: 'QR code scan error', + detOtpQrErrorBody: 'Sorry, we could not read the QR code, please try once again or contact the app authors with error details.', + detOtpQrWrong: 'Wrong QR code', + detOtpQrWrongBody: 'Your QR code was successfully scanned but it doesn\'t contain one-time password data.', appSecWarn: 'Not Secure!', appSecWarnBody1: 'You have loaded this app with insecure connection. ' + diff --git a/app/scripts/views/details/details-view.js b/app/scripts/views/details/details-view.js index b3448c30..96a45f55 100644 --- a/app/scripts/views/details/details-view.js +++ b/app/scripts/views/details/details-view.js @@ -22,6 +22,7 @@ var Backbone = require('backbone'), KeyHandler = require('../../comp/key-handler'), Alerts = require('../../comp/alerts'), CopyPaste = require('../../comp/copy-paste'), + OtpQrReqder = require('../../comp/otp-qr-reader'), Format = require('../../util/format'), Locale = require('../../util/locale'), Tip = require('../../util/tip'), @@ -62,6 +63,7 @@ var DetailsView = Backbone.View.extend({ this.listenTo(Backbone, 'copy-password', this.copyPassword); this.listenTo(Backbone, 'copy-user', this.copyUserName); this.listenTo(Backbone, 'copy-url', this.copyUrl); + this.listenTo(OtpQrReqder, 'qr-read', this.otpCodeRead); KeyHandler.onKey(Keys.DOM_VK_C, this.copyPassword, this, KeyHandler.SHORTCUT_ACTION, false, true); KeyHandler.onKey(Keys.DOM_VK_B, this.copyUserName, this, KeyHandler.SHORTCUT_ACTION, false, true); KeyHandler.onKey(Keys.DOM_VK_U, this.copyUrl, this, KeyHandler.SHORTCUT_ACTION, false, true); @@ -228,6 +230,7 @@ var DetailsView = Backbone.View.extend({ moreOptions.push({value: 'add-new', icon: 'plus', text: Locale.detMenuAddNewField}); moreOptions.push({value: 'toggle-empty', icon: 'eye-slash', text: Locale.detMenuHideEmpty}); } + moreOptions.push({value: 'otp', icon: 'clock-o', text: Locale.detSetupOtp}); var rect = this.moreView.labelEl[0].getBoundingClientRect(); dropdownView.render({ position: {top: rect.bottom, right: rect.right}, @@ -250,6 +253,9 @@ var DetailsView = Backbone.View.extend({ AppSettingsModel.instance.set('hideEmptyFields', !hideEmptyFields); this.render(); break; + case 'otp': + this.setupOtp(); + break; default: if (e.item.lastIndexOf('add:', 0) === 0) { var fieldName = e.item.substr(4); @@ -673,6 +679,14 @@ var DetailsView = Backbone.View.extend({ backClick: function() { Backbone.trigger('toggle-details', false); + }, + + setupOtp: function() { + OtpQrReqder.read(); + }, + + otpCodeRead: function(/*otpParams*/) { + Alerts.notImplemented(); } }); diff --git a/app/scripts/views/modal-view.js b/app/scripts/views/modal-view.js index 787e9a85..ec170250 100644 --- a/app/scripts/views/modal-view.js +++ b/app/scripts/views/modal-view.js @@ -43,6 +43,12 @@ var ModalView = Backbone.View.extend({ return this; }, + change: function(config) { + if (config.header) { + this.$el.find('.modal__header').html(config.header); + } + }, + buttonClick: function(e) { var result = $(e.target).data('result'); this.closeWithResult(result); diff --git a/app/scripts/views/settings/settings-about-view.js b/app/scripts/views/settings/settings-about-view.js index fd4e9324..eaca9ae8 100644 --- a/app/scripts/views/settings/settings-about-view.js +++ b/app/scripts/views/settings/settings-about-view.js @@ -11,6 +11,7 @@ var SettingsAboutView = Backbone.View.extend({ this.renderTemplate({ version: RuntimeInfo.version, licenseLink: Links.License, + licenseLinkApache: Links.LicenseApache, repoLink: Links.Repo }); } diff --git a/app/templates/settings/settings-about.hbs b/app/templates/settings/settings-about.hbs index e60e48b8..d74d87f6 100644 --- a/app/templates/settings/settings-about.hbs +++ b/app/templates/settings/settings-about.hbs @@ -13,6 +13,8 @@
  • handlebars, semantic templates
  • dropbox-js, unofficial JavaScript library for the Dropbox Core API
    • +
  • jsqrcode, QR code scanner, + Apache-2.0 license

    • Core components

    diff --git a/bower.json b/bower.json index 08ff9bd4..8713c6a6 100644 --- a/bower.json +++ b/bower.json @@ -33,6 +33,7 @@ "normalize.css": "~3.0.3", "pikaday": "~1.3.3", "FileSaver.js": "eligrey/FileSaver.js", - "jquery": "~2.2.0" + "jquery": "~2.2.0", + "jsqrcode": "antelle/jsqrcode#^0.1.0" } }