3 files changed
+7
-6
Cargo.lock
+1
@@ -1293,6 +1293,7 @@ dependencies = [
1293
"dialoguer",
1294
"dirs",
1295
"dotenvy",
1296
+ "dotenvy_macro",
1297
"home",
1298
"log",
1299
"open",
smbpndk-cli/Cargo.toml
+1
@@ -27,6 +27,7 @@ console = "0.15.0"
27
dialoguer = "0.10.4"
28
dirs = "4.0.0"
29
dotenvy = "0.15"
30
+dotenvy_macro = "0.15"
31
home = "0.5.4"
32
log = "0.4.14"
33
open = "4.0.1"
smbpndk-cli/src/account/lib.rs
+5
-6
@@ -1,6 +1,7 @@
1
use super::{model::User, signup::GithubEmail};
2
use anyhow::{anyhow, Result};
3
use console::style;
4
+use dotenvy_macro::dotenv;
5
use log::debug;
6
use regex::Regex;
7
use reqwest::{Client, Response, StatusCode};
@@ -106,7 +107,7 @@ pub async fn authorize_github() -> Result<SmbAuthorization> {
107
}
108
109
fn setup_oauth_callback_server(tx: Sender<String>) {
109
- let port = env::var("GH_OAUTH_REDIRECT_PORT").expect("Please set GH_OAUTH_REDIRECT_PORT");
110
+ let port = dotenv!("GH_OAUTH_REDIRECT_PORT", "Please set GH_OAUTH_REDIRECT_PORT");
111
let listener = TcpListener::bind(format!("127.0.0.1:{}", port)).unwrap();
112
for stream in listener.incoming() {
113
let stream = stream.unwrap();
@@ -218,11 +219,9 @@ fn build_github_oauth_url() -> String {
219
}
220
221
fn github_base_url_builder() -> URLBuilder {
221
- let client_id = env::var("GH_OAUTH_CLIENT_ID").expect("Please set GH_OAUTH_CLIENT_ID");
222
- let redirect_host =
223
- env::var("GH_OAUTH_REDIRECT_HOST").expect("Please set GH_OAUTH_REDIRECT_HOST");
224
- let redirect_port =
225
- env::var("GH_OAUTH_REDIRECT_PORT").expect("Please set GH_OAUTH_REDIRECT_PORT");
222
+ let client_id = dotenv!("GH_OAUTH_CLIENT_ID", "Please set GH_OAUTH_CLIENT_ID");
223
+ let redirect_host = dotenv!("GH_OAUTH_REDIRECT_HOST", "Please set GH_OAUTH_REDIRECT_HOST");
224
+ let redirect_port = dotenv!("GH_OAUTH_REDIRECT_PORT", "Please set GH_OAUTH_REDIRECT_PORT");
225
let redirect_url = format!("{}:{}", &redirect_host, &redirect_port);
226
227
let mut url_builder = URLBuilder::new();