resolver helper (#1867)

lolopinto · Dec 29, 2024 · 85a80c5 · 85a80c5 · Swahvay · Dec 31, 2024
1 parent c13154f
commit 85a80c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/ts/package-lock.json b/ts/package-lock.json
diff --git a/ts/src/graphql/node_resolver.test.ts b/ts/src/graphql/node_resolver.test.ts
@@ -144,11 +144,11 @@ class SearchResult {
 class SearchResultResolver implements NodeResolver {
   encode(result: SearchResult) {
     const str = `searchResult:${result.data.context}:${result.id}`;
-    return Buffer.from(str, "ascii").toString("base64");
+    return btoa(str);
   }
 
   async decodeObj(viewer: Viewer, id: string) {
-    const decoded = Buffer.from(id, "base64").toString("ascii");
+    const decoded = atob(id);
     let parts = decoded.split(":");
     if (parts.length != 3) {
       return null;

diff --git a/ts/src/graphql/node_resolver.ts b/ts/src/graphql/node_resolver.ts
@@ -15,17 +15,20 @@ interface loadEnt {
   (v: Viewer, nodeType: string, id: ID): Promise<Ent | null>;
 }
 
+function encodeHelper(nodeType: string, id: ID): string {
+  return btoa(`node:${nodeType}:${id}`);
+}
+
 export class EntNodeResolver implements NodeResolver {
   constructor(private loader: loadEnt) {}
 
   encode(node: Ent): string {
     // let's do 3 parts. we take the "node" prefix
-    const str = `node:${node.nodeType}:${node.id}`;
-    return Buffer.from(str, "ascii").toString("base64");
+    return encodeHelper(node.nodeType, node.id);
   }
 
   static decode(id: string): ID | null {
-    const decoded = Buffer.from(id, "base64").toString("ascii");
+    const decoded = atob(id);
     let parts = decoded.split(":");
     if (parts.length != 3) {
       return null;
@@ -34,7 +37,7 @@ export class EntNodeResolver implements NodeResolver {
   }
 
   mustDecode(id: string): [ID, string] {
-    const decoded = Buffer.from(id, "base64").toString("ascii");
+    const decoded = atob(id);
     let parts = decoded.split(":");
     if (parts.length != 3) {
       throw new Error(`invalid id ${id} passed to EntNodeResolver`);
@@ -43,7 +46,7 @@ export class EntNodeResolver implements NodeResolver {
   }
 
   async decodeObj(viewer: Viewer, id: string): Promise<Node | null> {
-    const decoded = Buffer.from(id, "base64").toString("ascii");
+    const decoded = atob(id);
     let parts = decoded.split(":");
     if (parts.length != 3 || parts[0] != "node") {
       return null;
@@ -117,6 +120,5 @@ export function mustDecodeNullableIDFromGQLID(
 // This takes an ent and returns the graphql id
 export function encodeGQLID(node: Ent): string {
   // let's do 3 parts. we take the "node" prefix
-  const str = `node:${node.nodeType}:${node.id}`;
-  return Buffer.from(str, "ascii").toString("base64");
+  return btoa(`node:${node.nodeType}:${node.id}`);
 }