refactor: upgrade oauth client

package.json

···
 		"@atcute/cbor": "^2.2.4",
 		"@atcute/cid": "^2.2.3",
 		"@atcute/client": "^4.0.3",
+		"@atcute/identity": "^1.1.0",
 		"@atcute/lexicons": "^1.1.0",
-		"@atcute/oauth-browser-client": "^1.0.26",
+		"@atcute/oauth-browser-client": "2.0.0-next.0",
 		"@atcute/tid": "^1.0.2",
 		"@atlaskit/pragmatic-drag-and-drop": "1.6.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "1.0.3",

pnpm-lock.yaml

···
       '@atcute/client':
         specifier: ^4.0.3
         version: 4.0.3
+      '@atcute/identity':
+        specifier: ^1.1.0
+        version: 1.1.0
       '@atcute/lexicons':
         specifier: ^1.1.0
         version: 1.1.0
       '@atcute/oauth-browser-client':
-        specifier: ^1.0.26
-        version: 1.0.26
+        specifier: 2.0.0-next.0
+        version: 2.0.0-next.0
       '@atcute/tid':
         specifier: ^1.0.2
         version: 1.0.2
···
   '@atcute/client@4.0.3':
     resolution: {integrity: sha512-RIOZWFVLca/HiPAAUDqQPOdOreCxTbL5cb+WUf5yqQOKIu5yEAP3eksinmlLmgIrlr5qVOE7brazUUzaskFCfw==}
 
-  '@atcute/identity@1.0.3':
-    resolution: {integrity: sha512-mNMxbKHFGys03A8JXKk0KfMBzdd0vrYMzZZWjpw1nYTs0+ea6bo5S1hwqVUZxHdo1gFHSe/t63jxQIF4yL9aKw==}
+  '@atcute/identity-resolver@1.1.3':
+    resolution: {integrity: sha512-KZgGgg99CWaV7Df3+h3X/WMrDzTPQVfsaoIVbTNLx2B56BvCL2EmaxPSVw/7BFUJMZHlVU4rtoEB4lyvNyMswA==}
+    peerDependencies:
+      '@atcute/identity': ^1.0.0
+
+  '@atcute/identity@1.1.0':
+    resolution: {integrity: sha512-6vRvRqJatDB+JUQsb+UswYmtBGQnSZcqC3a2y6H5DB/v5KcIh+6nFFtc17G0+3W9rxdk7k9M4KkgkdKf/YDNoQ==}
 
   '@atcute/lexicons@1.1.0':
     resolution: {integrity: sha512-LFqwnria78xLYb62Ri/+WwQpUTgZp2DuyolNGIIOV1dpiKhFFFh//nscHMA6IExFLQRqWDs3tTjy7zv0h3sf1Q==}
 
+  '@atcute/lexicons@1.1.1':
+    resolution: {integrity: sha512-k6qy5p3j9fJJ6ekaMPfEfp3ni4TW/XNuH9ZmsuwC0fi0tOjp+Fa8ZQakHwnqOzFt/cVBfGcmYE/lKNAbeTjgUg==}
+
   '@atcute/multibase@1.1.4':
     resolution: {integrity: sha512-NUf5AeeSOmuZHGU+4GAaMtISJoG+ZHtW/vUVA4lK/YDt/7LODAW0Fd0NNIIUPVUoW0xJS6zSEIWvwLLuxmEHhA==}
 
-  '@atcute/oauth-browser-client@1.0.26':
-    resolution: {integrity: sha512-z8VUmwRO1sFu5Dq1qYQOQLenkTSNaOyzlUZhVwFR41ru+AP84MS5UHHW/NsdC1xJAq1v6mlLySJ+pjxdDW8IYA==}
+  '@atcute/oauth-browser-client@2.0.0-next.0':
+    resolution: {integrity: sha512-BaVU0Mu5ACerdWdMok6kvwwAuPJunbQQk0C51zpxNLpT0P/SYnun+3xX7bcrbtDG1lXn+r+Qld88P+zonY1wPA==}
 
   '@atcute/tid@1.0.2':
     resolution: {integrity: sha512-ahmjroNyeDPJhtuf3+HTJropaH04HmJ8fhntDu73Gpz/RkAF7+nkz6kcP2QTgfvMCgMPAJUdskAAP82GPDTY9w==}
 
   '@atcute/uint8array@1.0.3':
     resolution: {integrity: sha512-M/K+ihiVW8Pl2PFLzaC4E3l4JaZ1IH05Q0AbPWUC4cVHnd/gZ/1kAF5ngdtGvJeDMirHZ2VAy7OmAsPwR/2nlA==}
+
+  '@atcute/util-fetch@1.0.1':
+    resolution: {integrity: sha512-Clc0E/5ufyGBVfYBUwWNlHONlZCoblSr4Ho50l1LhmRPGB1Wu/AQ9Sz+rsBg7fdaW/auve8ulmwhRhnX2cGRow==}
 
   '@atlaskit/pragmatic-drag-and-drop-hitbox@1.0.3':
     resolution: {integrity: sha512-/Sbu/HqN2VGLYBhnsG7SbRNg98XKkbF6L7XDdBi+izRybfaK1FeMfodPpm/xnBHPJzwYMdkE0qtLyv6afhgMUA==}
···
 
   '@atcute/client@4.0.3':
     dependencies:
-      '@atcute/identity': 1.0.3
+      '@atcute/identity': 1.1.0
       '@atcute/lexicons': 1.1.0
 
-  '@atcute/identity@1.0.3':
+  '@atcute/identity-resolver@1.1.3(@atcute/identity@1.1.0)':
     dependencies:
-      '@atcute/lexicons': 1.1.0
+      '@atcute/identity': 1.1.0
+      '@atcute/lexicons': 1.1.1
+      '@atcute/util-fetch': 1.0.1
+      '@badrap/valita': 0.4.5
+
+  '@atcute/identity@1.1.0':
+    dependencies:
+      '@atcute/lexicons': 1.1.1
       '@badrap/valita': 0.4.5
 
   '@atcute/lexicons@1.1.0':
     dependencies:
       esm-env: 1.2.2
 
+  '@atcute/lexicons@1.1.1':
+    dependencies:
+      esm-env: 1.2.2
+
   '@atcute/multibase@1.1.4':
     dependencies:
       '@atcute/uint8array': 1.0.3
 
-  '@atcute/oauth-browser-client@1.0.26':
+  '@atcute/oauth-browser-client@2.0.0-next.0':
     dependencies:
       '@atcute/client': 4.0.3
-      '@atcute/identity': 1.0.3
-      '@atcute/lexicons': 1.1.0
+      '@atcute/identity': 1.1.0
+      '@atcute/identity-resolver': 1.1.3(@atcute/identity@1.1.0)
+      '@atcute/lexicons': 1.1.1
       '@atcute/multibase': 1.1.4
       '@atcute/uint8array': 1.0.3
       nanoid: 5.1.5
···
   '@atcute/tid@1.0.2': {}
 
   '@atcute/uint8array@1.0.3': {}
+
+  '@atcute/util-fetch@1.0.1':
+    dependencies:
+      '@badrap/valita': 0.4.5
 
   '@atlaskit/pragmatic-drag-and-drop-hitbox@1.0.3':
     dependencies:

src/components/main/sign-in-dialog.tsx

···
 import { Match, Switch, createSignal, onMount } from 'solid-js';
 
-import type { Did } from '@atcute/lexicons';
+import type { ActorIdentifier, Did } from '@atcute/lexicons';
 import {
-	type AuthorizationServerMetadata,
-	type IdentityMetadata,
+	type AuthorizeTargetOptions,
 	OAuthResponseError,
 	ResolverError,
 	createAuthorizationUrl,
-	resolveFromIdentity,
-	resolveFromService,
 } from '@atcute/oauth-browser-client';
 import { createMutation } from '@mary/solid-query';
 
···
 		async mutationFn({ identifier, pds }: { identifier?: string; pds?: string }) {
 			setPending(`Resolving your identity`);
 
-			let metadata: AuthorizationServerMetadata;
-			let identity: IdentityMetadata | undefined;
+			let target: AuthorizeTargetOptions;
 
 			if (identifier) {
-				({ metadata, identity } = await resolveFromIdentity(identifier));
+				target = { type: 'account', identifier: identifier as ActorIdentifier };
 			} else if (pds) {
-				({ metadata } = await resolveFromService(pds));
+				target = { type: 'pds', serviceUrl: pds };
 			} else {
 				assert(false);
 			}
···
 			setPending(`Contacting your data server`);
 
 			const authUrl = await createAuthorizationUrl({
-				metadata: metadata,
-				identity: identity,
+				target: target,
 				scope: import.meta.env.VITE_OAUTH_SCOPE,
 			});
 

src/main.tsx

···
 import { type JSX, createSignal, onMount } from 'solid-js';
 import { render } from 'solid-js/web';
 
+import { Client, ok, simpleFetchHandler } from '@atcute/client';
+import type { DidDocument } from '@atcute/identity';
 import type { Did } from '@atcute/lexicons';
 import { configureOAuth } from '@atcute/oauth-browser-client';
 
···
 });
 
 // Configure OAuth
-configureOAuth({
-	metadata: {
-		client_id: import.meta.env.VITE_OAUTH_CLIENT_ID,
-		redirect_uri: import.meta.env.VITE_OAUTH_REDIRECT_URL,
-	},
-});
+{
+	const resolver = new Client({
+		handler: simpleFetchHandler({ service: 'https://identitas.kelinci.deno.net' }),
+	});
+
+	configureOAuth({
+		metadata: {
+			client_id: import.meta.env.VITE_OAUTH_CLIENT_ID,
+			redirect_uri: import.meta.env.VITE_OAUTH_REDIRECT_URL,
+		},
+
+		didDocumentResolver: {
+			async resolve(did) {
+				const data = await ok(
+					resolver.get('com.atproto.identity.resolveDid', {
+						params: {
+							did: did,
+						},
+					}),
+				);
+
+				return data.didDoc as unknown as DidDocument;
+			},
+		},
+		handleResolver: {
+			async resolve(handle) {
+				const data = await ok(
+					resolver.get('com.atproto.identity.resolveHandle', {
+						params: {
+							handle: handle,
+						},
+					}),
+				);
+
+				return data.did as Did<'plc' | 'web'>;
+			},
+		},
+	});
+}
 
 const InnerApp = () => {
 	const [ready, setReady] = createSignal(false);