Merge branch 'feature/check-token-expiration' into development

* feature/check-token-expiration:
  fix is logged in checking
  refactor token module
  get_smb_token is not async
  refactor structure

Author: keypair34

crates/cli/src/account/lib.rs

@@ -1,25 +1,27 @@
-use crate::token::smb_token_file_path;
-use anyhow::{anyhow, Result};
-use console::style;
-use log::debug;
-use regex::Regex;
-use reqwest::{Client, Response, StatusCode};
-use smbcloud_model::account::SmbAuthorization;
-use smbcloud_network::environment::Environment;
-use smbcloud_networking::{
-    constants::{
-        GH_OAUTH_CLIENT_ID, GH_OAUTH_REDIRECT_HOST, GH_OAUTH_REDIRECT_PORT, PATH_AUTHORIZE,
+use {
+    crate::token::smb_token_file_path::smb_token_file_path,
+    anyhow::{anyhow, Result},
+    console::style,
+    log::debug,
+    regex::Regex,
+    reqwest::{Client, Response, StatusCode},
+    smbcloud_model::account::SmbAuthorization,
+    smbcloud_network::environment::Environment,
+    smbcloud_networking::{
+        constants::{
+            GH_OAUTH_CLIENT_ID, GH_OAUTH_REDIRECT_HOST, GH_OAUTH_REDIRECT_PORT, PATH_AUTHORIZE,
+        },
+        smb_base_url_builder,
     },
-    smb_base_url_builder,
-};
-use spinners::Spinner;
-use std::{
-    fs::{create_dir_all, OpenOptions},
-    io::{BufRead, BufReader, Write},
-    net::{TcpListener, TcpStream},
-    sync::mpsc::{self, Receiver, Sender},
+    spinners::Spinner,
+    std::{
+        fs::{create_dir_all, OpenOptions},
+        io::{BufRead, BufReader, Write},
+        net::{TcpListener, TcpStream},
+        sync::mpsc::{self, Receiver, Sender},
+    },
+    url_builder::URLBuilder,
 };
-use url_builder::URLBuilder;
 
 pub async fn authorize_github(env: &Environment) -> Result<SmbAuthorization> {
     // Spin up a simple localhost server to listen for the GitHub OAuth callback

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/logout/mod.rs

@@ -1,4 +1,4 @@
-use crate::token::{get_smb_token, smb_token_file_path};
+use crate::token::{get_smb_token::get_smb_token, smb_token_file_path::smb_token_file_path};
 use anyhow::{anyhow, Result};
 use dialoguer::{theme::ColorfulTheme, Confirm};
 use reqwest::{Client, StatusCode};
@@ -66,7 +66,7 @@ pub async fn process_logout(env: Environment) -> Result<CommandResult> {
 }
 
 async fn do_process_logout(env: Environment) -> Result<()> {
-    let token = get_smb_token(env).await?;
+    let token = get_smb_token(env)?;
 
     let response = Client::new()
         .delete(build_smb_logout_url(env))

crates/cli/src/account/me/mod.rs

@@ -1,5 +1,5 @@
 use crate::account::lib::is_logged_in;
-use crate::token::get_smb_token;
+use crate::token::get_smb_token::get_smb_token;
 use crate::{
     cli::CommandResult,
     ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
@@ -49,7 +49,7 @@ pub async fn process_me(env: Environment) -> Result<CommandResult> {
         spinners::Spinners::SimpleDotsScrolling,
         succeed_message("Loading"),
     );
-    let token = get_smb_token(env).await?;
+    let token = get_smb_token(env)?;
     match me(env, &token).await {
         Ok(user) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));

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/account/signup/process.rs

@@ -1,5 +1,5 @@
 use super::SignupMethod;
-use crate::token::smb_token_file_path;
+use crate::token::smb_token_file_path::smb_token_file_path;
 use crate::{
     account::lib::authorize_github,
     cli::CommandResult,

crates/cli/src/deploy/config.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        deploy::setup::setup_project,
+        deploy::setup_project::setup_project,
         ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
     },
     git2::{Cred, CredentialType, Error},

crates/cli/src/deploy/mod.rs

@@ -3,4 +3,6 @@ mod detect_runner;
 mod git;
 pub mod process_deploy;
 mod remote_messages;
-mod setup;
+pub(crate) mod setup_create_new_project;
+pub(crate) mod setup_project;
+pub(crate) mod setup_select_project;

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,
+        token::{get_smb_token::get_smb_token, is_logged_in::is_logged_in},
         ui::{fail_message, succeed_message, succeed_symbol},
     },
     anyhow::{anyhow, Result},
@@ -28,12 +28,14 @@ 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
-    let access_token = get_smb_token(env).await?;
+    let access_token = get_smb_token(env)?;
 
     // Check config.
     let config = check_config(env).await?;