fix: bail early on unsupported urls

duckduckgo · Oct 11, 2024 · 417b083 · 417b083
1 parent b1c9510
commit 417b083
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/build/integration/contentScope.js b/build/integration/contentScope.js
@@ -22068,8 +22068,14 @@
         #settingsButtonSettings = {}
         #signInButtonSettings = {}
 
+        SUPPORTED_PATHS = {
+            SIGNIN: '/intro',
+            EXPORT: '/options',
+            SETTINGS: '/'
+        }
+
         async getElementAndStyleFromPath (path) {
-            if (path === '/') {
+            if (path === this.SUPPORTED_PATHS.SETTINGS) {
                 return {
                     style: {
                         scale: 1,
@@ -22078,7 +22084,7 @@
                     element: await this.findSettingsElement(),
                     shouldTap: this.#settingsButtonSettings.autotap?.enabled ?? false
                 }
-            } else if (path === '/options') {
+            } else if (path === this.SUPPORTED_PATHS.EXPORT) {
                 return {
                     style: {
                         scale: 1.01,
@@ -22087,7 +22093,7 @@
                     element: await this.findExportElement(),
                     shouldTap: this.#exportButtonSettings.autotap?.enabled ?? false
                 }
-            } else if (path === '/intro') {
+            } else if (path === this.SUPPORTED_PATHS.SIGNIN) {
                 return {
                     style: {
                         scale: 1.5,
@@ -22142,10 +22148,15 @@
         }
 
         async handleElementForPath (path) {
-            const animateElement = this.animateElement.bind(this);
-            const { element, style, shouldTap } = await this.getElementAndStyleFromPath(path) ?? {};
-            if (element != null) {
-                shouldTap ? this.autotapElement(element) : animateElement(element, style);
+            // FIXME: This is a workaround, we need to check if the path is supported, otherwise
+            // for some reason google doesn't wait to proceed with the signin step.
+            // Not too sure why this is happening, there are no errors on the console.
+
+            if (Object.values(this.SUPPORTED_PATHS).includes(path)) {
+                const { element, style, shouldTap } = await this.getElementAndStyleFromPath(path) ?? {};
+                if (element != null) {
+                    shouldTap ? this.autotapElement(element) : this.animateElement(element, style);
+                }
             }
         }
 

diff --git a/src/features/password-import.js b/src/features/password-import.js
@@ -6,8 +6,14 @@ export default class PasswordImport extends ContentFeature {
     #settingsButtonSettings = {}
     #signInButtonSettings = {}
 
+    SUPPORTED_PATHS = {
+        SIGNIN: '/intro',
+        EXPORT: '/options',
+        SETTINGS: '/'
+    }
+
     async getElementAndStyleFromPath (path) {
-        if (path === '/') {
+        if (path === this.SUPPORTED_PATHS.SETTINGS) {
             return {
                 style: {
                     scale: 1,
@@ -16,7 +22,7 @@ export default class PasswordImport extends ContentFeature {
                 element: await this.findSettingsElement(),
                 shouldTap: this.#settingsButtonSettings.autotap?.enabled ?? false
             }
-        } else if (path === '/options') {
+        } else if (path === this.SUPPORTED_PATHS.EXPORT) {
             return {
                 style: {
                     scale: 1.01,
@@ -25,7 +31,7 @@ export default class PasswordImport extends ContentFeature {
                 element: await this.findExportElement(),
                 shouldTap: this.#exportButtonSettings.autotap?.enabled ?? false
             }
-        } else if (path === '/intro') {
+        } else if (path === this.SUPPORTED_PATHS.SIGNIN) {
             return {
                 style: {
                     scale: 1.5,
@@ -80,10 +86,15 @@ export default class PasswordImport extends ContentFeature {
     }
 
     async handleElementForPath (path) {
-        const animateElement = this.animateElement.bind(this)
-        const { element, style, shouldTap } = await this.getElementAndStyleFromPath(path) ?? {}
-        if (element != null) {
-            shouldTap ? this.autotapElement(element) : animateElement(element, style)
+        // FIXME: This is a workaround, we need to check if the path is supported, otherwise
+        // for some reason google doesn't wait to proceed with the signin step.
+        // Not too sure why this is happening, there are no errors on the console.
+
+        if (Object.values(this.SUPPORTED_PATHS).includes(path)) {
+            const { element, style, shouldTap } = await this.getElementAndStyleFromPath(path) ?? {}
+            if (element != null) {
+                shouldTap ? this.autotapElement(element) : this.animateElement(element, style)
+            }
         }
     }