Fix bug in passing around the origin str

Author: RobbieMcKinstry

src/cmd/login.rs

@@ -14,7 +14,8 @@ pub struct Login {
 
 impl Login {
     pub fn new(terminal: Terminal, flags: LoginSubcommand) -> Result<Self> {
-        let backend = BackendClient::new(flags.origin(), None)?;
+        let origin = flags.origin().as_deref();
+        let backend = BackendClient::new(origin, None)?;
 
         Ok(Self {
             terminal,
@@ -32,13 +33,15 @@ impl Login {
             let email = self
                 .flags
                 .email()
+                .as_deref()
                 .map(ToString::to_string)
                 .unwrap_or_else(|| self.terminal.prompt_email());
 
             // If no password was provided, prompt for their password.
             let password = self
                 .flags
                 .password()
+                .as_deref()
                 .map(ToString::to_string)
                 .unwrap_or_else(|| self.terminal.prompt_password());
 

src/config/login/mod.rs

@@ -1,6 +1,7 @@
 use clap::Args;
+use derive_getters::Getters;
 
-#[derive(Args, Clone)]
+#[derive(Args, Getters, Clone)]
 pub struct LoginSubcommand {
     /// The email of the account
     #[clap(long)]
@@ -12,19 +13,3 @@ pub struct LoginSubcommand {
     #[arg(long, short = 'o', default_value = Some("http://127.0.0.1:8080"))]
     origin: Option<String>,
 }
-
-impl LoginSubcommand {
-    /// Return the user's email, if provided via the CLI.
-    pub fn email(&self) -> Option<&str> {
-        self.email.as_deref()
-    }
-
-    /// Return the user's password, if provided via the CLI.
-    pub fn password(&self) -> Option<&str> {
-        self.password.as_deref()
-    }
-
-    pub fn origin(&self) -> Option<&str> {
-        self.password.as_deref()
-    }
-}