@atproto/oauth-provider 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
@@ -40,13 +40,13 @@
     "zod": "^3.23.8",
     "@atproto-labs/fetch": "0.1.1",
     "@atproto-labs/fetch-node": "0.1.1",
-    "@atproto-labs/simple-store-memory": "0.1.1",
     "@atproto-labs/pipe": "0.1.0",
-    "@atproto/common": "^0.4.3",
+    "@atproto-labs/simple-store": "0.1.1",
+    "@atproto-labs/simple-store-memory": "0.1.1",
+    "@atproto/common": "^0.4.4",
     "@atproto/jwk": "0.1.1",
     "@atproto/jwk-jose": "0.1.2",
-    "@atproto/oauth-types": "0.1.5",
-    "@atproto-labs/simple-store": "0.1.1"
+    "@atproto/oauth-types": "0.1.5"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.7",

package/src/assets/app/components/accept-form.tsx

@@ -77,8 +77,12 @@ export function AcceptForm({
         </div>
       )}
       <p>
-        <ClientName clientId={clientId} clientMetadata={clientMetadata} /> is
-        asking for permission to access your account (
+        <ClientName
+          clientId={clientId}
+          clientMetadata={clientMetadata}
+          clientTrusted={clientTrusted}
+        />{' '}
+        is asking for permission to access your account (
         <AccountIdentifier account={account} />
         ).
       </p>

package/src/assets/app/components/client-name.tsx

@@ -10,29 +10,28 @@ import { UrlViewer } from './url-viewer'
 export type ClientNameProps = {
   clientId: string
   clientMetadata: OAuthClientMetadata
+  clientTrusted: boolean
+  loopbackClientName?: string
 } & HTMLAttributes<Element>
 
 export function ClientName({
   clientId,
   clientMetadata,
+  clientTrusted,
+  loopbackClientName = 'An application on your device',
   ...attrs
 }: ClientNameProps) {
+  if (clientTrusted && clientMetadata.client_name) {
+    return <span {...attrs}>{clientMetadata.client_name}</span>
+  }
+
   if (isOAuthClientIdLoopback(clientId)) {
-    return <span {...attrs}>An application on your device</span>
+    return <span {...attrs}>{loopbackClientName}</span>
   }
 
   if (isOAuthClientIdDiscoverable(clientId)) {
-    if (clientMetadata.client_name) {
-      return (
-        <span {...attrs}>
-          {clientMetadata.client_name} (
-          <UrlViewer url={clientId} path />)
-        </span>
-      )
-    }
-
     return <UrlViewer {...attrs} url={clientId} path />
   }
 
-  return <span {...attrs}>{clientMetadata.client_name || clientId}</span>
+  return <span {...attrs}>{clientId}</span>
 }