refactor

Author: nikhilsinhaparseable

src/handlers/http/modal/query/querier_rbac.rs

@@ -71,11 +71,11 @@ pub async fn post_user(
         }
     }
     let _guard = UPDATE_LOCK.lock().await;
-    if Users.contains(&username) && Users.contains(&username)
-        || metadata.users.iter().any(|user| match &user.ty {
-            UserType::Native(basic) => basic.username == username,
-            UserType::OAuth(_) => false, // OAuth users should be created differently
-        })
+    if Users.contains(&username)
+        || metadata
+            .users
+            .iter()
+            .any(|user| matches!(&user.ty, UserType::Native(basic) if basic.username == username))
     {
         return Err(RBACError::UserExists);
     }

src/handlers/http/rbac.rs

@@ -185,6 +185,7 @@ pub async fn post_gen_password(username: web::Path<String>) -> Result<impl Respo
 // Handler for GET /api/v1/user/{userid}/role
 // returns role for a user if that user exists
 pub async fn get_role(userid: web::Path<String>) -> Result<impl Responder, RBACError> {
+    let userid = userid.into_inner();
     if !Users.contains(&userid) {
         return Err(RBACError::UserDoesNotExist);
     };

src/rbac/user.rs

@@ -69,11 +69,7 @@ impl User {
     pub fn new_oauth(userid: String, roles: HashSet<String>, user_info: UserInfo) -> Self {
         Self {
             ty: UserType::OAuth(OAuth {
-                userid: user_info
-                    .sub
-                    .clone()
-                    .or_else(|| user_info.name.clone())
-                    .unwrap_or(userid),
+                userid: user_info.sub.clone().unwrap_or(userid),
                 user_info,
             }),
             roles,