@streamplace/atproto-oauth-client-react-native 0.7.6 → 0.7.25

package/dist/oauth-client-react-native.native.js

@@ -1,4 +1,3 @@
-import { jwkValidator } from "@atproto/jwk";
 import { JoseKey } from "@atproto/jwk-jose";
 import { OAuthClient, } from "@atproto/oauth-client";
 import QuickCrypto from "react-native-quick-crypto";
@@ -26,7 +25,6 @@ export class ReactNativeOAuthClient extends OAuthClient {
             responseMode,
             runtimeImplementation: {
                 createKey: async (algs) => {
-                    console.log("GOT HEREEEE!");
                     const errors = [];
                     for (const alg of algs) {
                         try {
@@ -49,13 +47,25 @@ export class ReactNativeOAuthClient extends OAuthClient {
                                 .update(JSON.stringify(ex))
                                 .digest("hex");
                             const use = "sig";
-                            return new JoseKey(jwkValidator.parse({ ...ex, kid, use }));
+                            const newKey = {
+                                ...ex,
+                                kid,
+                                use,
+                            };
+                            let joseKey = null;
+                            try {
+                                joseKey = new JoseKey(newKey);
+                            }
+                            catch (err) {
+                                throw new Error(`error creating jose key: ${err}`);
+                            }
+                            return joseKey;
                         }
                         catch (err) {
                             errors.push(err);
                         }
                     }
-                    throw new Error("None of the algorithms worked");
+                    throw new Error(`None of the algorithms worked: ${errors.join(", ")}`);
                 },
                 getRandomValues: (length) => new Uint8Array(QuickCrypto.randomBytes(length)),
                 digest: (bytes, algorithm) => QuickCrypto.createHash(algorithm.name)

package/dist/sqlite-keystore.js

@@ -1,4 +1,3 @@
-import { jwkValidator } from "@atproto/jwk";
 import { JoseKey } from "@atproto/jwk-jose";
 import Storage from "expo-sqlite/kv-store";
 const NAMESPACE = `@@atproto/oauth-client-react-native`;
@@ -17,7 +16,7 @@ export class JoseKeyStore {
             return undefined;
         const item = JSON.parse(itemStr);
         if (item.dpopKey) {
-            item.dpopKey = new JoseKey(jwkValidator.parse(item.dpopKey));
+            item.dpopKey = new JoseKey(item.dpopKey);
         }
         return item;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamplace/atproto-oauth-client-react-native",
-  "version": "0.7.6",
+  "version": "0.7.25",
   "license": "MIT",
   "description": "ATProto OAuth client for React Native",
   "keywords": [
@@ -29,17 +29,17 @@
     "src"
   ],
   "dependencies": {
-    "@atproto-labs/did-resolver": "0.1.12",
-    "@atproto-labs/handle-resolver-node": "0.1.15",
-    "@atproto-labs/simple-store": "0.2.0",
-    "@atproto-labs/simple-store-memory": "0.1.3",
-    "@atproto/did": "0.1.5",
-    "@atproto/jwk": "0.1.5",
-    "@atproto/jwk-jose": "0.1.6",
-    "@atproto/jwk-webcrypto": "0.1.6",
-    "@atproto/oauth-client": "0.3.16",
-    "@atproto/oauth-client-browser": "0.3.16",
-    "@atproto/oauth-types": "0.2.7",
+    "@atproto-labs/did-resolver": "0.2.1",
+    "@atproto-labs/handle-resolver-node": "0.1.19",
+    "@atproto-labs/simple-store": "0.3.0",
+    "@atproto-labs/simple-store-memory": "0.1.4",
+    "@atproto/did": "0.2.0",
+    "@atproto/jwk": "0.5.0",
+    "@atproto/jwk-jose": "0.1.10",
+    "@atproto/jwk-webcrypto": "0.1.10",
+    "@atproto/oauth-client": "0.5.5",
+    "@atproto/oauth-client-browser": "0.3.31",
+    "@atproto/oauth-types": "0.4.1",
     "abortcontroller-polyfill": "^1.7.6",
     "event-target-shim": "^6.0.2",
     "expo-sqlite": "^15.0.3",
@@ -54,5 +54,5 @@
     "build": "tsc --build tsconfig.build.json",
     "prepare": "pnpm run build"
   },
-  "gitHead": "8c2cad31c840efeda8aa7f797f91dddbedb95397"
+  "gitHead": "288afabcb270c01ae8012e2a5cd9d75d5e1aae28"
 }

package/src/oauth-client-react-native.native.ts

@@ -1,8 +1,8 @@
 import { SimpleStore } from "@atproto-labs/simple-store";
-import { jwkValidator } from "@atproto/jwk";
 import { JoseKey } from "@atproto/jwk-jose";
 import {
   InternalStateData,
+  Jwk,
   OAuthClient,
   OAuthClientFetchMetadataOptions,
   OAuthClientOptions,
@@ -74,7 +74,6 @@ export class ReactNativeOAuthClient extends OAuthClient {
       responseMode,
       runtimeImplementation: {
         createKey: async (algs): Promise<JoseKey> => {
-          console.log("GOT HEREEEE!");
           const errors: unknown[] = [];
           for (const alg of algs) {
             try {
@@ -103,12 +102,27 @@ export class ReactNativeOAuthClient extends OAuthClient {
                 .digest("hex");
               const use = "sig";
 
-              return new JoseKey(jwkValidator.parse({ ...ex, kid, use }));
+              const newKey = {
+                ...ex,
+                kid,
+                use,
+              };
+
+              let joseKey: JoseKey | null = null;
+              try {
+                joseKey = new JoseKey(newKey as Jwk);
+              } catch (err) {
+                throw new Error(`error creating jose key: ${err}`);
+              }
+
+              return joseKey;
             } catch (err) {
               errors.push(err);
             }
           }
-          throw new Error("None of the algorithms worked");
+          throw new Error(
+            `None of the algorithms worked: ${errors.join(", ")}`,
+          );
         },
         getRandomValues: (length) =>
           new Uint8Array(QuickCrypto.randomBytes(length)),

package/src/sqlite-keystore.ts

@@ -1,5 +1,5 @@
 import { SimpleStore } from "@atproto-labs/simple-store";
-import { jwkValidator, Key } from "@atproto/jwk";
+import { Jwk, Key } from "@atproto/jwk";
 import { JoseKey } from "@atproto/jwk-jose";
 import Storage from "expo-sqlite/kv-store";
 
@@ -25,7 +25,7 @@ export class JoseKeyStore<T extends HasDPoPKey> {
     if (!itemStr) return undefined;
     const item = JSON.parse(itemStr) as T;
     if (item.dpopKey) {
-      item.dpopKey = new JoseKey(jwkValidator.parse(item.dpopKey));
+      item.dpopKey = new JoseKey(item.dpopKey as unknown as Jwk);
     }
     return item;
   }