5 files changed
+16
-8
smbpndk-cli/src/account/lib.rs
+2
-3
@@ -2,7 +2,7 @@ use anyhow::{anyhow, Result};
2
use console::style;
3
use log::debug;
4
use regex::Regex;
5
-use reqwest::{Client, StatusCode, Response};
5
+use reqwest::{Client, Response, StatusCode};
6
use serde::{Deserialize, Serialize};
7
8
use serde_repr::Deserialize_repr;
@@ -237,7 +237,6 @@ fn github_base_url_builder() -> URLBuilder {
237
url_builder
238
}
239
240
-
240
pub async fn save_token(response: &Response) -> Result<CommandResult> {
241
let headers = response.headers();
242
println!("Headers: {:#?}", &headers);
@@ -274,4 +273,4 @@ pub async fn save_token(response: &Response) -> Result<CommandResult> {
273
return Err(error);
274
}
275
}
277
-}
\ No newline at end of file
276
+}
smbpndk-cli/src/account/login/process.rs
+1
-1
@@ -1,6 +1,6 @@
1
use crate::account::{
2
forgot::{Param, UserUpdatePassword},
3
- lib::{authorize_github, ErrorCode, GithubInfo, SmbAuthorization, save_token},
3
+ lib::{authorize_github, save_token, ErrorCode, GithubInfo, SmbAuthorization},
4
model::{Data, Status, User},
5
signup::{
6
do_signup, GithubEmail, Provider, SignupGithubParams, SignupMethod, SignupUserGithub,
smbpndk-networking-project/src/lib.rs
+10
-1
@@ -73,7 +73,7 @@ pub async fn delete_project(id: String) -> Result<()> {
73
let token = get_token().await.unwrap();
74
75
let response = Client::new()
76
- .delete(build_project_url())
76
+ .delete(build_delete_project_url(id))
77
.header("Authorization", token)
78
.send()
79
.await?;
@@ -87,8 +87,17 @@ pub async fn delete_project(id: String) -> Result<()> {
87
}
88
}
89
90
+// Private functions
91
+
92
fn build_project_url() -> String {
93
let mut url_builder = smb_base_url_builder();
94
url_builder.add_route("v1/projects");
95
url_builder.build()
96
}
97
+
98
+fn build_delete_project_url(id: String) -> String {
99
+ let mut url_builder = smb_base_url_builder();
100
+ url_builder.add_route("v1/projects");
101
+ url_builder.add_route(id.as_str());
102
+ url_builder.build()
103
+}
smbpndk-networking/Cargo.toml
+2
-2
@@ -15,10 +15,10 @@ categories = ["command-line-utilities", "command-line-interface", "cryptography:
15
anyhow = "1.0.58"
16
async-trait = { version = "0.1.51", optional = true }
17
dirs = "4.0.0"
18
-home = "0.5.4"
19
-log = "0.4.14"
18
dotenvy = "0.15"
19
dotenvy_macro = "0.15"
20
+home = "0.5.4"
21
+log = "0.4.14"
22
maybe-async = { version = "0.2", features = ["is_sync"] }
23
reqwest = { version = "0.11", features = ["json"] }
24
serde = { version = "1", features = ["derive"] }
smbpndk-networking/src/lib.rs
+1
-1
@@ -1,9 +1,9 @@
1
pub mod constants;
2
3
use anyhow::{anyhow, Result};
4
+use dotenvy_macro::dotenv;
5
use log::debug;
6
use url_builder::URLBuilder;
6
-use dotenvy_macro::dotenv;
7
8
pub async fn get_token() -> Result<String> {
9
if let Some(mut path) = dirs::home_dir() {