fix is logged in checking

Author: keypair34

crates/cli/src/account/login/process.rs

@@ -1,11 +1,13 @@
 use {
-    crate::account::signup::signup_with_email,
-    crate::account::{
-        lib::{authorize_github, is_logged_in, save_token},
-        signup::{do_signup, SignupMethod},
+    crate::{
+        account::{
+            lib::{authorize_github, save_token},
+            signup::{do_signup, signup_with_email, SignupMethod},
+        },
+        cli::CommandResult,
+        token::is_logged_in::is_logged_in as is_logged_in_async,
+        ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
     },
-    crate::cli::CommandResult,
-    crate::ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
     anyhow::{anyhow, Result},
     console::style,
     dialoguer::{console::Term, theme::ColorfulTheme, Confirm, Input, Password, Select},
@@ -30,9 +32,17 @@ use {
     spinners::Spinner,
 };
 
-pub async fn process_login(env: Environment) -> Result<CommandResult> {
-    // Check if token file exists
-    if is_logged_in(env) {
+pub async fn process_login(env: Environment, is_logged_in: Option<bool>) -> Result<CommandResult> {
+    let should_continue = match is_logged_in {
+        Some(is_logged_id) => !is_logged_id,
+        None => {
+            // Check if logged in
+            let logged_in = is_logged_in_async(env).await?;
+            !logged_in
+        }
+    };
+
+    if !should_continue {
         return Ok(CommandResult {
             spinner: Spinner::new(
                 spinners::Spinners::SimpleDotsScrolling,

crates/cli/src/account/mod.rs

@@ -15,7 +15,7 @@ use smbcloud_network::environment::Environment;
 pub async fn process_account(env: Environment, commands: Commands) -> Result<CommandResult> {
     match commands {
         Commands::Signup {} => process_signup(env).await,
-        Commands::Login {} => process_login(env).await,
+        Commands::Login {} => process_login(env, None).await,
         Commands::Logout {} => process_logout(env).await,
         Commands::Forgot {} => process_forgot(env).await,
     }

crates/cli/src/deploy/process_deploy.rs

@@ -1,14 +1,14 @@
 use {
     crate::{
-        account::{lib::is_logged_in, login::process_login},
+        account::login::process_login,
         cli::CommandResult,
         deploy::{
             config::{check_config, check_project},
             detect_runner::detect_runner,
             git::remote_deployment_setup,
             remote_messages::{build_next_app, start_server},
         },
-        token::get_smb_token::get_smb_token,
+        token::{get_smb_token::get_smb_token, is_logged_in::is_logged_in},
         ui::{fail_message, succeed_message, succeed_symbol},
     },
     anyhow::{anyhow, Result},
@@ -28,8 +28,10 @@ use {
 
 pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
     // Check credentials.
-    if !is_logged_in(env) {
-        let _ = process_login(env).await;
+    let is_logged_in = is_logged_in(env).await?;
+
+    if !is_logged_in {
+        let _ = process_login(env, Some(is_logged_in)).await?;
     }
 
     // Get current token

crates/cli/src/main.rs

@@ -132,7 +132,7 @@ async fn run() -> Result<CommandResult> {
         Some(Commands::Init {}) => process_project_init(cli.environment).await,
         Some(Commands::Deploy {}) => process_deploy(cli.environment).await,
         Some(Commands::Account { command }) => process_account(cli.environment, command).await,
-        Some(Commands::Login {}) => process_login(cli.environment).await,
+        Some(Commands::Login {}) => process_login(cli.environment, None).await,
         Some(Commands::Logout {}) => process_logout(cli.environment).await,
         Some(Commands::Project { command }) => process_project(cli.environment, command).await,
         None => process_deploy(cli.environment).await,

crates/cli/src/project/crud_create.rs

@@ -1,6 +1,6 @@
-use crate::token::get_smb_token::get_smb_token;
+use crate::token::{get_smb_token::get_smb_token, is_logged_in::is_logged_in};
 use crate::{
-    account::{lib::is_logged_in, login::process_login},
+    account::login::process_login,
     cli::CommandResult,
     ui::{fail_message, succeed_message, succeed_symbol},
 };
@@ -14,8 +14,9 @@ use smbcloud_networking_project::crud_project_create::create_project;
 use spinners::Spinner;
 
 pub async fn process_project_init(env: Environment) -> Result<CommandResult> {
-    if !is_logged_in(env) {
-        let _ = process_login(env).await;
+    let is_logged_in = is_logged_in(env).await?;
+    if !is_logged_in {
+        let _ = process_login(env, Some(is_logged_in)).await;
     }
 
     let project_name = match Input::<String>::with_theme(&ColorfulTheme::default())

crates/cli/src/project/crud_update.rs

@@ -1,4 +1,4 @@
-use crate::token::get_smb_token::get_smb_token;
+use crate::token::{get_smb_token::get_smb_token, is_logged_in::is_logged_in};
 use anyhow::{anyhow, Result};
 use dialoguer::{theme::ColorfulTheme, Input};
 use smbcloud_network::environment::Environment;
@@ -8,7 +8,7 @@ use smbcloud_networking_project::{
 use spinners::Spinner;
 
 use crate::{
-    account::{lib::is_logged_in, login::process_login},
+    account::login::process_login,
     cli::CommandResult,
     ui::{description, succeed_message, succeed_symbol},
 };
@@ -18,8 +18,9 @@ pub async fn process_project_update_description(
     project_id: String,
 ) -> Result<CommandResult> {
     // Check credentials.
-    if !is_logged_in(env) {
-        let _ = process_login(env).await;
+    let is_logged_in = is_logged_in(env).await?;
+    if !is_logged_in {
+        let _ = process_login(env, Some(is_logged_in)).await;
     }
 
     let access_token = get_smb_token(env)?;

crates/cli/src/token/is_logged_in.rs

@@ -1,12 +1,20 @@
-pub async fn is_logged_in(env: Environment) -> bool {
-    // Check if token file exists
-    if !smb_token_file_path(env).is_some() {
-        return false;
-    }
+use {
+    crate::token::get_smb_token::get_smb_token, smbcloud_model::error_codes::ErrorResponse,
+    smbcloud_network::environment::Environment, smbcloud_networking_account::me::me,
+    tracing::debug,
+};
+
+pub async fn is_logged_in(env: Environment) -> Result<bool, ErrorResponse> {
     // Check if token is valid
-    let access_token = get_smb_token(env)?;
-    match me(env, access_token).await {
-        Ok(_) => true,
-        Err(_) => false,
+    let access_token = match get_smb_token(env) {
+        Ok(token) => token,
+        Err(_) => return Ok(false),
+    };
+    match me(env, &access_token).await {
+        Ok(user) => {
+            debug!("Authorized as: {:?}", user.id);
+            Ok(true)
+        }
+        Err(_) => Ok(false),
     }
 }

crates/cli/src/token/mod.rs

@@ -1,3 +1,3 @@
-//pub(crate) mod is_logged_in;
 pub(crate) mod get_smb_token;
+pub(crate) mod is_logged_in;
 pub(crate) mod smb_token_file_path;