[epiphany/mcatanzaro/passwords: 28/35] ephy.js: Move more work into _generateFormAuth

[Jan-Michael Brummer <jbrummer src gnome org>]

commit 35bf6122a2e3a3ec6f19fe22a9beefca9c72b08f
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Mar 3 16:24:01 2019 -0600

    ephy.js: Move more work into _generateFormAuth
    
    Let _generateFormAuth handle computing the username, usernameField,
    password, and passwordField, so callsites don't have to. Otherwise we're
    just doing too much work at the callsites.

 embed/web-extension/resources/js/ephy.js | 52 ++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/embed/web-extension/resources/js/ephy.js b/embed/web-extension/resources/js/ephy.js
index 93173a2cf..2cb33675a 100644
--- a/embed/web-extension/resources/js/ephy.js
+++ b/embed/web-extension/resources/js/ephy.js
@@ -456,9 +456,9 @@ Ephy.FormManager = class FormManager
         Ephy.passwordManager.query(
             this._formAuth.origin,
             this._formAuth.targetOrigin,
-            this._formAuth.usernameNode && this._formAuth.usernameNode.value ? 
this._formAuth.usernameNode.value : null,
-            this._formAuth.usernameNode ? this._formAuth.usernameNode.name : null,
-            this._formAuth.passwordNode.name).then(function (authInfo) {
+            this._formAuth.username,
+            this._formAuth.usernameField,
+            this._formAuth.passwordField).then(function (authInfo) {
                 if (!authInfo) {
                     Ephy.log('No result');
                     return;
@@ -487,19 +487,9 @@ Ephy.FormManager = class FormManager
         if (!this._formAuth)
             return;
 
-        if (!this._formAuth.passwordNode.value || !this._formAuth.passwordNode.name)
+        if (!this._formAuth.password)
             return;
 
-        let password = this._formAuth.passwordNode.value;
-        let passwordField = this._formAuth.passwordNode.name;
-
-        let username = null;
-        let usernameField = null;
-        if (this._formAuth.usernameNode && this._formAuth.usernameNode.value && 
this._formAuth.usernameNode.name) {
-            username = this._formAuth.usernameNode.value;
-            usernameField = this._formAuth.usernameNode.name;
-        }
-
         let permission = Ephy.permissionsManager.permission(Ephy.PermissionType.SAVE_PASSWORD, 
this._formAuth.origin);
         if (permission == Ephy.Permission.DENY) {
             Ephy.log('User/password storage permission previously denied. Not asking about storing.');
@@ -513,11 +503,11 @@ Ephy.FormManager = class FormManager
         Ephy.passwordManager.query(
             this._formAuth.origin,
             this._formAuth.targetOrigin,
-            username,
-            usernameField,
-            passwordField).then(function (authInfo) {
+            this._formAuth.username,
+            this._formAuth.usernameField,
+            this._formAuth.passwordField).then(function (authInfo) {
                 if (authInfo) {
-                    if (authInfo.username == username && authInfo.password == password) {
+                    if (authInfo.username == self._formAuth.username && authInfo.password == 
self._formAuth.password) {
                         Ephy.log('User/password already stored. Not asking about storing.');
                         return;
                     }
@@ -526,8 +516,10 @@ Ephy.FormManager = class FormManager
                         Ephy.log('User/password not yet stored. Storing.');
                         Ephy.passwordManager.save(self._formAuth.origin,
                                                   self._formAuth.targetOrigin,
-                                                  username, password,
-                                                  usernameField, passwordField,
+                                                  self._formAuth.username,
+                                                  self._formAuth.password,
+                                                  self._formAuth.usernameField,
+                                                  self._formAuth.passwordField,
                                                   false);
                         return;
                     }
@@ -539,8 +531,10 @@ Ephy.FormManager = class FormManager
 
                 Ephy.passwordManager.requestSave(self._formAuth.origin,
                                                  self._formAuth.targetOrigin,
-                                                 username, password,
-                                                 usernameField, passwordField,
+                                                 self._formAuth.username,
+                                                 self._formAuth.password,
+                                                 self._formAuth.usernameField,
+                                                 self._formAuth.passwordField,
                                                  authInfo == null,
                                                  self._pageID);
             }
@@ -681,6 +675,20 @@ Ephy.FormManager = class FormManager
             formAuth.targetOrigin = formAuth.origin;
         }
 
+        formAuth.username = null;
+        if (formAuth.usernameNode && formAuth.usernameNode.value)
+            username = formAuth.usernameNode.value;
+
+        formAuth.usernameField = null;
+        if (formAuth.usernameNode && formAuth.usernameNode.name)
+            usernameField = formAuth.usernameNode.name;
+
+        if (!formAuth.passwordNode.name)
+            return null;
+
+        formAuth.password = formAuth.passwordNode.value;
+        formAuth.passwordField = formAuth.passwordNode.name;
+
         return formAuth;
     }
 }