ASUB-8899 Match password sign up (#2268)

* match password sign up * solving issue reported on ACS-32025
WPMedia · Nov 8, 2024 · 735d2ed · 735d2ed
1 parent 7bf9d27
commit 735d2ed
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/blocks/identity-block/components/form-password-confirm/index.jsx b/blocks/identity-block/components/form-password-confirm/index.jsx
@@ -19,6 +19,12 @@ const FormPasswordConfirm = ({
 }) => {
 	const [password, setPassword] = useState("");
 
+	const escapeForHtmlPattern = (value) =>{
+		const specialChars = /[.*+?^${}()|[\]\\]/g;
+		const newValue = value.replace(specialChars, '\\$&');
+		return newValue;
+	};
+
 	const fieldParameters = {
 		...(autoComplete ? { autoComplete } : {}),
 		...(placeholder ? { placeholder } : {}),
@@ -55,7 +61,7 @@ const FormPasswordConfirm = ({
 				name={`${name}-confirmation`}
 				required
 				type="password"
-				validationPattern={`^${password}$`}
+				validationPattern={escapeForHtmlPattern(password)}
 				className={className}
 			/>
 		</>

diff --git a/blocks/identity-block/components/social-sign-on/_children/AppleSignIn.jsx b/blocks/identity-block/components/social-sign-on/_children/AppleSignIn.jsx
@@ -9,7 +9,7 @@ function AppleSignIn({ customButtons, socialSignOnIn, className, oidcClients = [
 	const phrases = usePhrases();
 	const { Identity } = useIdentity();
 
-	const appleOIDCClient = oidcClients.find((oidcClient) => {
+	const appleOIDCClient = oidcClients && oidcClients.find((oidcClient) => {
 		const parsedClientId = oidcClient.clientId.split(';')[0];
 
 		return oidcClient.protocol === 'Apple' && parsedClientId === appleClientId;

diff --git a/blocks/identity-block/utils/validate-password-pattern.js b/blocks/identity-block/utils/validate-password-pattern.js
@@ -1,4 +1,9 @@
-const SPECIAL_CHARACTERS_ALLOWED = "@$!%*?&";
+const SPECIAL_CHARACTERS_ALLOWED =
+	".@$!%*+?&#<=>^:;,-" + 
+	"\\/\\(\\)\\{\\}\\[\\]\\|\\`\\\\" + 
+	"~_" + 
+	'"' + 
+	"'";
 
 // positive lookahead (?= )
 // with a non-capturing group within (?: )
@@ -12,7 +17,7 @@ const validatePasswordPattern = (
 	pwMinLength,
 	pwPwNumbers,
 	pwSpecialCharacters,
-	pwUppercase
+	pwUppercase,
 ) =>
 	`(?=(?:.*[a-z]){${pwLowercase},})(?=(?:.*[A-Z]){${pwUppercase},})(?=(?:.*\\d){${pwPwNumbers},})(?=(?:.*[${SPECIAL_CHARACTERS_ALLOWED}]){${pwSpecialCharacters},}).{${pwMinLength},}`;
 

diff --git a/blocks/identity-block/utils/validate-password-pattern.test.js b/blocks/identity-block/utils/validate-password-pattern.test.js
@@ -111,8 +111,9 @@ describe("Validate Password", () => {
 	it("Takes matching special characters", () => {
 		const pattern = new RegExp(validatePasswordPattern(0, 1, 0, 7, 0));
 
-		expect(pattern.test("@$!%*?&")).toBe(true);
-		expect(pattern.test("---------")).toBe(false);
-		expect(pattern.test("^^^^^^^^^^^^^^^^^^^^^^^")).toBe(false);
+		expect(pattern.test("@$!%*?&")).toBe(true); 
+		expect(pattern.test("---")).toBe(false);
+		expect(pattern.test("---------")).toBe(true);
+		expect(pattern.test("^^^^^^^^^^^^^^^^^^^^^^^")).toBe(true);
 	});
 });