fix: did at protocol regex - fix #150 (#151)

openhotel · Oct 27, 2024 · b556897 · b556897
1 parent 581811a
commit b556897
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/app/client/src/modules/account/components/bsky/bsky.component.tsx b/app/client/src/modules/account/components/bsky/bsky.component.tsx
@@ -1,6 +1,7 @@
 import React, { FormEvent, useCallback } from "react";
 import { Account } from "shared/types";
 import { useAccount } from "shared/hooks";
+import { PROTO_DID_REGEX } from "shared/consts";
 
 type Props = {
   account: Account;
@@ -15,8 +16,7 @@ export const BskyComponent: React.FC<Props> = ({ account }) => {
     const data = new FormData(event.target as unknown as HTMLFormElement);
     const did = data.get("did") as string;
 
-    console.log(did);
-    if (!did || did.length !== 24) return;
+    if (!did || !new RegExp(PROTO_DID_REGEX).test(did)) return;
 
     await at.create(did);
   }, []);
@@ -52,17 +52,16 @@ export const BskyComponent: React.FC<Props> = ({ account }) => {
         <br />
         <br />
         <div>
-          2. Copy the (did) red part only (24 letters/numbers) to the input{" "}
-          <br />
-          <label style={{ backgroundColor: "black" }}>did=did:plc:</label>
+          2. Copy the (did) red part only to the input <br />
+          <label style={{ backgroundColor: "black" }}>did=</label>
           <b
             style={{ backgroundColor: "rgba(206, 2, 2, 0.66)", color: "white" }}
           >
-            xxxxxxxxxxxxxxxxxxxxxxxx
+            did:plc:xxxxxxxxxxxxxxxxxxxxxxxx
           </b>
         </div>
         <br />
-        <input placeholder="bluesky account did" name="did" maxLength={24} />
+        <input placeholder="bluesky account did" name="did" />
         <br />
         <br />
         <button type="submit" style={{ cursor: "pointer" }}>

diff --git a/app/client/src/shared/consts/at.consts.ts b/app/client/src/shared/consts/at.consts.ts
@@ -0,0 +1 @@
+export const PROTO_DID_REGEX = /^did:[a-z]+:[a-zA-Z0-9._:%-]*[a-zA-Z0-9._-]$/;
diff --git a/app/client/src/shared/consts/index.ts b/app/client/src/shared/consts/index.ts
@@ -1,2 +1,3 @@
 export * from "./urls.consts";
 export * from "./captcha.consts";
+export * from "./at.consts";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const PROTO_DID_REGEX = /^did:[a-z]+:[a-zA-Z0-9._:%-]*[a-zA-Z0-9._-]$/;