Small updates (#71)

.env.template

@@ -1,6 +1,4 @@
 DATABASE_URL="mysql://iam:secret@localhost:3306/iam"
 
-REDIS_URL=redis://127.0.0.1
-
 JWT_RSA_PRIVATE='-----BEGIN RSA PRIVATE KEY-----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-----END RSA PRIVATE KEY-----'
 JWT_RSA_PUBLIC='-----BEGIN PUBLIC KEY-----MIICITANBgkqhkiG9w0BAQEFAAOCAg4AMIICCQKCAgBdptOAsZZBpF7P0+79iKssZuYKq6UMVUYVHYFv2ClXAJmIMU+QXcued9oZA077BXhv5e7Lu8RXqylMNUd3hEEJjisXce3e33bcDrJZmGEljv/I3YCrNWK1LFpqd5YzossJpT+65TPxmeVipqJ65ZUpBCO3V82r3dDMx8d2CGMqOOygI1afeFxoZDVm/H1flR+uDusbB9EvYlKsiCfEGlQz/lnHiHI/bEmdeIzhpCLmRhtWxyyl6wqe07f718JdGpnPo6Aql8UtSMQRjtKcRW2G67hNXGgB7uS5y8qW8fj/fIcyePZGm8TUv3vL+wMUb6+05RN7i9BXt6Eurgok2NQGYvwforJHlCsj3aIzjTcfH3s6jkdZSj9Yho2BgtJi50qWxiWYxTTAmtVSDihjIty2h2NkzlXePWDF+iQW0bkbuYQQKzM6dLGNF0+z8t7ddlvKeqG8CI1+kZ3QR+XsKWSIhhGx+yncbxWUAzqMoLUUK9WlmQttoC8VenFSunNof2QxT+1BbYJt9ZFI5ZltTICR6K9kmRNQQ7qrdQacBsKi2SD+JVK7ESAARj9FZNvf0X78LM+H1NZACe4pT4tlObH4OwkHpl77oCmghNe49Q1CNv7d5QKesOS19kBoQYMYb+jKjKc/uj7iObwTuywX8I1d19gJeHD2XkZS9VVcHbYLUQIDAQAB-----END PUBLIC KEY-----'

Cargo.toml

@@ -17,6 +17,7 @@ default-members = [
     "iam-migration",
     "cmds",
 ]
+resolver = "2"
 
 [workspace.package]
 license-file = "./LICENSE"

cmds/src/create_iam_app.rs

@@ -14,6 +14,6 @@ async fn main() {
 
     let (id, secret) = create_app(&database, &name).await;
 
-    println!("id: {}", id.to_string());
+    println!("id: {}", id);
     println!("secret: {}", secret);
 }

deny.toml

@@ -1,13 +1,8 @@
 [advisories]
-vulnerability = "deny"
-unmaintained = "warn"
-notice = "deny"
+version = 2
 
 [licenses]
-unlicensed = "deny"
-copyleft = "warn"
-allow-osi-fsf-free = "neither"
-default = "deny"
+version = 2
 confidence-threshold = 1.0
 allow = [
     "MIT",

iam-common/Cargo.toml

@@ -9,7 +9,6 @@ chrono = { version = "0.4.23", features = ["clock"], default-features = false }
 uuid = { version = "1.2.2", features = ["v1", "rng"] }
 sea-orm = { version = "0.10.6", default-features = false, features = ["runtime-actix-rustls", "sqlx-mysql"] }
 tracing = { version = "0.1.37", default-features = false }
-redis = { version = "0.22.1", features = ["aio", "tokio-comp", "connection-manager"] }
 rand = { version = "0.8.5", default-features = false, features = ["std", "std_rng"] }
 rust-argon2 = { version = "1.0.0", default-features = false }
 bcrypt = "0.13.0"

iam-common/src/app.rs

@@ -48,6 +48,6 @@ where
 
     apps::Entity::insert(app).exec(db).await?;
 
-    let secret = BASE64_STANDARD_NO_PAD.encode(format!("{}:{}", id.to_string(), password));
+    let secret = BASE64_STANDARD_NO_PAD.encode(format!("{}:{}", id, password));
     Ok((id, secret))
 }

iam-common/src/id.rs

@@ -1,5 +1,6 @@
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
+use std::fmt::{self, Display};
 use uuid::{
     v1::{Context, Timestamp},
     Uuid,
@@ -81,10 +82,10 @@ impl Id {
     }
 }
 
-impl ToString for Id {
-    #[inline]
-    fn to_string(&self) -> String {
-        format!(
+impl Display for Id {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
             "{}-{}",
             self.get_prefix(),
             self.uuid

iam-migration/src/m20220822_190837_remove_invite_action.rs

@@ -18,7 +18,7 @@ impl MigrationTrait for Migration {
     }
 
     async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
-        todo!();
+        Ok(())
     }
 }
 

iam/src/main.rs

@@ -6,7 +6,7 @@ fn audit_filter(metadata: &tracing::Metadata<'_>) -> bool {
     if metadata.is_event() {
         return metadata.target().starts_with("audit");
     }
-    return metadata.name().starts_with("audit");
+    metadata.name().starts_with("audit")
 }
 
 #[tokio::main]

iam/src/shared.rs

@@ -1,22 +1,18 @@
 use iam_common::{database, token::Jwt};
-use rand::{rngs::StdRng, SeedableRng};
 use sea_orm::DbConn;
 use std::sync::Arc;
 
 pub trait SharedTrait: Clone + Send + Sync + 'static {
     type Db: sea_orm::ConnectionTrait + sea_orm::TransactionTrait;
     type Jwt: iam_common::token::JwtTrait;
-    type Rng: rand::Rng + Clone;
 
     fn db(&self) -> &Self::Db;
     fn jwt(&self) -> &Self::Jwt;
-    fn rng(&self) -> &Self::Rng;
 }
 
 pub struct SharedInner {
     pub db: DbConn,
     pub jwt: Jwt,
-    pub rng: StdRng,
 }
 
 #[derive(Clone)]
@@ -27,7 +23,6 @@ pub struct Shared {
 impl SharedTrait for Shared {
     type Db = DbConn;
     type Jwt = Jwt;
-    type Rng = StdRng;
 
     fn db(&self) -> &DbConn {
         &self.inner.db
@@ -36,18 +31,13 @@ impl SharedTrait for Shared {
     fn jwt(&self) -> &Jwt {
         &self.inner.jwt
     }
-
-    fn rng(&self) -> &StdRng {
-        &self.inner.rng
-    }
 }
 
 pub async fn create_shared() -> Shared {
     Shared {
         inner: Arc::new(SharedInner {
             db: database::connect().await,
             jwt: Jwt::from_env(),
-            rng: StdRng::from_entropy(),
         }),
     }
 }
@@ -57,13 +47,11 @@ pub mod mock {
     #![allow(unused)]
 
     use super::*;
-    use rand::rngs::mock::StepRng;
     use sea_orm::MockDatabase;
 
     pub struct MockSharedInner {
         db: Option<DbConn>,
         jwt: Option<Jwt>,
-        rng: Option<StepRng>,
     }
 
     #[derive(Clone)]
@@ -76,7 +64,6 @@ pub mod mock {
             MockSharedInner {
                 db: None,
                 jwt: None,
-                rng: None,
             }
         }
 
@@ -96,11 +83,6 @@ pub mod mock {
             self
         }
 
-        pub fn rng(mut self, rng: StepRng) -> Self {
-            self.rng = Some(rng);
-            self
-        }
-
         pub fn build(mut self) -> MockShared {
             MockShared {
                 inner: Arc::new(self),
@@ -111,7 +93,6 @@ pub mod mock {
     impl SharedTrait for MockShared {
         type Db = DbConn;
         type Jwt = Jwt;
-        type Rng = StepRng;
 
         fn db(&self) -> &DbConn {
             self.inner.db.as_ref().expect("database not set")
@@ -120,9 +101,5 @@ pub mod mock {
         fn jwt(&self) -> &Jwt {
             self.inner.jwt.as_ref().expect("jwt not set")
         }
-
-        fn rng(&self) -> &StepRng {
-            self.inner.rng.as_ref().expect("rng not set")
-        }
     }
 }