Revert "[Fraud] Get Fingerprinted Visitor ID (#93952)" (#94346)

This reverts commit 1e83dc8.
Automattic · Sep 9, 2024 · 5461f53 · 5461f53
1 parent 910c4da
commit 5461f53
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 65 deletions.
diff --git a/client/lib/wp/browser.js b/client/lib/wp/browser.js
@@ -5,7 +5,6 @@ import wpcomProxyRequest from 'wpcom-proxy-request';
 import * as oauthToken from 'calypso/lib/oauth-token';
 import wpcomSupport from 'calypso/lib/wp/support';
 import wpcomXhrWrapper, { jetpack_site_xhr_wrapper } from 'calypso/lib/wpcom-xhr-wrapper';
-import { injectFingerprint } from './handlers/fingerprint';
 import { injectGuestSandboxTicketHandler } from './handlers/guest-sandbox-ticket';
 import { injectLocalization } from './localization';
 
@@ -48,8 +47,6 @@ injectLocalization( wpcom );
 
 injectGuestSandboxTicketHandler( wpcom );
 
-injectFingerprint( wpcom );
-
 /**
  * Expose `wpcom`
  */

diff --git a/client/lib/wp/handlers/fingerprint.js b/client/lib/wp/handlers/fingerprint.js
diff --git a/client/package.json b/client/package.json
@@ -39,7 +39,6 @@
 		"@automattic/domains-table": "workspace:^",
 		"@automattic/explat-client": "workspace:^",
 		"@automattic/explat-client-react-helpers": "workspace:^",
-		"@automattic/fingerprintjs": "workspace:^",
 		"@automattic/format-currency": "workspace:^",
 		"@automattic/generate-password": "workspace:^",
 		"@automattic/global-styles": "workspace:^",

diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -306,9 +306,6 @@ const webpackConfig = {
 				!! process.env.FORCE_REDUCED_MOTION || false
 			),
 			__i18n_text_domain__: JSON.stringify( 'default' ),
-			fingerprintJsVersion: JSON.stringify(
-				require( '../packages/fingerprintjs/package.json' ).version
-			),
 			global: 'window',
 		} ),
 		// Node polyfills

diff --git a/packages/fingerprintjs/package.json b/packages/fingerprintjs/package.json
@@ -25,7 +25,6 @@
 		"url": "https://github.com/fingerprintjs/fingerprintjs/issues"
 	},
 	"homepage": "https://github.com/fingerprintjs/fingerprintjs",
-	"calypso:src": "src/index.ts",
 	"main": "dist/fp.cjs.js",
 	"module": "dist/fp.esm.js",
 	"types": "dist/fp.d.ts",

diff --git a/packages/fingerprintjs/src/agent.test.ts b/packages/fingerprintjs/src/agent.test.ts
@@ -1,3 +1,4 @@
+import { version } from '../package.json';
 import { withMockProperties } from '../tests/utils';
 import { load as loadAgent } from './agent';
 import { sources } from './sources';
@@ -12,7 +13,7 @@ describe( 'Agent', () => {
 		expect( result.visitorId ).not.toEqual( '' );
 		expect( typeof result.confidence.score ).toBe( 'number' );
 		expect( typeof result.confidence.comment ).toBe( 'string' );
-		expect( result.version ).toBe( window.fingerprintJsVersion );
+		expect( result.version ).toBe( version );
 
 		const expectedComponents = Object.keys( sources ).sort() as Array< keyof typeof sources >;
 		expect( expectedComponents.length ).toBeGreaterThan( 10 ); // To check the test itself

diff --git a/packages/fingerprintjs/src/agent.ts b/packages/fingerprintjs/src/agent.ts
@@ -1,3 +1,4 @@
+import { version } from '../package.json';
 import { requestIdleCallbackIfAvailable } from './utils/async';
 import { UnknownComponents } from './utils/entropy_source';
 import { x64hash128 } from './utils/hashing';
@@ -127,7 +128,7 @@ function makeLazyGetResult( components: BuiltinComponents ): GetResult {
 		},
 		confidence,
 		components,
-		version: window.fingerprintJsVersion,
+		version,
 	};
 }
 
@@ -189,7 +190,7 @@ function monitor() {
 		const request = new XMLHttpRequest();
 		request.open(
 			'get',
-			`https://m1.openfpcdn.io/fingerprintjs/v${ window.fingerprintJsVersion }/npm-monitoring`,
+			`https://m1.openfpcdn.io/fingerprintjs/v${ version }/npm-monitoring`,
 			true
 		);
 		request.send();

diff --git a/packages/fingerprintjs/src/global.d.ts b/packages/fingerprintjs/src/global.d.ts
@@ -4,7 +4,6 @@ interface Window {
 	webkitOfflineAudioContext?: OfflineAudioContext;
 	openDatabase?( ...args: unknown[] ): void;
 	__fpjs_d_m?: unknown;
-	fingerprintJsVersion: string;
 }
 
 interface Navigator {

diff --git a/packages/fingerprintjs/src/index.ts b/packages/fingerprintjs/src/index.ts
@@ -1,23 +1,31 @@
-import { load, hashComponents, componentsToDebugString } from './agent';
+import {
+	load,
+	Agent,
+	LoadOptions,
+	GetOptions,
+	GetResult,
+	hashComponents,
+	componentsToDebugString,
+} from './agent';
+import { BuiltinComponents } from './sources';
+import { Confidence } from './confidence';
+import { Component, UnknownComponents } from './utils/entropy_source';
 import { x64hash128 } from './utils/hashing';
-import type { Agent, GetOptions, GetResult, LoadOptions } from './agent';
-import type { BuiltinComponents } from './sources';
-import type { Component, UnknownComponents } from './utils/entropy_source';
-import type { Confidence } from './confidence';
 
 // Exports that are under Semantic versioning
-export { load, hashComponents, componentsToDebugString };
-export type {
+export {
+	load,
 	Agent,
-	BuiltinComponents,
-	Component,
-	Confidence,
+	LoadOptions,
 	GetOptions,
 	GetResult,
-	LoadOptions,
+	hashComponents,
+	componentsToDebugString,
+	Component,
 	UnknownComponents,
+	BuiltinComponents,
+	Confidence,
 };
-
 // The default export is a syntax sugar (`import * as FP from '...' → import FP from '...'`).
 // It should contain all the public exported values.
 export default { load, hashComponents, componentsToDebugString };
@@ -40,7 +48,9 @@ export {
 } from './utils/browser';
 export {
 	loadSources,
+	Source,
+	SourcesToComponents,
 	transformSource, // Not used here but adds only 222 uncompressed (60 compressed) bytes of code
+	UnknownSources,
 } from './utils/entropy_source';
-export type { Source, SourcesToComponents, UnknownSources } from './utils/entropy_source';
 export { withIframe } from './utils/dom';
diff --git a/packages/fingerprintjs/tsconfig.json b/packages/fingerprintjs/tsconfig.json
@@ -9,14 +9,11 @@
 		"importHelpers": true,
 		"noErrorTruncation": true,
 		"strict": true,
-		"composite": false,
 		"noUnusedLocals": true,
 		"noUnusedParameters": true,
 		"noImplicitReturns": true,
 		"isolatedModules": false,
-		"types": [ "node", "jasmine" ],
-		"typeRoots": [ "../../node_modules/@types", "node_modules/@types/jasmine" ],
-		"sourceMap": false,
+		"types": [ "jasmine" ],
 		"declarationDir": "dist/types",
 		"outDir": "dist/esm",
 		"rootDir": "."

diff --git a/yarn.lock b/yarn.lock
@@ -1020,7 +1020,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@automattic/fingerprintjs@workspace:^, @automattic/fingerprintjs@workspace:packages/fingerprintjs":
+"@automattic/fingerprintjs@workspace:packages/fingerprintjs":
   version: 0.0.0-use.local
   resolution: "@automattic/fingerprintjs@workspace:packages/fingerprintjs"
   dependencies:
@@ -12685,7 +12685,6 @@ __metadata:
     "@automattic/domains-table": "workspace:^"
     "@automattic/explat-client": "workspace:^"
     "@automattic/explat-client-react-helpers": "workspace:^"
-    "@automattic/fingerprintjs": "workspace:^"
     "@automattic/format-currency": "workspace:^"
     "@automattic/generate-password": "workspace:^"
     "@automattic/global-styles": "workspace:^"