send_invite

Author: epompeii

lib/api_auth/src/login.rs

@@ -62,7 +62,7 @@ async fn post_inner(
     let query_user = QueryUser::get_with_email(conn_lock!(context), &json_login.email)?;
     query_user.check_is_locked()?;
     #[cfg(feature = "plus")]
-    query_user.rate_limit(context)?;
+    query_user.rate_limit_auth(context)?;
 
     if let Some(invite) = &json_login.invite {
         query_user.accept_invite(conn_lock!(context), &context.token_key, invite)?;

lib/api_auth/src/oauth/mod.rs

@@ -74,7 +74,7 @@ async fn handle_oauth_user(
     let query_user = QueryUser::get_with_email(conn_lock!(context), &email);
     let (user, auth_action) = if let Ok(query_user) = query_user {
         query_user.check_is_locked()?;
-        query_user.rate_limit(context)?;
+        query_user.rate_limit_auth(context)?;
 
         if let Some(invite) = oauth_state.invite() {
             query_user.accept_invite(conn_lock!(context), &context.token_key, invite)?;
@@ -104,7 +104,7 @@ async fn handle_oauth_user(
         let invited = json_signup.invite.is_some();
         let insert_user =
             InsertUser::from_json(conn_lock!(context), &context.token_key, &json_signup)?;
-        insert_user.rate_limit(context)?;
+        insert_user.rate_limit_auth(context)?;
 
         insert_user.notify(
             log,

lib/api_auth/src/signup.rs

@@ -69,7 +69,7 @@ async fn post_inner(
     let invited = json_signup.invite.is_some();
     let insert_user = InsertUser::from_json(conn_lock!(context), &context.token_key, &json_signup)?;
     #[cfg(feature = "plus")]
-    insert_user.rate_limit(context)?;
+    insert_user.rate_limit_auth(context)?;
 
     let token = context
         .token_key

lib/api_organizations/src/members.rs

@@ -245,8 +245,8 @@ async fn post_inner(
         .rbac
         .is_allowed_organization(auth_user, Permission::CreateRole, &query_org)
         .map_err(forbidden_error)?;
-    // Check the rate limit for sending invite emails
-    auth_user.rate_limit_invite_email(context)?;
+    // Check the rate limit for sending invites
+    auth_user.rate_limit_invites(context)?;
 
     let email = json_new_member.email.clone();
     // If a user already exists for the email then direct them to login.

lib/bencher_schema/src/context/rate_limiting/mod.rs

@@ -256,11 +256,11 @@ impl RateLimiting {
         self.request.check_user(user_uuid)
     }
 
-    pub fn auth_email(&self, user_uuid: UserUuid) -> Result<(), HttpError> {
+    pub fn auth_attempt(&self, user_uuid: UserUuid) -> Result<(), HttpError> {
         self.email.check_auth(user_uuid)
     }
 
-    pub fn invite_email(&self, user_uuid: UserUuid) -> Result<(), HttpError> {
+    pub fn send_invite(&self, user_uuid: UserUuid) -> Result<(), HttpError> {
         self.email.check_invite(user_uuid)
     }
 

lib/bencher_schema/src/model/user/auth.rs

@@ -238,8 +238,8 @@ impl AuthUser {
             .collect()
     }
 
-    pub fn rate_limit_invite_email(&self, context: &ApiContext) -> Result<(), HttpError> {
-        context.rate_limiting.invite_email(self.user.uuid)
+    pub fn rate_limit_invites(&self, context: &ApiContext) -> Result<(), HttpError> {
+        context.rate_limiting.send_invite(self.user.uuid)
     }
 
     #[cfg(feature = "plus")]

lib/bencher_schema/src/model/user/mod.rs

@@ -121,8 +121,8 @@ impl QueryUser {
 
     /// Rate limit authentication attempts for this user
     #[cfg(feature = "plus")]
-    pub fn rate_limit(&self, context: &crate::ApiContext) -> Result<(), HttpError> {
-        context.rate_limiting.auth_email(self.uuid)
+    pub fn rate_limit_auth(&self, context: &crate::ApiContext) -> Result<(), HttpError> {
+        context.rate_limiting.auth_attempt(self.uuid)
     }
 
     pub fn accept_invite(
@@ -272,8 +272,8 @@ impl InsertUser {
 
     /// Rate limit authentication attempts for this user
     #[cfg(feature = "plus")]
-    pub fn rate_limit(&self, context: &crate::ApiContext) -> Result<(), HttpError> {
-        context.rate_limiting.auth_email(self.uuid)
+    pub fn rate_limit_auth(&self, context: &crate::ApiContext) -> Result<(), HttpError> {
+        context.rate_limiting.auth_attempt(self.uuid)
     }
 
     pub fn notify(