fixup remove authz_user -> user

Author: Sh099078

editoast/src/authentication.rs

@@ -84,17 +84,13 @@ pub enum State {
 }
 
 impl State {
-    pub fn user(&self) -> Option<&editoast_models::User> {
+    pub fn user(&self) -> Option<authz::User> {
         match self {
             State::Skip => None,
-            State::Authenticated { user, .. } => Some(user),
+            State::Authenticated { user, .. } => Some(authz::User(user.id)),
         }
     }
 
-    pub fn authz_user(&self) -> Option<authz::User> {
-        self.user().map(|user| authz::User(user.id))
-    }
-
     pub fn roles(&self) -> &[Role] {
         static EMPTY_ROLES: [Role; 0] = [];
         match self {

editoast/src/views/authz.rs

@@ -163,7 +163,7 @@ pub(in crate::views) async fn user_groups(
     }): State<AppState>,
 ) -> Result<Json<Vec<Group>>> {
     let user = authn_state
-        .authz_user()
+        .user()
         .ok_or(AuthorizationError::Unauthenticated)?;
     let authorizer = authn_state.authorizer(regulator.openfga(), db_pool.get().await?);
     let user_groups = authz::v2::user_groups(user)
@@ -528,7 +528,7 @@ pub(in crate::views) async fn user_grants(
     Json(body): Json<HashMap<ResourceType, Vec<i64>>>,
 ) -> Result<Json<HashMap<ResourceType, Vec<UserResourceGrant>>>> {
     let user = authn_state
-        .authz_user()
+        .user()
         .ok_or(AuthorizationError::Unauthenticated)?;
     let authorizer = authn_state.authorizer(regulator.openfga(), db_pool.get().await?);
     let mut response = HashMap::<_, Vec<UserResourceGrant>>::new();