Update content scope scripts to version 11.31.0 (#6858)

Task/Issue URL:
https://app.asana.com/0/488551667048375/1211493773997168/f

 ----- 
- Automated content scope scripts dependency update

This PR updates the content scope scripts dependency to the latest
available version and copies the necessary files.

Tests will only run if something has changed in the
`node_modules/@duckduckgo/content-scope-scripts` folder.

If only the package version has changed, there is no need to run the
tests.

If tests have failed, see
https://app.asana.com/0/1202561462274611/1203986899650836/f for further
information on what to do next.

_`content-scope-scripts` folder update_
- [ ] All tests must pass
- [ ] Privacy tests must pass

_Only `content-scope-scripts` package update_
- [ ] All tests must pass
- [ ] Privacy tests do not need to run

---------

Co-authored-by: daxmobile <[email protected]>
Co-authored-by: Craig Russell <[email protected]>

Author: daxmobile

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/gpm/webflow/PasswordImporterCssScriptLoader.kt

@@ -20,9 +20,9 @@ import com.duckduckgo.autofill.impl.importing.gpm.feature.AutofillImportPassword
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.FragmentScope
 import com.squareup.anvil.annotations.ContributesBinding
+import kotlinx.coroutines.withContext
 import java.io.BufferedReader
 import javax.inject.Inject
-import kotlinx.coroutines.withContext
 
 interface PasswordImporterScriptLoader {
     suspend fun getScript(): String
@@ -33,43 +33,38 @@ class PasswordImporterCssScriptLoader @Inject constructor(
     private val dispatchers: DispatcherProvider,
     private val configStore: AutofillImportPasswordConfigStore,
 ) : PasswordImporterScriptLoader {
-
     private lateinit var contentScopeJS: String
 
-    override suspend fun getScript(): String {
-        return withContext(dispatchers.io()) {
+    override suspend fun getScript(): String =
+        withContext(dispatchers.io()) {
             getContentScopeJS()
                 .replace(CONTENT_SCOPE_PLACEHOLDER, getContentScopeJson(loadSettingsJson()))
                 .replace(USER_UNPROTECTED_DOMAINS_PLACEHOLDER, getUnprotectedDomainsJson())
                 .replace(USER_PREFERENCES_PLACEHOLDER, getUserPreferencesJson())
         }
-    }
 
     /**
      * This enables the password import hints feature in C-S-S.
      * These settings are for enabling it; the check for whether it should be enabled or not is done elsewhere.
      */
-    private fun getContentScopeJson(settingsJson: String): String {
-        return """{
+    private fun getContentScopeJson(settingsJson: String): String =
+        """{
             "features":{
-                "autofillPasswordImport" : {
+                "autofillImport" : {
                     "state": "enabled",
                     "exceptions": [],
                     "settings": $settingsJson
                 }
             },
             "unprotectedTemporary":[]
         }
-            
+
         """.trimMargin()
-    }
 
-    private suspend fun loadSettingsJson(): String {
-        return configStore.getConfig().javascriptConfigGooglePasswords
-    }
+    private suspend fun loadSettingsJson(): String = configStore.getConfig().javascriptConfigGooglePasswords
 
-    private fun getUserPreferencesJson(): String {
-        return """
+    private fun getUserPreferencesJson(): String =
+        """
             {
                 "platform":{
                     "name":"android"
@@ -78,13 +73,12 @@ class PasswordImporterCssScriptLoader @Inject constructor(
                 "javascriptInterface": ''
              }
         """.trimMargin()
-    }
 
     private fun getUnprotectedDomainsJson(): String = "[]"
 
     private fun getContentScopeJS(): String {
         if (!this::contentScopeJS.isInitialized) {
-            contentScopeJS = loadJs("autofillPasswordImport.js")
+            contentScopeJS = loadJs("autofillImport.js")
         }
         return contentScopeJS
     }
@@ -97,7 +91,9 @@ class PasswordImporterCssScriptLoader @Inject constructor(
 
     private fun loadJs(resourceName: String): String = readResource(resourceName).use { it?.readText() }.orEmpty()
 
-    private fun readResource(resourceName: String): BufferedReader? {
-        return javaClass.classLoader?.getResource(resourceName)?.openStream()?.bufferedReader()
-    }
+    private fun readResource(resourceName: String): BufferedReader? =
+        javaClass.classLoader
+            ?.getResource(resourceName)
+            ?.openStream()
+            ?.bufferedReader()
 }

node_modules/@duckduckgo/content-scope-scripts/build/android/adsjsContentScope.js

@@ -15,7 +15,7 @@
   "dependencies": {
     "@duckduckgo/autoconsent": "^14.19.0",
     "@duckduckgo/autofill": "github:duckduckgo/duckduckgo-autofill#18.3.1",
-    "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#11.30.0",
+    "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#11.31.0",
     "@duckduckgo/privacy-dashboard": "github:duckduckgo/privacy-dashboard#9.0.0",
     "@duckduckgo/privacy-reference-tests": "github:duckduckgo/privacy-reference-tests#1758095627"
   }