Merge branch 'feature/add-secrets-env-codegen' into development

setoelkahfi · setoelkahfi · commit 0f84b6566eb1 · 2025-12-30T22:04:59.000+01:00
diff --git a/.env.example b/.env.example
@@ -0,0 +1,6 @@
+CLI_CLIENT_ID=
+SIGIT_CLIENT_ID=
+WEB_CONSOLE_CLIENT_ID=
+CLI_CLIENT_SECRET=
+SIGIT_CLIENT_SECRET=
+WEB_CONSOLE_CLIENT_SECRET=
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,4 +20,16 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
+
+      - name: Create .env file
+        run: |
+          touch .env
+          echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
+          echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
+          echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
+          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
+          echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
+          echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
+          cat .env
+
       - run: cargo test --all-features
diff --git a/.github/workflows/release-crate.yml b/.github/workflows/release-crate.yml
@@ -25,6 +25,17 @@ jobs:
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Create .env file
+        run: |
+          touch .env
+          echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
+          echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
+          echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
+          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
+          echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
+          echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
+          cat .env
+
       - name: Publish to crates.io
         uses: katyo/publish-crates@v2
         with:
diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
@@ -47,6 +47,17 @@ jobs:
       - name: Setup Cache
         uses: Swatinem/rust-cache@v2
 
+      - name: Create .env file
+        run: |
+          touch .env
+          echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
+          echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
+          echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
+          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
+          echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
+          echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
+          cat .env
+
       - name: Build Binary
         run: cargo build --verbose --locked --release --target ${{ matrix.target }}
 
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
@@ -74,6 +74,17 @@ jobs:
           targets: ${{ matrix.build.TARGET }}
           toolchain: ${{ matrix.build.TOOLCHAIN}}
 
+      - name: Create .env file
+        run: |
+          touch .env
+          echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
+          echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
+          echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
+          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
+          echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
+          echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
+          cat .env
+
       - name: Build
         env:
           GH_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }}
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@
 
 # Editor
 .zed
+
+# Secrets
+.env
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/smbcloud-networking/.gitignore b/crates/smbcloud-networking/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/crates/smbcloud-networking/Cargo.toml b/crates/smbcloud-networking/Cargo.toml
@@ -23,3 +23,4 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 smbcloud-network = { workspace = true }
 url-builder = { workspace = true }
+dotenv_codegen = "0.15"
diff --git a/crates/smbcloud-networking/src/lib.rs b/crates/smbcloud-networking/src/lib.rs
@@ -6,6 +6,9 @@ use {
     url_builder::URLBuilder,
 };
 
+#[macro_use]
+extern crate dotenv_codegen;
+
 pub fn smb_base_url_builder(env: Environment, client: &SmbClient) -> URLBuilder {
     let mut url_builder = URLBuilder::new();
     url_builder
diff --git a/crates/smbcloud-networking/src/smb_client.rs b/crates/smbcloud-networking/src/smb_client.rs
@@ -7,16 +7,16 @@ pub enum SmbClient {
 impl SmbClient {
     pub fn id(&self) -> &str {
         match self {
-            SmbClient::Cli => "CLI_CLIENT_ID",
-            SmbClient::Sigit => "SIGIT_CLIENT_ID",
-            SmbClient::WebConsole => "WEB_CONSOLE_CLIENT_ID",
+            SmbClient::Cli => dotenv!("CLI_CLIENT_ID"),
+            SmbClient::Sigit => dotenv!("SIGIT_CLIENT_ID"),
+            SmbClient::WebConsole => dotenv!("WEB_CONSOLE_CLIENT_ID"),
         }
     }
     pub fn secret(&self) -> &str {
         match self {
-            SmbClient::Cli => "CLI_CLIENT_SECRET",
-            SmbClient::Sigit => "SIGIT_CLIENT_SECRET",
-            SmbClient::WebConsole => "WEB_CONSOLE_CLIENT_SECRET",
+            SmbClient::Cli => dotenv!("CLI_CLIENT_SECRET"),
+            SmbClient::Sigit => dotenv!("SIGIT_CLIENT_SECRET"),
+            SmbClient::WebConsole => dotenv!("WEB_CONSOLE_CLIENT_SECRET"),
         }
     }
 }
diff --git a/docs/debugging.md b/docs/debugging.md
@@ -6,22 +6,24 @@ To debug the app on VSCode, use [CodeLLDB](https://marketplace.visualstudio.com/
 $ cargo debugger --package smbcloud-cli -- account signup
 ```
 
-
 ## Environment
 
 Default environment is production. To run against dev environemt:
+
 ```bash
 $ cargo run -- -e dev account login
 ```
 
 Example debug the dev environment:
+
 ```bash
 $ cargo debugger --package cli -- -e dev account login
 ```
 
 ## Run from different directory
 
 To run from a different directory, use the `--manifest-path` flag and `--package` flag. :
+
 ```bash
 $ cargo debugger --manifest-path .../path/to/smbcloud-cli/Cargo.toml --package smbcloud-cli -- -e dev account login
 ```
diff --git a/docs/development.md b/docs/development.md
@@ -15,6 +15,7 @@ $ cargo workspaces publish --publish-as-is
 ```
 
 It will ask whether should bump the vesions of the packages or not. To update version separately:
+
 ```bash
 $ cargo workspaces version
-```
+```
diff --git a/docs/gems.md b/docs/gems.md
@@ -9,4 +9,4 @@ To publish the gem with native extension, there are multiple steps to do.
 - Build the gem: `bundle exec rake compile`.
 - Update the gem version in the `gem/model/lib/model/version.rb`. Just use the same version as the `smbcloud-model` crate.
 - Compile or build the gem directly: `bundle exec rake compile` or ` bundle exec rake buid`.
-- Then publish the gem: `gem push pkg/smbcloud-model-{version}.gem`.
+- Then publish the gem: `gem push pkg/smbcloud-model-{version}.gem`.
diff --git a/gems/.keep b/gems/.keep
diff --git a/gems/model/ext/model/Cargo.toml b/gems/model/ext/model/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "model"
-version = "0.1.0"
+version = "1.0.0"
 edition = "2021"
 authors = ["paydii <hej@setoelkahfi.se>"]
 publish = false
diff --git a/gems/model/ext/model/extconf.rb b/gems/model/ext/model/extconf.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mkmf"
-require "rb_sys/mkmf"
+require 'mkmf'
+require 'rb_sys/mkmf'
 
-create_rust_makefile("model/model")
+create_rust_makefile('model/model')
diff --git a/gems/model/ext/model/src/lib.rs b/gems/model/ext/model/src/lib.rs
@@ -1,6 +1,8 @@
-use magnus::{function, prelude::*, Error, Ruby};
-use smbcloud_model::error_codes::ErrorCode;
-use strum::IntoEnumIterator;
+use {
+    magnus::{function, prelude::*, Error, Ruby},
+    smbcloud_model::error_codes::ErrorCode,
+    strum::IntoEnumIterator,
+};
 
 fn t(e: i32, l: Option<String>) -> String {
     ErrorCode::from_i32(e).message(l).to_string()
