Update from PR comments

Author: EricGhildyal

src/adapters/backend/mod.rs

@@ -45,14 +45,10 @@ impl BackendClient {
     pub fn new(cli: &Cli) -> Result<Self> {
         let fs = FileSystem::new().unwrap();
 
-        // Load the user's session information from the filesystem.
-        let session = fs.load_file(SessionFile).map(|session| session);
+        // Load the user's session information from the filesystem, if it exists
+        let session = fs.load_file(SessionFile)?;
 
-        let creds = match session {
-            Session::User(creds) => creds,
-        };
-
-        let conf = BackendConfig::new(cli.origin(), Some(creds.jwt.clone()));
+        let conf = BackendConfig::new(cli.origin(), Some(session.clone()));
 
         let raw_conf: Configuration = conf.clone().into();
 
@@ -64,8 +60,12 @@ impl BackendClient {
         })
     }
 
-    pub fn is_authenicated(&self) -> bool {
-        self.session.is_some()
+    pub fn is_authenicated(&self) -> Result<()> {
+        if self.session.clone().is_some_and(Session::is_not_expired) {
+            return Ok(());
+        } else {
+            bail!("Please login before running this command.");
+        }
     }
 
     /// Given the workspace name and the application name, fetch
@@ -114,9 +114,8 @@ impl BackendClient {
 
     /// Return information about the workspace given its name.
     async fn get_workspace_by_name(&self, name: &str) -> Result<WorkspaceSummary> {
-        if !self.is_authenicated() {
-            bail!("Please login before running this command.");
-        }
+        self.is_authenicated()?;
+
         // let mut workspaces = list_workspaces(&self.conf, Some(name))
         let mut workspaces: Vec<_> = self
             .client
@@ -148,9 +147,7 @@ impl BackendClient {
         workspace_id: Uuid,
         name: &str,
     ) -> Result<ApplicationDetails> {
-        if !self.is_authenicated() {
-            bail!("Please login before running this command.");
-        }
+        self.is_authenicated()?;
 
         let mut applications: Vec<_> = self
             .client
@@ -200,12 +197,15 @@ pub(super) struct BackendConfig {
 }
 
 impl BackendConfig {
-    pub fn new<T: AsRef<str>>(origin: Option<T>, jwt: Option<String>) -> Self {
+    pub fn new<T: AsRef<str>>(origin: Option<T>, session: Option<Session>) -> Self {
         // • Convert the Option<T> to a String.
         let origin = origin.map(|val| val.as_ref().to_owned());
         // • Set up the default configuration values.
+        let jwt = session.and_then(|session| match session {
+            Session::User(creds) => Some(creds.jwt),
+        });
         let conf = Configuration {
-            base_path: origin.unwrap(),
+            base_path: origin.unwrap_or("https://api.multitool.run".to_string()),
             bearer_access_token: jwt,
             ..Configuration::default()
         };

src/cmd/login.rs

@@ -12,13 +12,13 @@ pub struct Login {
 }
 
 impl Login {
-    pub fn new(terminal: Terminal, cli: &Cli, flags: LoginSubcommand) -> Self {
-        let backend = BackendClient::new(cli).unwrap();
-        Self {
+    pub fn new(terminal: Terminal, cli: &Cli, flags: LoginSubcommand) -> Result<Self> {
+        let backend = BackendClient::new(cli)?;
+        Ok(Self {
             terminal,
             flags,
             backend,
-        }
+        })
     }
 
     pub async fn dispatch(self) -> Result<()> {

src/config/command.rs

@@ -24,7 +24,7 @@ impl MultiCommand {
     /// dispatch the user-provided arguments to the command handler.
     pub async fn dispatch(self, console: Terminal, cli: &Cli) -> Result<()> {
         match self {
-            Self::Login(flags) => Login::new(console, cli, flags).dispatch().await,
+            Self::Login(flags) => Login::new(console, cli, flags)?.dispatch().await,
             Self::Logout => Logout::new(console).dispatch(),
             Self::Run(flags) => Run::new(console, cli, flags).dispatch().await,
             Self::Version => Version::new(console).dispatch(),

src/fs/session.rs

@@ -14,11 +14,9 @@ pub enum Session {
 }
 
 impl Session {
-    pub fn is_not_expired(creds: UserCreds) -> Self {
-        if creds.expiry >= Utc::now() {
-            Self::User(creds)
-        } else {
-            panic!("Login token expired, please login again with \'multitool login\'.");
+    pub fn is_not_expired(self) -> bool {
+        match self {
+            Self::User(creds) => creds.expiry >= Utc::now(),
         }
     }
 }