fix: remove client field from GrantRequest type, add client field in when building request

Author: sanducb

src/client/config.rs

@@ -43,6 +43,11 @@ pub struct ClientConfig {
     ///
     /// Example: `Some(PathBuf::from("keys/jwks.json"))`
     pub jwks_path: Option<PathBuf>,
+
+    /// URL of the wallet address to use for the client.
+    ///
+    /// This is the URL of the wallet address that will be used to send and receive payments.
+    pub wallet_address_url: String,
 }
 
 impl Default for ClientConfig {
@@ -68,7 +73,8 @@ impl Default for ClientConfig {
         Self {
             key_id: "".into(),
             private_key_path: PathBuf::from("private.key"),
-            jwks_path: Some(PathBuf::from("jwks.json")),
+            jwks_path: None,
+            wallet_address_url: "".into(),
         }
     }
 }

src/client/grant.rs

@@ -10,7 +10,11 @@ pub(crate) async fn request_grant(
     auth_url: &str,
     grant: &GrantRequest,
 ) -> Result<GrantResponse> {
-    let body = serde_json::to_string(grant).map_err(OpClientError::Serde)?;
+    let grant_with_client = GrantRequest {
+        client: client.config.wallet_address_url.clone(),
+        ..grant.clone()
+    };
+    let body = serde_json::to_string(&grant_with_client).map_err(OpClientError::Serde)?;
 
     AuthenticatedRequest::new(client, Method::POST, auth_url.to_string())
         .with_body(body)

src/snippets/grant/incoming_payment.rs

@@ -15,8 +15,8 @@ async fn main() -> open_payments::client::Result<()> {
     let wallet_address_url = get_env_var("WALLET_ADDRESS_URL")?;
     let wallet_address = client.wallet_address().get(&wallet_address_url).await?;
 
-    let grant_request = GrantRequest {
-        access_token: AccessTokenRequest {
+    let grant_request = GrantRequest::new(
+        AccessTokenRequest {
             access: vec![AccessItem::IncomingPayment {
                 actions: vec![
                     IncomingPaymentAction::Create,
@@ -28,9 +28,8 @@ async fn main() -> open_payments::client::Result<()> {
                 identifier: None,
             }],
         },
-        client: wallet_address.id,
-        interact: None,
-    };
+        None,
+    );
 
     println!(
         "Grant request JSON: {}",

src/snippets/grant/outgoing_payment.rs

@@ -26,8 +26,8 @@ async fn main() -> open_payments::client::Result<()> {
     let quote = client.quotes().get(&quote_url, Some(&gnap_token)).await?;
 
     let wallet_id = &wallet_address.id;
-    let grant_request = GrantRequest {
-        access_token: AccessTokenRequest {
+    let grant_request = GrantRequest::new(
+        AccessTokenRequest {
             access: vec![AccessItem::OutgoingPayment {
                 actions: vec![
                     OutgoingPaymentAction::Read,
@@ -44,16 +44,15 @@ async fn main() -> open_payments::client::Result<()> {
                 }),
             }],
         },
-        client: wallet_id.to_string(),
-        interact: Some(InteractRequest {
+        Some(InteractRequest {
             start: vec!["redirect".to_string()],
             finish: Some(InteractFinish {
                 method: "redirect".to_string(),
                 uri: "http://localhost".to_string(),
                 nonce: Uuid::new_v4().to_string(),
             }),
         }),
-    };
+    );
 
     println!(
         "Grant request JSON: {}",

src/snippets/grant/quote.rs

@@ -16,15 +16,14 @@ async fn main() -> open_payments::client::Result<()> {
     let wallet_address_url = get_env_var("WALLET_ADDRESS_URL")?;
     let wallet_address = client.wallet_address().get(&wallet_address_url).await?;
 
-    let grant_request = GrantRequest {
-        access_token: AccessTokenRequest {
+    let grant_request = GrantRequest::new(
+        AccessTokenRequest {
             access: vec![AccessItem::Quote {
                 actions: vec![QuoteAction::Create, QuoteAction::Read, QuoteAction::ReadAll],
             }],
         },
-        client: wallet_address.id,
-        interact: None,
-    };
+        None,
+    );
 
     println!(
         "Grant request JSON: {}",

src/snippets/utils/mod.rs

@@ -15,15 +15,17 @@ pub fn get_env_var(key: &str) -> Result<String> {
 }
 
 pub fn create_authenticated_client() -> Result<AuthenticatedClient> {
+    let wallet_address_url = get_env_var("WALLET_ADDRESS_URL")?;
     let private_key_path = PathBuf::from(get_env_var("PRIVATE_KEY_PATH")?);
     let key_id = get_env_var("KEY_ID")?;
     let key_id_clone = key_id.clone();
     let jwks_path = get_env_var("JWKS_PATH").map(PathBuf::from).ok();
 
     let config = ClientConfig {
-        private_key_path,
         key_id,
+        private_key_path,
         jwks_path,
+        wallet_address_url,
     };
 
     let client = AuthenticatedClient::new(config)

src/types/auth.rs

@@ -81,11 +81,21 @@ pub struct AccessTokenResponse {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct GrantRequest {
     pub access_token: AccessTokenRequest,
-    pub client: String,
+    pub(crate) client: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub interact: Option<InteractRequest>,
 }
 
+impl GrantRequest {
+    pub fn new(access_token: AccessTokenRequest, interact: Option<InteractRequest>) -> Self {
+        Self {
+            access_token,
+            client: String::new(), // Will be set by the client internally
+            interact,
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct AccessTokenRequest {
     pub access: Vec<AccessItem>,

tests/integration/common.rs

@@ -32,6 +32,7 @@ impl TestSetup {
         let config = ClientConfig {
             key_id,
             private_key_path: private_key_path.into(),
+            wallet_address_url: wallet_address.clone(),
             ..Default::default()
         };
 

tests/integration/grant.rs

@@ -15,8 +15,8 @@ async fn test_grant_flows() {
         .await
         .expect("Failed to get wallet address");
 
-    let grant_request = GrantRequest {
-        access_token: AccessTokenRequest {
+    let grant_request = GrantRequest::new(
+        AccessTokenRequest {
             access: vec![AccessItem::IncomingPayment {
                 actions: vec![
                     IncomingPaymentAction::Create,
@@ -28,9 +28,8 @@ async fn test_grant_flows() {
                 identifier: None,
             }],
         },
-        client: wallet_address.id,
-        interact: None,
-    };
+        None,
+    );
 
     let response = test_setup
         .auth_client

tests/integration/incoming_payment.rs

@@ -13,8 +13,8 @@ async fn get_access_token(test_setup: &mut TestSetup) -> String {
         .await
         .expect("Failed to get wallet address");
 
-    let grant_request = GrantRequest {
-        access_token: AccessTokenRequest {
+    let grant_request = GrantRequest::new(
+        AccessTokenRequest {
             access: vec![AccessItem::IncomingPayment {
                 actions: vec![
                     IncomingPaymentAction::Create,
@@ -26,9 +26,8 @@ async fn get_access_token(test_setup: &mut TestSetup) -> String {
                 identifier: None,
             }],
         },
-        client: wallet_address.id,
-        interact: None,
-    };
+        None,
+    );
 
     let response = test_setup
         .auth_client