tsk-17: Workflow fix

.env

@@ -1,5 +1,3 @@
-RANDOM_ENV_KEY="YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe"
-MODNAR_ENV_KEY="FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain"
 SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
 SECRET_KEY=AmIGoodEnoughForYou?
 SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
@@ -9,10 +7,5 @@ POSTGRES_MAIN_PASSWORD=password
 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}
-SOARICARUS_BASE_API_URL=https://soaricarus.com
+ICARUS_BASE_API_URL=https://icarus.com
-SOARICARUS_AUTH_BASE_API_URL=https://auth.soaricarus.com
+ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com
-APP_ENV=development
-BACKEND_PORT=8001
-FRONTEND_URL=http://localhost:4200
-RUST_LOG=debug
-ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com

.env.sample

@@ -1,5 +1,3 @@
-RANDOM_ENV_KEY="YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe"
-MODNAR_ENV_KEY="FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain"
 SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
 SECRET_KEY=AmIGoodEnoughForYou?
 SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
@@ -9,10 +7,5 @@ POSTGRES_MAIN_PASSWORD=password
 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}
-SOARICARUS_BASE_API_URL=https://soaricarus.com
+ICARUS_BASE_API_URL=https://icarus.com
-SOARICARUS_AUTH_BASE_API_URL=https://auth.soaricarus.com
+ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com
-APP_ENV=development
-BACKEND_PORT=8001
-FRONTEND_URL=http://localhost:4200
-RUST_LOG=debug
-ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com

.gitea/workflows/tag_release.yml

@@ -13,16 +13,15 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.88.0
           components: cargo
-      - uses: Swatinem/rust-cache@v2
 
       - name: Extract Version from Cargo.toml
         id: version

.gitea/workflows/workflow.yaml

@@ -1,4 +1,4 @@
-name: sienvy Build
+name: Rust Build
 
 on:
   push:
@@ -13,55 +13,50 @@ jobs:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.88.0
-      - uses: Swatinem/rust-cache@v2
       - run: cargo check
 
   test:
     name: Test Suite
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.88.0
-      - uses: Swatinem/rust-cache@v2
       - run: cargo test
 
   fmt:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.88.0
       - run: rustup component add rustfmt
-      - uses: Swatinem/rust-cache@v2
       - run: cargo fmt --all -- --check
 
   clippy:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.88.0
       - run: rustup component add clippy
-      - uses: Swatinem/rust-cache@v2
       - run: cargo clippy -- -D warnings
 
   build:
     name: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.88.0
-      - uses: Swatinem/rust-cache@v2
       - run: cargo build

Cargo.lock

@@ -3,13 +3,178 @@
 version = 4
 
 [[package]]
-name = "const_format"
+name = "async-channel"
-version = "0.2.36"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener 5.4.0",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "const_format"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
 dependencies = [
  "const_format_proc_macros",
- "konst",
 ]
 
 [[package]]
@@ -23,6 +188,12 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -30,54 +201,446 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
-name = "konst"
+name = "errno"
-version = "0.2.20"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
- "konst_macro_rules",
+ "libc",
+ "windows-sys",
 ]
 
 [[package]]
-name = "konst_macro_rules"
+name = "event-listener"
-version = "0.2.19"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.0",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
+
+[[package]]
+name = "icarus_envy"
+version = "0.3.1"
+dependencies = [
+ "async-std",
+ "const_format",
+ "dotenvy",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.172"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "log"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "3.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.106"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.46"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "sienvy"
+name = "rustix"
-version = "0.8.0"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "const_format",
+ "bitflags",
- "dotenvy",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
 ]
 
 [[package]]
-name = "unicode-ident"
+name = "rustversion"
-version = "1.0.24"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

Cargo.toml

@@ -1,11 +1,12 @@
 [package]
-name = "sienvy"
+name = "icarus_envy"
-version = "0.8.0"
+version = "0.3.1"
 edition = "2024"
-rust-version = "1.95"
+rust-version = "1.88"
 
 [dependencies]
 dotenvy = { version = "0.15.7" }
-const_format = { version = "0.2.36" }
+const_format = { version = "0.2.34" }
 
 [dev-dependencies]
+async-std = { version = "1.13.1" }

LICENSE.md

@@ -1,22 +0,0 @@
-Copyright (c) 2026 Kun Deng.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,4 +1,3 @@
-# sienvy
 This is a library used to retrieve environment variables associated with various
 icarus projects. Rather than having the various icarus projects such as icarus,
 icarus_auth, songparser, and others, have environment code, it would be more

src/environment.rs

@@ -1,106 +1,29 @@
-pub fn get_db_url() -> crate::EnvVar {
+pub async fn get_db_url() -> String {
     dotenvy::dotenv().ok();
-    let key = crate::keys::DB_URL;
+    std::env::var(crate::keys::DB_URL).expect(crate::keys::error::DB_URL)
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
 }
 
-pub fn get_secret_main_key() -> crate::EnvVar {
+pub async fn get_secret_main_key() -> String {
     dotenvy::dotenv().ok();
-    let key = crate::keys::SECRET_MAIN_KEY;
+    std::env::var(crate::keys::SECRET_MAIN_KEY).expect(crate::keys::error::SECRET_MAIN_KEY)
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
 }
 
-pub fn get_service_passphrase() -> crate::EnvVar {
+pub async fn get_service_passphrase() -> String {
     dotenvy::dotenv().ok();
-    let key = crate::keys::SERVICE_PASSPHRASE;
+    std::env::var(crate::keys::SERVICE_PASSPHRASE).expect(crate::keys::error::SERVICE_LOGIN)
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
 }
 
-pub fn get_secret_key() -> crate::EnvVar {
+pub async fn get_secret_key() -> String {
     dotenvy::dotenv().ok();
-    let key = crate::keys::SECRET_KEY;
+    std::env::var(crate::keys::SECRET_KEY).expect(crate::keys::error::SECRET_KEY)
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
 }
 
-pub fn get_root_directory() -> crate::EnvVar {
+pub async fn get_root_directory() -> String {
     dotenvy::dotenv().ok();
-    let key = crate::keys::ROOT_DIRECTORY;
+    std::env::var(crate::keys::ROOT_DIRECTORY).expect(crate::keys::error::ROOT_DIRECTORY)
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
 }
 
-pub fn get_soaricarus_base_api_url() -> crate::EnvVar {
+pub async fn get_icarus_base_api_url() -> String {
     dotenvy::dotenv().ok();
-    let key = crate::keys::SOARICARUS_BASE_API_URL;
+    std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
-}
-
-pub fn get_soaricarus_auth_base_api_url() -> crate::EnvVar {
-    dotenvy::dotenv().ok();
-    let key = crate::keys::SOARICARUS_AUTH_BASE_API_URL;
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
-}
-
-pub fn get_app_env() -> crate::EnvVar {
-    dotenvy::dotenv().ok();
-    let key = crate::keys::APP_ENV;
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
-}
-
-pub fn get_backend_port() -> crate::EnvVar {
-    dotenvy::dotenv().ok();
-    let key = crate::keys::BACKEND_PORT;
-    let value = std::env::var(key).expect(key);
-    crate::init_envvar(key, &value)
-}
-
-pub fn get_frontend_url() -> crate::EnvVar {
-    dotenvy::dotenv().ok();
-    let key = crate::keys::FRONTEND_URL;
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
-}
-
-pub fn get_rust_log() -> crate::EnvVar {
-    dotenvy::dotenv().ok();
-    let key = crate::keys::RUST_LOG;
-    let value = std::env::var(key).expect(key);
-
-    crate::init_envvar(key, &value)
-}
-
-pub fn get_allowed_origins() -> crate::EnvVar {
-    dotenvy::dotenv().ok();
-    let key = crate::keys::ALLOWED_ORIGINS;
-    let value = std::env::var(key).expect(key);
-
-    let mut envvar = crate::init_envvar(key, &value);
-    crate::init_delimiter(&mut envvar, ',');
-
-    envvar
-}
-
-/// Get environment not specified in the code
-pub fn get_env(environment: &str) -> crate::EnvVar {
-    dotenvy::dotenv().ok();
-    let my_error = format!("{environment} {}", crate::keys::error::GENERAL_ERROR);
-    let value = std::env::var(environment).expect(&my_error);
-
-    crate::init_envvar(environment, &value)
 }

src/keys.rs

@@ -1,36 +1,22 @@
-/// Environment key for Database management
+// Environment key for Database management
 pub const DB_URL: &str = "DATABASE_URL";
 
-/// Environment key for secret main key
+// Environment key for secret main key
-/// Used for the soaricarus app
+// Used for the icarus app
 pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY";
 
-/// Environment key for service logins
+// Environment key for service logins
 pub const SERVICE_PASSPHRASE: &str = "SERVICE_PASSPHRASE";
 
-/// Environment key for secret key
+// Environment key for secret key
-/// Generic use of secret key that could be found in various apps
+// Generic use of secret key that could be found in various apps
 pub const SECRET_KEY: &str = "SECRET_KEY";
 
-/// Environment key for root directory for the soaricarus app
+// Environment key for root directory for the icarus app
 pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
 
-/// Environment key for soaricarus api url
+// Environment key for icarus api url
-pub const SOARICARUS_BASE_API_URL: &str = "SOARICARUS_BASE_API_URL";
+pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL";
-
-/// Environment key for soaricarus auth api url
-pub const SOARICARUS_AUTH_BASE_API_URL: &str = "SOARICARUS_AUTH_BASE_API_URL";
-
-/// Environment key for App status
-pub const APP_ENV: &str = "APP_ENV";
-/// Environment key for backend port. Used for both auth and core functionality
-pub const BACKEND_PORT: &str = "BACKEND_PORT";
-/// Environment key for frontend url
-pub const FRONTEND_URL: &str = "FRONTEND_URL";
-/// Environment key for application logging
-pub const RUST_LOG: &str = "RUST_LOG";
-/// Environment key for allowed origins for CORS support
-pub const ALLOWED_ORIGINS: &str = "ALLOWED_ORIGINS";
 
 pub mod error {
     use const_format::concatcp;
@@ -41,13 +27,5 @@ pub mod 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 SOARICARUS_BASE_API_URL: &str =
+    pub const ICARUS_BASE_API_URL: &str = concatcp!(super::ICARUS_BASE_API_URL, " ", GENERAL_ERROR);
-        concatcp!(super::SOARICARUS_BASE_API_URL, " ", GENERAL_ERROR);
-    pub const SOARICARUS_AUTH_BASE_API_URL: &str =
-        concatcp!(super::SOARICARUS_AUTH_BASE_API_URL, " ", GENERAL_ERROR);
-    pub const APP_ENV: &str = concatcp!(super::APP_ENV, " ", GENERAL_ERROR);
-    pub const BACKEND_PORT: &str = concatcp!(super::BACKEND_PORT, " ", GENERAL_ERROR);
-    pub const FRONTEND_URL: &str = concatcp!(super::FRONTEND_URL, " ", GENERAL_ERROR);
-    pub const RUST_LOG: &str = concatcp!(super::RUST_LOG, " ", GENERAL_ERROR);
-    pub const ALLOWED_ORIGINS: &str = concatcp!(super::ALLOWED_ORIGINS, " ", GENERAL_ERROR);
 }

src/lib.rs

@@ -1,39 +1,2 @@
 pub mod environment;
 pub mod keys;
-pub mod utility;
-
-#[derive(Debug, Default, Clone)]
-pub struct EnvVar {
-    pub key: String,
-    pub value: String,
-    pub has_delimiter: bool,
-    pub delimiter: char,
-}
-
-pub fn init_envvar(key: &str, value: &str) -> EnvVar {
-    EnvVar {
-        key: key.to_string(),
-        value: value.to_string(),
-        has_delimiter: false,
-        ..Default::default()
-    }
-}
-
-pub fn init_delimiter(envvar: &mut EnvVar, delimiter: char) {
-    let mut amount_of_delimiters_found: i32 = 0;
-
-    for v in envvar.value.chars() {
-        if v == delimiter {
-            amount_of_delimiters_found += 1;
-        }
-    }
-
-    let has_delimiter = amount_of_delimiters_found >= 1;
-
-    if has_delimiter {
-        envvar.has_delimiter = has_delimiter;
-        envvar.delimiter = delimiter;
-    } else {
-        envvar.has_delimiter = has_delimiter;
-    }
-}

src/utility.rs

@@ -1,15 +0,0 @@
-/// Take the Environment variable and delimitize it. If the value has a delimiter,
-/// extract it into some strings
-pub fn delimitize(var: &crate::EnvVar) -> Result<Vec<String>, std::io::Error> {
-    if var.has_delimiter {
-        Ok(var
-            .value
-            .split(var.delimiter)
-            .map(|c| c.parse::<String>().unwrap())
-            .collect())
-    } else {
-        Err(std::io::Error::other(
-            "Environment variable does not have a delimiter",
-        ))
-    }
-}

tests/test.rs

@@ -2,9 +2,9 @@
 mod tests {
     #[test]
     fn test_dburl() {
-        let result = sienvy::environment::get_db_url();
+        let result = async_std::task::block_on(icarus_envy::environment::get_db_url());
         assert_eq!(
-            result.value, "postgres://myuser:password@localhost:5432/my_db",
+            result, "postgres://myuser:password@localhost:5432/my_db",
             "DATABASE_URL does not match {:?}",
             result
         );
@@ -12,9 +12,9 @@ mod tests {
 
     #[test]
     fn test_get_secret_main_key() {
-        let result = sienvy::environment::get_secret_main_key();
+        let result = async_std::task::block_on(icarus_envy::environment::get_secret_main_key());
         assert_eq!(
-            result.value, "Somesupersecretpassword!!!45345435",
+            result, "Somesupersecretpassword!!!45345435",
             "SECRET_MAIN_KEY does not match {:?}",
             result
         )
@@ -22,9 +22,9 @@ mod tests {
 
     #[test]
     fn test_get_service_passphrase() {
-        let result = sienvy::environment::get_service_passphrase();
+        let result = async_std::task::block_on(icarus_envy::environment::get_service_passphrase());
         assert_eq!(
-            result.value, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO",
+            result, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO",
             "SERVICE_PASSPHRASE does not match {:?}",
             result
         )
@@ -32,9 +32,9 @@ mod tests {
 
     #[test]
     fn test_get_secret_key() {
-        let result = sienvy::environment::get_secret_key();
+        let result = async_std::task::block_on(icarus_envy::environment::get_secret_key());
         assert_eq!(
-            result.value, "AmIGoodEnoughForYou?",
+            result, "AmIGoodEnoughForYou?",
             "SECRET_KEY does not match {:?}",
             result
         )
@@ -42,122 +42,21 @@ mod tests {
 
     #[test]
     fn test_get_root_directory() {
-        let result = sienvy::environment::get_root_directory();
+        let result = async_std::task::block_on(icarus_envy::environment::get_root_directory());
         assert_eq!(
-            result.value, "/path/to/root",
+            result, "/path/to/root",
             "ROOT_DIRECTORY does not match {:?}",
             result
         )
     }
 
     #[test]
-    fn test_get_soaricarus_base_api_url() {
+    fn test_get_icarus_base_api_url() {
-        let result = sienvy::environment::get_soaricarus_base_api_url();
+        let result = async_std::task::block_on(icarus_envy::environment::get_icarus_base_api_url());
         assert_eq!(
-            result.value, "https://soaricarus.com",
+            result, "https://icarus.com",
-            "SOARICARUS_BASE_API_URL does not match {:?}",
+            "ICARUS_BASE_API_URL does not match {:?}",
             result
         )
     }
-
-    #[test]
-    fn test_get_app_env() {
-        let result = sienvy::environment::get_app_env();
-        assert_eq!(
-            result.value,
-            "development",
-            "{} does not match {:?}",
-            sienvy::keys::APP_ENV,
-            result
-        )
-    }
-
-    #[test]
-    fn test_get_backend_port() {
-        let result = sienvy::environment::get_backend_port();
-        assert_eq!(
-            result.value,
-            "8001",
-            "{} does not match {:?}",
-            sienvy::keys::BACKEND_PORT,
-            result
-        )
-    }
-    #[test]
-    fn test_get_frontend_url() {
-        let result = sienvy::environment::get_frontend_url();
-        assert_eq!(
-            result.value,
-            "http://localhost:4200",
-            "{} does not match {:?}",
-            sienvy::keys::FRONTEND_URL,
-            result
-        )
-    }
-    #[test]
-    fn test_get_rust_log() {
-        let result = sienvy::environment::get_rust_log();
-        assert_eq!(
-            result.value,
-            "debug",
-            "{} does not match {:?}",
-            sienvy::keys::RUST_LOG,
-            result
-        )
-    }
-    #[test]
-    fn test_get_allowed_origins() {
-        let result = sienvy::environment::get_allowed_origins();
-        assert_eq!(
-            result.value,
-            "https://soaricarus.com,https://www.soaricarus.com",
-            "{} does not match {:?}",
-            sienvy::keys::ALLOWED_ORIGINS,
-            result
-        );
-
-        assert_eq!(
-            result.has_delimiter, true,
-            "The {} variable has an issue finding the delimiter",
-            result.key
-        );
-
-        match sienvy::utility::delimitize(&result) {
-            Ok(allowed_origins) => {
-                assert_eq!(
-                    allowed_origins.len(),
-                    2,
-                    "The amount of allowed origins does not match. {} {}",
-                    allowed_origins.len(),
-                    2
-                )
-            }
-            Err(err) => {
-                assert!(false, "Error: {:?}", err)
-            }
-        }
-    }
-
-    #[test]
-    fn test_get_env() {
-        let keys = vec![
-            (
-                "RANDOM_ENV_KEY",
-                "YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe",
-            ),
-            (
-                "MODNAR_ENV_KEY",
-                "FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain",
-            ),
-        ];
-
-        for (key, value) in keys.iter() {
-            let result = sienvy::environment::get_env(key);
-            assert_eq!(
-                result.value, *value,
-                "{:?} does not match {:?}",
-                key, result
-            )
-        }
-    }
 }