Merge pull request #8 from duckduckgo/ema/fix-platforms-breakages

Fix breakages introduced on other platforms
duckduckgo · Jul 5, 2021 · 2d6e7a3 · 2d6e7a3
2 parents 3f8b4d6 + 2849241
commit 2d6e7a3
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 41 deletions.
diff --git a/dist/autofill.css b/dist/autofill.css
@@ -109,6 +109,7 @@
     width: 36px;
     height: 36px;
     margin: auto 6px auto 0;
+    /* TODO: use dynamically from src/UI/img/ddgPasswordIcon.js */
     background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMjRweCIgaGVpZ2h0PSIyNHB4IiB2aWV3Qm94PSIwIDAgMjQgMjQiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8dGl0bGU+ZGRnLXBhc3N3b3JkLWljb24tYmFzZTwvdGl0bGU+CiAgICA8ZyBpZD0iZGRnLXBhc3N3b3JkLWljb24tYmFzZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9IlVuaW9uIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0LjAwMDAwMCwgNC4wMDAwMDApIiBmaWxsPSIjMDAwMDAwIj4KICAgICAgICAgICAgPHBhdGggZD0iTTExLjMzMzMsMi42NjY2NyBDMTAuMjI4OCwyLjY2NjY3IDkuMzMzMzMsMy41NjIxIDkuMzMzMzMsNC42NjY2NyBDOS4zMzMzMyw1Ljc3MTI0IDEwLjIyODgsNi42NjY2NyAxMS4zMzMzLDYuNjY2NjcgQzEyLjQzNzksNi42NjY2NyAxMy4zMzMzLDUuNzcxMjQgMTMuMzMzMyw0LjY2NjY3IEMxMy4zMzMzLDMuNTYyMSAxMi40Mzc5LDIuNjY2NjcgMTEuMzMzMywyLjY2NjY3IFogTTEwLjY2NjcsNC42NjY2NyBDMTAuNjY2Nyw0LjI5ODQ4IDEwLjk2NTEsNCAxMS4zMzMzLDQgQzExLjcwMTUsNCAxMiw0LjI5ODQ4IDEyLDQuNjY2NjcgQzEyLDUuMDM0ODYgMTEuNzAxNSw1LjMzMzMzIDExLjMzMzMsNS4zMzMzMyBDMTAuOTY1MSw1LjMzMzMzIDEwLjY2NjcsNS4wMzQ4NiAxMC42NjY3LDQuNjY2NjcgWiIgaWQ9IlNoYXBlIj48L3BhdGg+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0xMC42NjY3LDAgQzcuNzIxMTUsMCA1LjMzMzMzLDIuMzg3ODEgNS4zMzMzMyw1LjMzMzMzIEM1LjMzMzMzLDUuNzYxMTkgNS4zODM4NSw2LjE3Nzk4IDUuNDc5NDUsNi41Nzc3NSBMMC4xOTUyNjIsMTEuODYxOSBDMC4wNzAyMzc5LDExLjk4NyAwLDEyLjE1NjUgMCwxMi4zMzMzIEwwLDE1LjMzMzMgQzAsMTUuNzAxNSAwLjI5ODQ3NywxNiAwLjY2NjY2NywxNiBMMy4zMzMzMywxNiBDNC4wNjk3MSwxNiA0LjY2NjY3LDE1LjQwMyA0LjY2NjY3LDE0LjY2NjcgTDQuNjY2NjcsMTQgTDUuMzMzMzMsMTQgQzYuMDY5NzEsMTQgNi42NjY2NywxMy40MDMgNi42NjY2NywxMi42NjY3IEw2LjY2NjY3LDExLjMzMzMgTDgsMTEuMzMzMyBDOC4xNzY4MSwxMS4zMzMzIDguMzQ2MzgsMTEuMjYzMSA4LjQ3MTQxLDExLjEzODEgTDkuMTU5MDYsMTAuNDUwNCBDOS42Mzc3MiwxMC41OTEyIDEwLjE0MzksMTAuNjY2NyAxMC42NjY3LDEwLjY2NjcgQzEzLjYxMjIsMTAuNjY2NyAxNiw4LjI3ODg1IDE2LDUuMzMzMzMgQzE2LDIuMzg3ODEgMTMuNjEyMiwwIDEwLjY2NjcsMCBaIE02LjY2NjY3LDUuMzMzMzMgQzYuNjY2NjcsMy4xMjQxOSA4LjQ1NzUzLDEuMzMzMzMgMTAuNjY2NywxLjMzMzMzIEMxMi44NzU4LDEuMzMzMzMgMTQuNjY2NywzLjEyNDE5IDE0LjY2NjcsNS4zMzMzMyBDMTQuNjY2Nyw3LjU0MjQ3IDEyLjg3NTgsOS4zMzMzMyAxMC42NjY3LDkuMzMzMzMgQzEwLjE1NTgsOS4zMzMzMyA5LjY2ODg2LDkuMjM3OSA5LjIyMTUyLDkuMDY0NSBDOC45NzUyOCw4Ljk2OTA1IDguNjk1OTEsOS4wMjc5NSA4LjUwOTE2LDkuMjE0NjkgTDcuNzIzODYsMTAgTDYsMTAgQzUuNjMxODEsMTAgNS4zMzMzMywxMC4yOTg1IDUuMzMzMzMsMTAuNjY2NyBMNS4zMzMzMywxMi42NjY3IEw0LDEyLjY2NjcgQzMuNjMxODEsMTIuNjY2NyAzLjMzMzMzLDEyLjk2NTEgMy4zMzMzMywxMy4zMzMzIEwzLjMzMzMzLDE0LjY2NjcgTDEuMzMzMzMsMTQuNjY2NyBMMS4zMzMzMywxMi42MDk1IEw2LjY5Nzg3LDcuMjQ0OTQgQzYuODc1MDIsNy4wNjc3OSA2LjkzNzksNi44MDYyOSA2Ljg2MDY1LDYuNTY3OTggQzYuNzM0ODksNi4xNzk5NyA2LjY2NjY3LDUuNzY1MjcgNi42NjY2Nyw1LjMzMzMzIFoiIGlkPSJTaGFwZSI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+');
     background-size: cover;
 }

diff --git a/dist/autofill.js b/dist/autofill.js
@@ -169,6 +169,8 @@ class ExtensionInterface extends InterfacePrototype {
   constructor() {
     super();
 
+    this.isDeviceSignedIn = () => this.hasLocalAddresses;
+
     this.setupAutofill = ({
       shouldLog
     } = {
@@ -260,28 +262,24 @@ class AndroidInterface extends InterfacePrototype {
       alias
     }) => alias);
 
-    this.isDeviceSignedIn = () => new Promise(resolve => {
-      resolve(window.EmailInterface.isSignedIn() === 'true');
-    });
+    this.isDeviceSignedIn = () => window.EmailInterface.isSignedIn() === 'true';
 
     this.setupAutofill = ({
       shouldLog
     } = {
       shouldLog: false
     }) => {
-      this.isDeviceSignedIn().then(signedIn => {
-        if (signedIn) {
-          notifyWebApp({
-            deviceSignedIn: {
-              value: true,
-              shouldLog
-            }
-          });
-          scanForInputs(this);
-        } else {
-          this.trySigningIn();
-        }
-      });
+      if (this.isDeviceSignedIn()) {
+        notifyWebApp({
+          deviceSignedIn: {
+            value: true,
+            shouldLog
+          }
+        });
+        scanForInputs(this);
+      } else {
+        this.trySigningIn();
+      }
     };
 
     this.storeUserData = ({
@@ -314,10 +312,13 @@ class AppleDeviceInterface extends InterfacePrototype {
         await this.getAccounts();
       }
 
-      const signedIn = await this.isDeviceSignedIn();
+      const signedIn = await this._checkDeviceSignedIn();
 
       if (signedIn) {
-        await this.getAddresses();
+        if (isApp) {
+          await this.getAddresses();
+        }
+
         notifyWebApp({
           deviceSignedIn: {
             value: true,
@@ -353,10 +354,13 @@ class AppleDeviceInterface extends InterfacePrototype {
 
     this.refreshAlias = () => wkSend('emailHandlerRefreshAlias');
 
-    this.isDeviceSignedIn = async () => {
+    this._checkDeviceSignedIn = async () => {
       const {
         isAppSignedIn
       } = await wkSendAndWait('emailHandlerCheckAppSignedInStatus');
+
+      this.isDeviceSignedIn = () => !!isAppSignedIn;
+
       return !!isAppSignedIn;
     };
 
@@ -662,7 +666,7 @@ class Form {
     if (this.isLogin) {
       if (this.Device.hasLocalCredentials) this.decorateInput(input);
     } else {
-      if (this.Device.hasLocalAddresses && !input.matches(PASSWORD_SELECTOR)) {
+      if (this.Device.isDeviceSignedIn() && !input.matches(PASSWORD_SELECTOR)) {
         this.decorateInput(input);
       }
     }
@@ -763,9 +767,7 @@ class FormAnalyzer {
   constructor(form, input) {
     this.form = form;
     this.autofillSignal = 0;
-    this.signals = []; // Avoid autofill on our signup page
-
-    if (window.location.href.match(/^https:\/\/.+\.duckduckgo\.com\/email\/signup/i)) return this;
+    this.signals = [];
     this.evaluateElAttributes(input, 3, true);
     form ? this.evaluateForm() : this.evaluatePage();
     return this;
@@ -1713,6 +1715,9 @@ const {
 const forms = new Map(); // Accepts the DeviceInterface as an explicit dependency
 
 const scanForInputs = DeviceInterface => {
+  // Avoid autofill on our signup page
+  if (window.location.href.match(/^https:\/\/.+\.duckduckgo\.com\/email\/choose-address/i)) return;
+
   const getParentForm = input => {
     if (input.form) return input.form;
     let element = input; // traverse the DOM to search for related inputs

diff --git a/src/DeviceInterface.js b/src/DeviceInterface.js
@@ -110,6 +110,8 @@ class ExtensionInterface extends InterfacePrototype {
     constructor () {
         super()
 
+        this.isDeviceSignedIn = () => this.hasLocalAddresses
+
         this.setupAutofill = ({shouldLog} = {shouldLog: false}) => {
             this.getAddresses().then(addresses => {
                 if (this.hasLocalAddresses) {
@@ -194,19 +196,15 @@ class AndroidInterface extends InterfacePrototype {
             window.EmailInterface.showTooltip(), 'getAliasResponse')
             .then(({alias}) => alias)
 
-        this.isDeviceSignedIn = () => new Promise(resolve => {
-            resolve(window.EmailInterface.isSignedIn() === 'true')
-        })
+        this.isDeviceSignedIn = () => window.EmailInterface.isSignedIn() === 'true'
 
         this.setupAutofill = ({shouldLog} = {shouldLog: false}) => {
-            this.isDeviceSignedIn().then((signedIn) => {
-                if (signedIn) {
-                    notifyWebApp({ deviceSignedIn: {value: true, shouldLog} })
-                    scanForInputs(this)
-                } else {
-                    this.trySigningIn()
-                }
-            })
+            if (this.isDeviceSignedIn()) {
+                notifyWebApp({ deviceSignedIn: {value: true, shouldLog} })
+                scanForInputs(this)
+            } else {
+                this.trySigningIn()
+            }
         }
 
         this.storeUserData = ({addUserData: {token, userName}}) =>
@@ -227,9 +225,11 @@ class AppleDeviceInterface extends InterfacePrototype {
                 await this.getAccounts()
             }
 
-            const signedIn = await this.isDeviceSignedIn()
+            const signedIn = await this._checkDeviceSignedIn()
             if (signedIn) {
-                await this.getAddresses()
+                if (isApp) {
+                    await this.getAddresses()
+                }
                 notifyWebApp({ deviceSignedIn: {value: true, shouldLog} })
                 forms.forEach(form => form.redecorateAllInputs())
             } else {
@@ -260,8 +260,9 @@ class AppleDeviceInterface extends InterfacePrototype {
 
         this.refreshAlias = () => wkSend('emailHandlerRefreshAlias')
 
-        this.isDeviceSignedIn = async () => {
+        this._checkDeviceSignedIn = async () => {
             const {isAppSignedIn} = await wkSendAndWait('emailHandlerCheckAppSignedInStatus')
+            this.isDeviceSignedIn = () => !!isAppSignedIn
             return !!isAppSignedIn
         }
 

diff --git a/src/Form/Form.js b/src/Form/Form.js
@@ -181,7 +181,7 @@ class Form {
         if (this.isLogin) {
             if (this.Device.hasLocalCredentials) this.decorateInput(input)
         } else {
-            if (this.Device.hasLocalAddresses && !input.matches(PASSWORD_SELECTOR)) {
+            if (this.Device.isDeviceSignedIn() && !input.matches(PASSWORD_SELECTOR)) {
                 this.decorateInput(input)
             }
         }

diff --git a/src/Form/FormAnalyzer.js b/src/Form/FormAnalyzer.js
@@ -6,9 +6,6 @@ class FormAnalyzer {
         this.autofillSignal = 0
         this.signals = []
 
-        // Avoid autofill on our signup page
-        if (window.location.href.match(/^https:\/\/.+\.duckduckgo\.com\/email\/signup/i)) return this
-
         this.evaluateElAttributes(input, 3, true)
         form ? this.evaluateForm() : this.evaluatePage()
         return this

diff --git a/src/scanForInputs.js b/src/scanForInputs.js
@@ -6,6 +6,9 @@ const forms = new Map()
 
 // Accepts the DeviceInterface as an explicit dependency
 const scanForInputs = (DeviceInterface) => {
+    // Avoid autofill on our signup page
+    if (window.location.href.match(/^https:\/\/.+\.duckduckgo\.com\/email\/choose-address/i)) return
+
     const getParentForm = (input) => {
         if (input.form) return input.form