Release build 4.64.0 [ci release]

Author: jonathanKingston

Sources/ContentScopeScripts/dist/contentScope.js

@@ -11,6 +11,7 @@ import { matchAddressFromAddressListCityState } from '../comparisons/address.js'
  */
 
 /**
+ * @typedef {'param'|'path'} IdentifierType
  * @typedef {Object} ExtractProfileProperty
  * For example: {
  *   "selector": ".//div[@class='col-sm-24 col-md-8 relatives']//li"
@@ -20,6 +21,8 @@ import { matchAddressFromAddressListCityState } from '../comparisons/address.js'
  * @property {string} [afterText] - get all text after this string
  * @property {string} [beforeText] - get all text before this string
  * @property {string} [separator] - split the text on this string
+ * @property {IdentifierType} [identifierType] - the type (path/param) of the identifier
+ * @property {string} [identifier] - the identifier itself (either a param name, or a templated URI)
  */
 
 /**
@@ -191,7 +194,7 @@ export function aggregateFields (profile) {
         addresses,
         phoneNumbers,
         relatives: profile.relativesList,
-        profileUrl: profile.profileUrl
+        ...profile.profileUrl
     }
 }
 
@@ -239,7 +242,21 @@ function extractValue (key, value, elementValue) {
             return stringToList(phoneNumber)
         },
         phoneList: () => stringToList(elementValue, value.separator),
-        relativesList: () => stringToList(elementValue, value.separator)
+        relativesList: () => stringToList(elementValue, value.separator),
+        profileUrl: () => {
+            const profile = {
+                profileUrl: elementValue,
+                identifier: elementValue
+            }
+
+            if (!value.identifierType || !value.identifier) {
+                return profile
+            }
+
+            const profileUrl = Array.isArray(elementValue) ? elementValue[0] : elementValue
+            profile.identifier = getIdFromProfileUrl(profileUrl, value.identifierType, value.identifier)
+            return profile
+        }
     }
 
     if (key in extractors) {
@@ -302,3 +319,23 @@ const rules = {
         return link?.href ?? null
     }
 }
+
+/**
+ * Parse a profile id from a profile URL
+ * @param {string} profileUrl
+ * @param {IdentifierType} identifierType
+ * @param {string} identifier
+ * @return {string}
+ */
+export function getIdFromProfileUrl (profileUrl, identifierType, identifier) {
+    const parsedUrl = new URL(profileUrl)
+    const urlParams = parsedUrl.searchParams
+
+    // Attempt to parse out an id from the search parameters
+    if (identifierType === 'param' && urlParams.has(identifier)) {
+        const profileId = urlParams.get(identifier)
+        return profileId || profileUrl
+    }
+
+    return profileUrl
+}

Sources/ContentScopeScripts/dist/contentScopeIsolated.js

@@ -1,7 +1,7 @@
 import fc from 'fast-check'
 import { isSameAge } from '../src/features/broker-protection/comparisons/is-same-age.js'
 import { getNicknames, isSameName } from '../src/features/broker-protection/comparisons/is-same-name.js'
-import { getCityStateCombos, stringToList } from '../src/features/broker-protection/actions/extract.js'
+import { getCityStateCombos, stringToList, getIdFromProfileUrl } from '../src/features/broker-protection/actions/extract.js'
 import {
     matchAddressCityState,
     matchAddressFromAddressListCityState
@@ -211,6 +211,43 @@ describe('Actions', () => {
                 })
             })
         })
+
+        describe('getIdFromProfileUrl', () => {
+            it('should return the profile URL as the identifier if the identifierType is "path"', () => {
+                const profileUrl = 'https://duckduckgo.com/my/profile/john-smith/223'
+                const identifierType = 'path'
+                // eslint-disable-next-line no-template-curly-in-string
+                const identifier = 'https://duckduckgo.com/my/profile/${firstName}-${lastName}/${id}'
+
+                expect(getIdFromProfileUrl(profileUrl, identifierType, identifier)).toEqual(profileUrl)
+            })
+
+            it('should return the profile URL as the identifier if the identifierType is "param" and the param is not found', () => {
+                const profileUrl = 'https://duckduckgo.com/my/profile?id=test'
+                const identifierType = 'param'
+                const identifier = 'pid'
+
+                expect(getIdFromProfileUrl(profileUrl, identifierType, identifier)).toEqual(profileUrl)
+            })
+
+            it('should return the profile URL as the identifier if the identifierType is "param" and the identifier is a path', () => {
+                const profileUrl = 'https://duckduckgo.com/my/profile/john-smith/223'
+                const identifierType = 'param'
+                // eslint-disable-next-line no-template-curly-in-string
+                const identifier = 'https://duckduckgo.com/my/profile/${firstName}-${lastName}/${id}'
+
+                expect(getIdFromProfileUrl(profileUrl, identifierType, identifier)).toEqual(profileUrl)
+            })
+
+            it('should return the id as the identifier if the identifierType is "param" and the param is found in the url', () => {
+                const id = 'test'
+                const profileUrl = `https://duckduckgo.com/my/profile?id=${id}`
+                const identifierType = 'param'
+                const identifier = 'id'
+
+                expect(getIdFromProfileUrl(profileUrl, identifierType, identifier)).toEqual(id)
+            })
+        })
     })
 
     describe('buildUrl', () => {