Follow RFC7636 to generate code verifier #282

#282
authgear · Apr 15, 2024 · fac9229 · fac9229
2 parents 587088e + fa6024d
commit fac9229
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/packages/authgear-capacitor/src/pkce.ts b/packages/authgear-capacitor/src/pkce.ts
@@ -3,17 +3,10 @@ import { _base64URLEncode } from "@authgear/core";
 
 import { randomBytes, sha256String } from "./plugin";
 
-function byteToHex(byte: number): string {
-  return ("0" + byte.toString(16)).substr(-2);
-}
-
 export async function generateCodeVerifier(): Promise<string> {
   const arr = await randomBytes(32);
-  let output = "";
-  for (let i = 0; i < arr.length; ++i) {
-    output += byteToHex(arr[i]);
-  }
-  return output;
+  const base64 = _base64URLEncode(new Uint8Array(arr));
+  return base64;
 }
 
 export async function computeCodeChallenge(

diff --git a/packages/authgear-react-native/src/pkce.ts b/packages/authgear-react-native/src/pkce.ts
@@ -3,17 +3,10 @@ import { _base64URLEncode } from "@authgear/core";
 
 import { randomBytes, sha256String } from "./nativemodule";
 
-function byteToHex(byte: number): string {
-  return ("0" + byte.toString(16)).substr(-2);
-}
-
 export async function generateCodeVerifier(): Promise<string> {
   const arr = await randomBytes(32);
-  let output = "";
-  for (let i = 0; i < arr.length; ++i) {
-    output += byteToHex(arr[i]);
-  }
-  return output;
+  const base64 = _base64URLEncode(new Uint8Array(arr));
+  return base64;
 }
 
 export async function computeCodeChallenge(

diff --git a/packages/authgear-web/src/pkce.ts b/packages/authgear-web/src/pkce.ts
@@ -2,10 +2,6 @@
 
 import { _encodeUTF8, _base64URLEncode } from "@authgear/core";
 
-function byteToHex(byte: number): string {
-  return ("0" + byte.toString(16)).substr(-2);
-}
-
 // windowCryptoSubtleDigest is window.crypto.subtle.digest with IE 11 support.
 async function windowCryptoSubtleDigest(
   algorithm: string,
@@ -44,9 +40,6 @@ export async function computeCodeChallenge(
 export function generateCodeVerifier(): string {
   const arr = new Uint8Array(32);
   window.crypto.getRandomValues(arr);
-  let output = "";
-  for (let i = 0; i < arr.length; ++i) {
-    output += byteToHex(arr[i]);
-  }
-  return output;
+  const base64 = _base64URLEncode(arr);
+  return base64;
 }