@smbcloud / cli / commits / 56e33e5

Fix env variables

Seto Elkahfi committed Apr 7, 2023 at 18:50 UTC 56e33e5d4cab2b17e164e3c29e92a50e4b902c05
3 files changed +10 -7
.env.local
+3 -3
@@ -1,3 +1,3 @@
1 -GITHUB_OAUTH_CLIENT_ID=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
2 -GITHUB_OAUTH_CLIENT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
3 -GITHUB_OAUTH_REDIRECT_URI=http://localhost:8808/
\ No newline at end of file
1 +GH_OAUTH_CLIENT_ID=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
2 +GH_OAUTH_CLIENT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
3 +GH_OAUTH_REDIRECT_URI=http://localhost:8808/
\ No newline at end of file
.github/workflows/release-npm.yml
+4
@@ -9,6 +9,10 @@ jobs:
9 publish-npm-binaries:
10 name: Publish NPM packages
11 runs-on: ${{ matrix.build.os }}
12 + env:
13 + GH_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }}
14 + GH_OAUTH_CLIENT_SECRET: ${{ secrets.GH_OAUTH_CLIENT_SECRET }}
15 + GH_OAUTH_REDIRECT_URI: ${{ env.GH_OAUTH_REDIRECT_URI }}
16 strategy:
17 fail-fast: false
18 matrix:
src/account/signup/process.rs
+3 -4
@@ -288,9 +288,9 @@ fn select_github_emails(github_emails: Vec<GithubEmail>) -> Result<GithubEmail>
288 }
289
290 fn github_url_builder() -> URLBuilder {
291 - let client_id = dotenv::var("GITHUB_OAUTH_CLIENT_ID").unwrap_or("development".to_owned());
291 + let client_id = dotenv::var("GH_OAUTH_CLIENT_ID").unwrap_or("development".to_owned());
292 let redirect_uri =
293 - dotenv::var("GITHUB_OAUTH_REDIRECT_URI").unwrap_or("http://localhost:8808/".to_owned());
293 + dotenv::var("GH_OAUTH_REDIRECT_URI").unwrap_or("http://localhost:8808/".to_owned());
294 let mut url_builder = URLBuilder::new();
295 url_builder
296 .set_protocol("https")
@@ -310,8 +310,7 @@ fn build_github_oauth_url() -> String {
310 }
311
312 fn build_github_access_token_url(code: String) -> String {
313 - let client_secret =
314 - dotenv::var("GITHUB_OAUTH_CLIENT_SECRET").unwrap_or("development".to_owned());
313 + let client_secret = dotenv::var("GH_OAUTH_CLIENT_SECRET").unwrap_or("development".to_owned());
314 let mut url_builder = github_url_builder();
315 url_builder
316 .add_route("login/oauth/access_token")