2 files changed
+11
-6
src/account/signup/process.rs
+8
-4
@@ -1,4 +1,5 @@
1
use std::{
2
+ env,
3
fmt::{Display, Formatter},
4
fs,
5
io::{BufRead, BufReader, Write},
@@ -289,9 +290,10 @@ fn select_github_emails(github_emails: Vec<GithubEmail>) -> Result<GithubEmail>
290
291
fn github_url_builder() -> URLBuilder {
292
let client_id =
292
- dotenv::var("GH_OAUTH_CLIENT_ID").unwrap_or("Please set GH_OAUTH_CLIENT_ID".to_owned());
293
- let redirect_uri = dotenv::var("GH_OAUTH_REDIRECT_URI")
294
- .unwrap_or("Please set GH_OAUTH_REDIRECT_URI".to_owned());
293
+ env::var("GH_OAUTH_CLIENT_ID").unwrap_or("Please set GH_OAUTH_CLIENT_ID".to_owned());
294
+ let redirect_uri =
295
+ env::var("GH_OAUTH_REDIRECT_URI").unwrap_or("Please set GH_OAUTH_REDIRECT_URI".to_owned());
296
+
297
let mut url_builder = URLBuilder::new();
298
url_builder
299
.set_protocol("https")
@@ -311,7 +313,9 @@ fn build_github_oauth_url() -> String {
313
}
314
315
fn build_github_access_token_url(code: String) -> String {
314
- let client_secret = dotenv::var("GH_OAUTH_CLIENT_SECRET").unwrap_or("development".to_owned());
316
+ let client_secret = env::var("GH_OAUTH_CLIENT_SECRET")
317
+ .unwrap_or("Please set GH_OAUTH_CLIENT_SECRET".to_owned());
318
+
319
let mut url_builder = github_url_builder();
320
url_builder
321
.add_route("login/oauth/access_token")
src/main.rs
+3
-2
@@ -1,9 +1,9 @@
1
-use std::{fs::OpenOptions, path::PathBuf, str::FromStr};
2
-
1
use anyhow::{anyhow, Result};
2
use clap::Parser;
3
use console::{style, Term};
4
use dialoguer::{theme::ColorfulTheme, Input, Password, Select};
5
+use dotenv::dotenv;
6
+use std::{fs::OpenOptions, path::PathBuf, str::FromStr};
7
8
use smbpndk_cli::{
9
account::{
@@ -50,6 +50,7 @@ fn setup_logging(level: Option<EnvFilter>) -> Result<()> {
50
51
#[tokio::main]
52
async fn main() {
53
+ dotenv().ok();
54
match run().await {
55
Ok(result) => {
56
let mut spinner = result.spinner;