fix: lint & code fix & delete crypto from runtime edge

Solvro · Dec 7, 2024 · d696106 · d696106
1 parent 1950db3
commit d696106
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -46,6 +46,7 @@ jobs:
         env:
           USOS_CONSUMER_KEY: hello
           USOS_CONSUMER_SECRET: jello
+          NEXT_PUBLIC_API_URL: http://localhost:3333
         if: always()
 
       - name: Find deadcode

diff --git a/frontend/knip.ts b/frontend/knip.ts
@@ -9,7 +9,7 @@ const config = {
     "lint-staged.config.mjs",
   ],
   // sharp is used in nextjs image optimization
-  ignoreDependencies: ["sharp", "@radix-ui/*", "eslint-config-next"],
+  ignoreDependencies: ["sharp", "@radix-ui/*"],
 } satisfies KnipConfig;
 
 export default config;
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -31,6 +31,7 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
+    "crypto-js": "^4.2.0",
     "date-fns": "^4.1.0",
     "fetch-cookie": "^3.0.1",
     "framer-motion": "^11.3.28",
@@ -56,6 +57,7 @@
     "@alergeek-ventures/eslint-config": "^9.0.17",
     "@next/eslint-plugin-next": "^14.2.7",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/crypto-js": "^4.2.2",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",

diff --git a/frontend/src/lib/auth/example.ts b/frontend/src/lib/auth/example.ts
diff --git a/frontend/src/lib/auth/index.ts b/frontend/src/lib/auth/index.ts
@@ -1,14 +1,19 @@
-import crypto from "crypto";
+import CryptoJS, { HmacSHA1 } from "crypto-js";
 import { cookies as cookiesPromise } from "next/headers";
 import OAuth from "oauth-1.0a";
 
 import { env } from "@/env.mjs";
 
+function createHmacSha1Base64(base_string: string, key: string) {
+  const hmac: CryptoJS.lib.WordArray = HmacSHA1(base_string, key);
+  return CryptoJS.enc.Base64.stringify(hmac);
+}
+
 export const oauth = new OAuth({
   consumer: { key: env.USOS_CONSUMER_KEY, secret: env.USOS_CONSUMER_SECRET },
   signature_method: "HMAC-SHA1",
   hash_function(base_string, key) {
-    return crypto.createHmac("sha1", key).update(base_string).digest("base64");
+    return createHmacSha1Base64(base_string, key);
   },
 });