using node-onlykey module from GitHub, apple prompt to continue (onlykey#34)

* fix for safari, webauthn call on load disabled

* fix for safari, webauthn call on load disabled

* fix for safari, webauthn call on load disabled

* changes to lib to use node_modules

* pull lib from github

* fix for apple, prompt to continue

Author: bmatusiak

package.json

@@ -47,6 +47,7 @@
   "dependencies": {
     "express": "^4.17.1",
     "gun": "^0.2020.520",
+    "node-onlykey": "github:trustcrypto/node-onlykey#043e5d64f12ad90c166c7e04446eefcededd29e6",
     "xterm": "^4.8.1",
     "xterm-addon-fit": "^0.4.0"
   }

src/plugins.js

@@ -11,7 +11,7 @@ module.exports = [
   require("./lib/gun.js"),
 
   /* the onlykey plugin contains the api and other utilities for other plugins */
-  require("./onlykey-fido2/plugin.js"),
+  require("node-onlykey/src/onlykey-fido2/plugin.js"),
 
   /* pages plugin is the heart of the app state */
   require("./plugins/pages/pages.js"),

src/plugins/index/index.js

@@ -47,6 +47,24 @@ module.exports = {
                     // if(document.hasFocus())//firefox fix, firefox aborts onlykey request when not in focus
                     if(imports.onlykeyApi.api.extra.getBrowser() !== "Apple")
                         imports.app.on("start", doSetTime.bind(null, 2000));
+                    else {
+                        // console.log("index_init");
+                        imports.app.onlykeyApi.api.step = function(proceed){
+                            
+                            imports.app.bs_modal_dialog.confirm("Continue",
+                                `To continue please click 'Yes' to access OnlyKey via USB`, ["Yes"],
+                                async function(cancel, ans) {
+                                    if (ans == "Yes") {
+                                        proceed();
+                                    }
+                                });
+
+                        }
+                        
+                        imports.app.on("start", doSetTime.bind(null, 2000));
+                    }
+                        
+                    
                     // else
                     // imports.app.on("start",function(){
                     //     if(imports.app.$("#setTime").length == 0)

src/plugins/password-generator/password-generator.js

@@ -30,13 +30,13 @@ module.exports = {
 
 
                 var onlykey3rd = app.onlykey3rd;
-                var ok = onlykey3rd(1, 0);
+                var ok = onlykey3rd();
                 var $ = app.$;
 
                 $("#onlykey_start").click(async function() {
                     var phrase = $("#phrase").val();
-                    ok.derive_public_key(phrase, function(error, phrasePubkey) {
-                        ok.derive_shared_secret(phrase, phrasePubkey, async function(error, phrasePubkeySecret) {
+                    ok.derive_public_key(phrase,1, false,  function(error, phrasePubkey) {
+                        ok.derive_shared_secret(phrase, phrasePubkey, 1, false, async function(error, phrasePubkeySecret) {
                             $("#phrase_out").val(phrasePubkeySecret);
                         });
                     });