tsk-17: Add ICARUS_AUTH_BASE_API_URL env key (#18)

Closes #17

Reviewed-on: #18
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.env

@@ -1,5 +1,6 @@
 SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
 SECRET_KEY=AmIGoodEnoughForYou?
+SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
 ROOT_DIRECTORY=/path/to/root
 POSTGRES_MAIN_USER=myuser
 POSTGRES_MAIN_PASSWORD=password
@@ -7,3 +8,4 @@ POSTGRES_MAIN_DB=my_db
 POSTGRES_MAIN_HOST=localhost
 DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
 ICARUS_BASE_API_URL=https://icarus.com
+ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com

.env.sample

@@ -1,5 +1,6 @@
 SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
 SECRET_KEY=AmIGoodEnoughForYou?
+SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
 ROOT_DIRECTORY=/path/to/root
 POSTGRES_MAIN_USER=myuser
 POSTGRES_MAIN_PASSWORD=password
@@ -7,3 +8,4 @@ POSTGRES_MAIN_DB=my_db
 POSTGRES_MAIN_HOST=localhost
 DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
 ICARUS_BASE_API_URL=https://icarus.com
+ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com

.gitea/workflows/tag_release.yml

@@ -3,7 +3,10 @@ name: Release Tagging
 on:
   push:
     branches:
-      - devel
+      - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   release:

.gitea/workflows/workflow.yaml

@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - main 
-      - devel
   pull_request:
     branches:
       - main 
-      - devel
 
 jobs:
   check:
@@ -62,4 +60,3 @@ jobs:
         with:
           toolchain: 1.88.0
       - run: cargo build
-

Cargo.lock

@@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 
 [[package]]
 name = "icarus_envy"
-version = "0.2.2"
+version = "0.3.2"
 dependencies = [
  "async-std",
  "const_format",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus_envy"
-version = "0.2.2"
+version = "0.3.2"
 edition = "2024"
 rust-version = "1.88"
 

src/environment.rs

@@ -8,6 +8,11 @@ pub async fn get_secret_main_key() -> String {
     std::env::var(crate::keys::SECRET_MAIN_KEY).expect(crate::keys::error::SECRET_MAIN_KEY)
 }
 
+pub async fn get_service_passphrase() -> String {
+    dotenvy::dotenv().ok();
+    std::env::var(crate::keys::SERVICE_PASSPHRASE).expect(crate::keys::error::SERVICE_LOGIN)
+}
+
 pub async fn get_secret_key() -> String {
     dotenvy::dotenv().ok();
     std::env::var(crate::keys::SECRET_KEY).expect(crate::keys::error::SECRET_KEY)
@@ -22,3 +27,9 @@ pub async fn get_icarus_base_api_url() -> String {
     dotenvy::dotenv().ok();
     std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
 }
+
+pub async fn get_icarus_auth_base_api_url() -> String {
+    dotenvy::dotenv().ok();
+    std::env::var(crate::keys::ICARUS_AUTH_BASE_API_URL)
+        .expect(crate::keys::error::ICARUS_AUTH_BASE_API_URL)
+}

src/keys.rs

@@ -5,6 +5,9 @@ pub const DB_URL: &str = "DATABASE_URL";
 // Used for the icarus app
 pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY";
 
+// Environment key for service logins
+pub const SERVICE_PASSPHRASE: &str = "SERVICE_PASSPHRASE";
+
 // Environment key for secret key
 // Generic use of secret key that could be found in various apps
 pub const SECRET_KEY: &str = "SECRET_KEY";
@@ -15,13 +18,19 @@ pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
 // Environment key for icarus api url
 pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL";
 
+// Environment key for icarus auth api url
+pub const ICARUS_AUTH_BASE_API_URL: &str = "ICARUS_AUTH_BASE_API_URL";
+
 pub mod error {
     use const_format::concatcp;
 
     pub const GENERAL_ERROR: &str = "must not be set in enviornment file";
     pub const DB_URL: &str = concatcp!(super::DB_URL, " ", GENERAL_ERROR);
-    pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
     pub const SECRET_MAIN_KEY: &str = concatcp!(super::SECRET_MAIN_KEY, " ", GENERAL_ERROR);
+    pub const SERVICE_LOGIN: &str = concatcp!(super::SERVICE_PASSPHRASE, " ", GENERAL_ERROR);
+    pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
     pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR);
     pub const ICARUS_BASE_API_URL: &str = concatcp!(super::ICARUS_BASE_API_URL, " ", GENERAL_ERROR);
+    pub const ICARUS_AUTH_BASE_API_URL: &str =
+        concatcp!(super::ICARUS_AUTH_BASE_API_URL, " ", GENERAL_ERROR);
 }

tests/test.rs

@@ -20,6 +20,16 @@ mod tests {
         )
     }
 
+    #[test]
+    fn test_get_service_passphrase() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_service_passphrase());
+        assert_eq!(
+            result, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO",
+            "SERVICE_PASSPHRASE does not match {:?}",
+            result
+        )
+    }
+
     #[test]
     fn test_get_secret_key() {
         let result = async_std::task::block_on(icarus_envy::environment::get_secret_key());