fixup! edgee: credentials: handle profiles

Author: CLEMENTINATOR

crates/api-client/src/auth.rs

@@ -83,10 +83,13 @@ impl Config {
         match profile {
             Some(profile) => self.profiles.get(profile).cloned(),
             None => match (self.api_token.clone(), self.url.clone()) {
-                (Some(api_token), Some(url)) => Some(Credentials { api_token, url }),
+                (Some(api_token), Some(url)) => Some(Credentials {
+                    api_token,
+                    url: Some(url),
+                }),
                 (Some(api_token), _) => Some(Credentials {
                     api_token,
-                    url: "https://api.edgee.app".to_string(),
+                    url: Some("https://api.edgee.app".to_string()),
                 }),
                 _ => None,
             },
@@ -100,7 +103,7 @@ impl Config {
             }
             None => {
                 self.api_token = Some(creds.api_token);
-                self.url = Some(creds.url);
+                self.url = creds.url;
             }
         }
     }
@@ -121,6 +124,7 @@ impl<S: State> ConnectBuilder<S> {
     {
         let api_token = creds.api_token.clone();
         let url = creds.url.clone();
-        self.baseurl(url.clone().as_str()).api_token(api_token)
+        self.baseurl(url.unwrap_or("https://api.edgee.app".to_string()))
+            .api_token(api_token)
     }
 }

crates/cli/src/commands/auth/login.rs

@@ -52,7 +52,10 @@ pub async fn run(opts: Options) -> Result<()> {
         }
     };
 
-    let creds = Credentials { api_token, url };
+    let creds = Credentials {
+        api_token,
+        url: Some(url),
+    };
 
     let client = edgee_api_client::new().credentials(&creds).connect();
     let user = client

crates/cli/src/commands/auth/whoami.rs

@@ -37,7 +37,9 @@ pub async fn run(opts: Options) -> anyhow::Result<()> {
     println!("  ID:    {}", user.id);
     println!("  Name:  {}", user.name);
     println!("  Email: {}", user.email);
-    println!("  Url:   {}", creds.url);
+    if let Some(url) = &creds.url {
+        println!("  Url:   {}", url);
+    }
     if let Some(profile) = opts.profile {
         println!("  Profile: {}", profile);
     }