15 files changed
+54
-48
crates/cli/src/account/lib.rs
+1
-1
@@ -1,5 +1,5 @@
1
use {
2
- crate::token::smb_token_file_path,
2
+ crate::token::smb_token_file_path::smb_token_file_path,
3
anyhow::{anyhow, Result},
4
console::style,
5
log::debug,
crates/cli/src/account/logout/mod.rs
+1
-1
@@ -1,4 +1,4 @@
1
-use crate::token::{get_smb_token, smb_token_file_path};
1
+use crate::token::{get_smb_token::get_smb_token, smb_token_file_path::smb_token_file_path};
2
use anyhow::{anyhow, Result};
3
use dialoguer::{theme::ColorfulTheme, Confirm};
4
use reqwest::{Client, StatusCode};
crates/cli/src/account/me/mod.rs
+1
-1
@@ -1,5 +1,5 @@
1
use crate::account::lib::is_logged_in;
2
-use crate::token::get_smb_token;
2
+use crate::token::get_smb_token::get_smb_token;
3
use crate::{
4
cli::CommandResult,
5
ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
crates/cli/src/account/signup/process.rs
+1
-1
@@ -1,5 +1,5 @@
1
use super::SignupMethod;
2
-use crate::token::smb_token_file_path;
2
+use crate::token::smb_token_file_path::smb_token_file_path;
3
use crate::{
4
account::lib::authorize_github,
5
cli::CommandResult,
crates/cli/src/deploy/process_deploy.rs
+1
-1
@@ -8,7 +8,7 @@ use {
8
git::remote_deployment_setup,
9
remote_messages::{build_next_app, start_server},
10
},
11
- token::get_smb_token,
11
+ token::get_smb_token::get_smb_token,
12
ui::{fail_message, succeed_message, succeed_symbol},
13
},
14
anyhow::{anyhow, Result},
crates/cli/src/deploy/setup_create_new_project.rs
+1
-1
@@ -1,5 +1,5 @@
1
use {
2
- crate::token::get_smb_token,
2
+ crate::token::get_smb_token::get_smb_token,
3
dialoguer::{theme::ColorfulTheme, Input},
4
regex::Regex,
5
smbcloud_model::{
crates/cli/src/deploy/setup_project.rs
+1
-1
@@ -4,7 +4,7 @@ use {
4
config::Config, setup_create_new_project::create_new_project,
5
setup_select_project::select_project,
6
},
7
- token::get_smb_token,
7
+ token::get_smb_token::get_smb_token,
8
ui::highlight,
9
},
10
dialoguer::{theme::ColorfulTheme, Confirm},
crates/cli/src/project/crud_create.rs
+1
-1
@@ -1,4 +1,4 @@
1
-use crate::token::get_smb_token;
1
+use crate::token::get_smb_token::get_smb_token;
2
use crate::{
3
account::{lib::is_logged_in, login::process_login},
4
cli::CommandResult,
crates/cli/src/project/crud_delete.rs
+1
-1
@@ -1,4 +1,4 @@
1
-use crate::token::get_smb_token;
1
+use crate::token::get_smb_token::get_smb_token;
2
use crate::{
3
account::lib::is_logged_in,
4
cli::CommandResult,
crates/cli/src/project/crud_read.rs
+1
-1
@@ -1,6 +1,6 @@
1
use std::{fs::OpenOptions, io::Write};
2
3
-use crate::token::get_smb_token;
3
+use crate::token::get_smb_token::get_smb_token;
4
use crate::{
5
cli::CommandResult,
6
ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
crates/cli/src/project/crud_update.rs
+1
-1
@@ -1,4 +1,4 @@
1
-use crate::token::get_smb_token;
1
+use crate::token::get_smb_token::get_smb_token;
2
use anyhow::{anyhow, Result};
3
use dialoguer::{theme::ColorfulTheme, Input};
4
use smbcloud_network::environment::Environment;
crates/cli/src/project/deployment.rs
+1
-1
@@ -1,4 +1,4 @@
1
-use crate::token::get_smb_token;
1
+use crate::token::get_smb_token::get_smb_token;
2
use crate::{
3
cli::CommandResult,
4
deploy::config::{check_config, check_project},
crates/cli/src/token/get_smb_token.rs
new
+17
@@ -0,0 +1,17 @@
1
+use {
2
+ crate::token::smb_token_file_path::smb_token_file_path,
3
+ anyhow::{anyhow, Result},
4
+ log::debug,
5
+ smbcloud_network::environment::Environment,
6
+};
7
+
8
+pub fn get_smb_token(env: Environment) -> Result<String> {
9
+ if let Some(path) = smb_token_file_path(env) {
10
+ std::fs::read_to_string(path).map_err(|e| {
11
+ debug!("Error while reading token: {}", &e);
12
+ anyhow!("Error while reading token. Are you logged in?")
13
+ })
14
+ } else {
15
+ Err(anyhow!("Failed to get home directory. Are you logged in?"))
16
+ }
17
+}
crates/cli/src/token/mod.rs
+2
-36
@@ -1,37 +1,3 @@
1
-use {
2
- anyhow::{anyhow, Result},
3
- dirs::home_dir,
4
- log::debug,
5
- smbcloud_network::environment::Environment,
6
- std::path::{Path, PathBuf},
7
-};
8
-
1
//pub(crate) mod is_logged_in;
10
-
11
-pub fn get_smb_token(env: Environment) -> Result<String> {
12
- if let Some(path) = smb_token_file_path(env) {
13
- std::fs::read_to_string(path).map_err(|e| {
14
- debug!("Error while reading token: {}", &e);
15
- anyhow!("Error while reading token. Are you logged in?")
16
- })
17
- } else {
18
- Err(anyhow!("Failed to get home directory. Are you logged in?"))
19
- }
20
-}
21
-
22
-pub fn smb_token_file_path(env: Environment) -> Option<PathBuf> {
23
- match home_dir() {
24
- Some(home_path) => {
25
- let token_path = [&env.smb_dir(), "/token"].join("");
26
- let token_file = home_path.join(Path::new(&token_path));
27
- if token_file.exists() && token_file.is_file() {
28
- return Some(token_file);
29
- }
30
- None
31
- }
32
- None => {
33
- debug!("Failed to get home directory.");
34
- None
35
- }
36
- }
37
-}
2
+pub(crate) mod get_smb_token;
3
+pub(crate) mod smb_token_file_path;
crates/cli/src/token/smb_token_file_path.rs
new
+23
@@ -0,0 +1,23 @@
1
+use {
2
+ dirs::home_dir,
3
+ log::debug,
4
+ smbcloud_network::environment::Environment,
5
+ std::path::{Path, PathBuf},
6
+};
7
+
8
+pub fn smb_token_file_path(env: Environment) -> Option<PathBuf> {
9
+ match home_dir() {
10
+ Some(home_path) => {
11
+ let token_path = [&env.smb_dir(), "/token"].join("");
12
+ let token_file = home_path.join(Path::new(&token_path));
13
+ if token_file.exists() && token_file.is_file() {
14
+ return Some(token_file);
15
+ }
16
+ None
17
+ }
18
+ None => {
19
+ debug!("Failed to get home directory.");
20
+ None
21
+ }
22
+ }
23
+}