add oauthClients to slices graphql node, fix slice uri handling in oauth clients (was using a placeholder)

api/src/graphql/schema_builder.rs

···
     add_cancel_job_mutation, add_create_oauth_client_mutation, add_delete_job_mutation,
     add_delete_oauth_client_mutation, add_delete_slice_records_mutation, add_get_sync_summary_query,
     add_jetstream_logs_query, add_jetstream_logs_subscription, add_oauth_clients_query,
-    add_slice_records_query, add_sparklines_query, add_sparklines_field_to_slice,
-    add_start_sync_mutation, add_stats_field_to_slice, add_sync_job_logs_query, add_sync_job_query,
-    add_sync_job_subscription, add_sync_jobs_query, add_update_oauth_client_mutation,
-    add_upload_blob_mutation, create_blob_upload_response_type, create_collection_stats_type,
-    create_collection_summary_type, create_delete_slice_records_output_type,
-    create_jetstream_log_entry_type, create_oauth_client_type, create_slice_record_type,
-    create_slice_record_edge_type, create_slice_records_connection_type,
-    create_slice_records_where_input, create_slice_sparkline_type, create_slice_stats_type,
-    create_sparkline_point_type, create_start_sync_output_type, create_sync_job_result_type,
-    create_sync_job_type, create_sync_summary_type,
+    add_oauth_clients_field_to_slice, add_slice_records_query, add_sparklines_query,
+    add_sparklines_field_to_slice, add_start_sync_mutation, add_stats_field_to_slice,
+    add_sync_job_logs_query, add_sync_job_query, add_sync_job_subscription, add_sync_jobs_query,
+    add_update_oauth_client_mutation, add_upload_blob_mutation, create_blob_upload_response_type,
+    create_collection_stats_type, create_collection_summary_type,
+    create_delete_slice_records_output_type, create_jetstream_log_entry_type,
+    create_oauth_client_type, create_slice_record_type, create_slice_record_edge_type,
+    create_slice_records_connection_type, create_slice_records_where_input,
+    create_slice_sparkline_type, create_slice_stats_type, create_sparkline_point_type,
+    create_start_sync_output_type, create_sync_job_result_type, create_sync_job_type,
+    create_sync_summary_type,
 };
 use crate::graphql::types::{extract_collection_fields, extract_record_key, GraphQLField, GraphQLType};
 use crate::graphql::PUBSUB;
···
                 database.clone(),
                 slice_uri.clone(),
                 &all_collections,
+                auth_base_url.clone(),
             );
 
             // Create edge and connection types for this collection (Relay standard)
···
     database: Database,
     slice_uri: String,
     all_collections: &[CollectionMeta],
+    auth_base_url: String,
 ) -> Object {
     let mut object = Object::new(type_name);
 
···
         ));
     }
 
-    // Add sparklines and stats fields for NetworkSlicesSlice type
+    // Add sparklines, stats, and oauth clients fields for NetworkSlicesSlice type
     if type_name == "NetworkSlicesSlice" {
         object = add_sparklines_field_to_slice(object, database.clone());
         object = add_stats_field_to_slice(object, database.clone());
+        object = add_oauth_clients_field_to_slice(object, auth_base_url);
     }
 
     object

api/src/graphql/schema_ext/mod.rs

···
 pub use oauth::{
     create_oauth_client_type,
     add_oauth_clients_query,
+    add_oauth_clients_field_to_slice,
     add_create_oauth_client_mutation,
     add_update_oauth_client_mutation,
     add_delete_oauth_client_mutation,

api/src/graphql/schema_ext/oauth.rs

···
     oauth_client
 }
 
+/// Add oauthClients field to NetworkSlicesSlice type
+pub fn add_oauth_clients_field_to_slice(
+    object: Object,
+    auth_base_url: String,
+) -> Object {
+    use crate::graphql::schema_builder::RecordContainer;
+
+    let base_url_for_oauth = auth_base_url.clone();
+
+    object.field(
+        Field::new(
+            "oauthClients",
+            TypeRef::named_nn_list_nn("OAuthClient"),
+            move |ctx| {
+                let base_url = base_url_for_oauth.clone();
+
+                FieldFuture::new(async move {
+                    let container = ctx.parent_value.try_downcast_ref::<RecordContainer>()?;
+                    let slice_uri = &container.record.uri;
+
+                    // Get pool from context and create database instance
+                    let pool = ctx.data::<sqlx::PgPool>()
+                        .map_err(|_| Error::new("Database pool not found in context"))?;
+                    let database = crate::database::Database::new(pool.clone());
+
+                    // Fetch OAuth clients from database
+                    let clients = database
+                        .get_oauth_clients_for_slice(slice_uri)
+                        .await
+                        .map_err(|e| Error::new(format!("Failed to fetch OAuth clients: {}", e)))?;
+
+                    if clients.is_empty() {
+                        return Ok(Some(FieldValue::list(Vec::<FieldValue<'_>>::new())));
+                    }
+
+                    // Fetch details from AIP server
+                    let http_client = Client::new();
+                    let mut client_data_list = Vec::new();
+
+                    for oauth_client in clients {
+                        let aip_url = format!("{}/oauth/clients/{}", base_url, oauth_client.client_id);
+                        let mut request_builder = http_client.get(&aip_url);
+
+                        if let Some(token) = &oauth_client.registration_access_token {
+                            request_builder = request_builder.bearer_auth(token);
+                        }
+
+                        match request_builder.send().await {
+                            Ok(response) if response.status().is_success() => {
+                                if let Ok(response_text) = response.text().await {
+                                    if let Ok(aip_client) = serde_json::from_str::<AipClientResponse>(&response_text) {
+                                        client_data_list.push(OAuthClientData {
+                                            client_id: aip_client.client_id,
+                                            client_secret: aip_client.client_secret,
+                                            client_name: aip_client.client_name,
+                                            redirect_uris: aip_client.redirect_uris,
+                                            grant_types: aip_client.grant_types,
+                                            response_types: aip_client.response_types,
+                                            scope: aip_client.scope,
+                                            client_uri: aip_client.client_uri,
+                                            logo_uri: aip_client.logo_uri,
+                                            tos_uri: aip_client.tos_uri,
+                                            policy_uri: aip_client.policy_uri,
+                                            created_at: oauth_client.created_at,
+                                            created_by_did: oauth_client.created_by_did,
+                                        });
+                                    }
+                                }
+                            }
+                            _ => {
+                                // Fallback for clients we can't fetch details for
+                                client_data_list.push(OAuthClientData {
+                                    client_id: oauth_client.client_id,
+                                    client_secret: None,
+                                    client_name: "Unknown".to_string(),
+                                    redirect_uris: vec![],
+                                    grant_types: vec!["authorization_code".to_string()],
+                                    response_types: vec!["code".to_string()],
+                                    scope: None,
+                                    client_uri: None,
+                                    logo_uri: None,
+                                    tos_uri: None,
+                                    policy_uri: None,
+                                    created_at: oauth_client.created_at,
+                                    created_by_did: oauth_client.created_by_did,
+                                });
+                            }
+                        }
+                    }
+
+                    // Convert to GraphQL values
+                    let field_values: Vec<FieldValue<'_>> = client_data_list
+                        .into_iter()
+                        .map(|client_data| {
+                            let container = OAuthClientContainer { client: client_data };
+                            FieldValue::owned_any(container)
+                        })
+                        .collect();
+
+                    Ok(Some(FieldValue::list(field_values)))
+                })
+            },
+        )
+        .description("Get all OAuth clients for this slice")
+    )
+}
+
 /// Add oauthClients query to the Query type
 pub fn add_oauth_clients_query(query: Object, slice_uri: String, auth_base_url: String) -> Object {
     query.field(

frontend-v2/schema.graphql

···
   Get statistics for this slice including collection counts, record counts, and actor counts
   """
   stats: SliceStats!
+
+  """Get all OAuth clients for this slice"""
+  oauthClients: [OAuthClient!]!
 }
 
 type NetworkSlicesSliceAggregated {

frontend-v2/src/__generated__/OAuthClientsQuery.graphql.ts

···
 /**
- * @generated SignedSource<<4c24e57ecdb7163fc62f4069422aac37>>
+ * @generated SignedSource<<4bc4595b4bf2e4b263476f66a31ccca4>>
  * @lightSyntaxTransform
  * @nogrep
  */
···
   lte?: string | null | undefined;
 };
 export type OAuthClientsQuery$variables = {
-  slice: string;
   where?: NetworkSlicesSliceWhereInput | null | undefined;
 };
 export type OAuthClientsQuery$data = {
···
         readonly actorHandle: string | null | undefined;
         readonly did: string;
         readonly name: string;
+        readonly oauthClients: ReadonlyArray<{
+          readonly clientId: string;
+          readonly clientName: string;
+          readonly clientSecret: string | null | undefined;
+          readonly clientUri: string | null | undefined;
+          readonly createdAt: string;
+          readonly createdByDid: string;
+          readonly logoUri: string | null | undefined;
+          readonly policyUri: string | null | undefined;
+          readonly redirectUris: ReadonlyArray<string>;
+          readonly scope: string | null | undefined;
+          readonly tosUri: string | null | undefined;
+        }>;
+        readonly uri: string;
       };
     }>;
   };
-  readonly oauthClients: ReadonlyArray<{
-    readonly clientId: string;
-    readonly clientName: string;
-    readonly clientSecret: string | null | undefined;
-    readonly clientUri: string | null | undefined;
-    readonly createdAt: string;
-    readonly createdByDid: string;
-    readonly logoUri: string | null | undefined;
-    readonly policyUri: string | null | undefined;
-    readonly redirectUris: ReadonlyArray<string>;
-    readonly scope: string | null | undefined;
-    readonly tosUri: string | null | undefined;
-  }>;
 };
 export type OAuthClientsQuery = {
   response: OAuthClientsQuery$data;
···
   {
     "defaultValue": null,
     "kind": "LocalArgument",
-    "name": "slice"
+    "name": "where"
+  }
+],
+v1 = [
+  {
+    "kind": "Literal",
+    "name": "first",
+    "value": 1
   },
   {
-    "defaultValue": null,
-    "kind": "LocalArgument",
-    "name": "where"
+    "kind": "Variable",
+    "name": "where",
+    "variableName": "where"
   }
 ],
-v1 = {
+v2 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "name",
+  "storageKey": null
+},
+v3 = {
   "alias": null,
-  "args": [
-    {
-      "kind": "Variable",
-      "name": "slice",
-      "variableName": "slice"
-    }
-  ],
+  "args": null,
+  "kind": "ScalarField",
+  "name": "did",
+  "storageKey": null
+},
+v4 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "actorHandle",
+  "storageKey": null
+},
+v5 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "uri",
+  "storageKey": null
+},
+v6 = {
+  "alias": null,
+  "args": null,
   "concreteType": "OAuthClient",
   "kind": "LinkedField",
   "name": "oauthClients",
···
     }
   ],
   "storageKey": null
-},
-v2 = [
-  {
-    "kind": "Literal",
-    "name": "first",
-    "value": 1
-  },
-  {
-    "kind": "Variable",
-    "name": "where",
-    "variableName": "where"
-  }
-],
-v3 = {
-  "alias": null,
-  "args": null,
-  "kind": "ScalarField",
-  "name": "name",
-  "storageKey": null
-},
-v4 = {
-  "alias": null,
-  "args": null,
-  "kind": "ScalarField",
-  "name": "did",
-  "storageKey": null
-},
-v5 = {
-  "alias": null,
-  "args": null,
-  "kind": "ScalarField",
-  "name": "actorHandle",
-  "storageKey": null
 };
 return {
   "fragment": {
···
     "metadata": null,
     "name": "OAuthClientsQuery",
     "selections": [
-      (v1/*: any*/),
       {
         "alias": null,
-        "args": (v2/*: any*/),
+        "args": (v1/*: any*/),
         "concreteType": "NetworkSlicesSliceConnection",
         "kind": "LinkedField",
         "name": "networkSlicesSlices",
···
                 "name": "node",
                 "plural": false,
                 "selections": [
+                  (v2/*: any*/),
                   (v3/*: any*/),
                   (v4/*: any*/),
-                  (v5/*: any*/)
+                  (v5/*: any*/),
+                  (v6/*: any*/)
                 ],
                 "storageKey": null
               }
···
     "kind": "Operation",
     "name": "OAuthClientsQuery",
     "selections": [
-      (v1/*: any*/),
       {
         "alias": null,
-        "args": (v2/*: any*/),
+        "args": (v1/*: any*/),
         "concreteType": "NetworkSlicesSliceConnection",
         "kind": "LinkedField",
         "name": "networkSlicesSlices",
···
                 "name": "node",
                 "plural": false,
                 "selections": [
+                  (v2/*: any*/),
                   (v3/*: any*/),
                   (v4/*: any*/),
                   (v5/*: any*/),
+                  (v6/*: any*/),
                   {
                     "alias": null,
                     "args": null,
···
     ]
   },
   "params": {
-    "cacheID": "20abc4b49d5c52da4a3ad1935662056a",
+    "cacheID": "953a2b7074ba3074cca3f11991af440e",
     "id": null,
     "metadata": {},
     "name": "OAuthClientsQuery",
     "operationKind": "query",
-    "text": "query OAuthClientsQuery(\n  $slice: String!\n  $where: NetworkSlicesSliceWhereInput\n) {\n  oauthClients(slice: $slice) {\n    clientId\n    clientSecret\n    clientName\n    redirectUris\n    scope\n    clientUri\n    logoUri\n    tosUri\n    policyUri\n    createdAt\n    createdByDid\n  }\n  networkSlicesSlices(first: 1, where: $where) {\n    edges {\n      node {\n        name\n        did\n        actorHandle\n        id\n      }\n    }\n  }\n}\n"
+    "text": "query OAuthClientsQuery(\n  $where: NetworkSlicesSliceWhereInput\n) {\n  networkSlicesSlices(first: 1, where: $where) {\n    edges {\n      node {\n        name\n        did\n        actorHandle\n        uri\n        oauthClients {\n          clientId\n          clientSecret\n          clientName\n          redirectUris\n          scope\n          clientUri\n          logoUri\n          tosUri\n          policyUri\n          createdAt\n          createdByDid\n        }\n        id\n      }\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "b3eda4c7e0bda285a5261efa81e7b5cd";
+(node as any).hash = "4c0e3d21f0879129255130f260edcb75";
 
 export default node;

frontend-v2/src/pages/OAuthClients.tsx

···
 export default function OAuthClients() {
   const { handle, rkey } = useParams<{ handle: string; rkey: string }>();
 
-  // Build slice URI from params
-  const sliceUri =
-    `at://did:placeholder/${handle}/network.slices.slice/${rkey}`;
-
   return (
     <Suspense
       fallback={
···
         </Layout>
       }
     >
-      <OAuthClientsWrapper sliceUri={sliceUri} handle={handle!} rkey={rkey!} />
+      <OAuthClientsWrapper handle={handle!} rkey={rkey!} />
     </Suspense>
   );
 }
 
 function OAuthClientsWrapper(
-  { sliceUri, handle, rkey }: {
-    sliceUri: string;
+  { handle, rkey }: {
     handle: string;
     rkey: string;
   },
 ) {
   const { session } = useSessionContext();
+
   const data = useLazyLoadQuery<OAuthClientsQuery>(
     graphql`
       query OAuthClientsQuery(
-        $slice: String!
         $where: NetworkSlicesSliceWhereInput
       ) {
-        oauthClients(slice: $slice) {
-          clientId
-          clientSecret
-          clientName
-          redirectUris
-          scope
-          clientUri
-          logoUri
-          tosUri
-          policyUri
-          createdAt
-          createdByDid
-        }
         networkSlicesSlices(first: 1, where: $where) {
           edges {
             node {
               name
               did
               actorHandle
+              uri
+              oauthClients {
+                clientId
+                clientSecret
+                clientName
+                redirectUris
+                scope
+                clientUri
+                logoUri
+                tosUri
+                policyUri
+                createdAt
+                createdByDid
+              }
             }
           }
         }
       }
     `,
     {
-      slice: sliceUri,
       where: {
         actorHandle: { eq: handle },
         uri: { contains: rkey },
···
 
   const slice = data.networkSlicesSlices.edges[0]?.node;
   const sliceName = slice?.name;
+  const sliceUri = slice?.uri || `at://${slice?.did}/network.slices.slice/${rkey}`;
 
   // Check if current user is the slice owner or admin
   const isOwner = isSliceOwner(slice, session);
···
       }
     >
       <OAuthClientsContent
-        clients={data.oauthClients || []}
+        clients={slice?.oauthClients || []}
         sliceUri={sliceUri}
       />
     </Layout>