fix: group user creation and update

devopstales · Mar 4, 2024 · 9fdd046 · 9fdd046
1 parent 7a238dd
commit 9fdd046
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/kubedash/functions/routes.py b/src/kubedash/functions/routes.py
@@ -442,6 +442,7 @@ def callback():
         if user is None:
             SSOUserCreate(username, email, user_token, "OpenID")
             SSOGroupCreateFromList(username, user_data["groups"])
+            SSOGroupsUpdateFromList(username, user_data["groups"])
             user = User.query.filter_by(username=username, user_type = "OpenID").first()
         else:
             SSOTokenUpdate(username, user_token)

diff --git a/src/kubedash/functions/user.py b/src/kubedash/functions/user.py
@@ -235,20 +235,22 @@ def SSOGroupsCreate(user_name, group_name):
         if user and not group:
             if tracer and span.is_recording():
                 span.set_attribute("group.name", group_name)
-                span.set_attribute("user.name", group_name)
+                span.set_attribute("user.name", user_name)
             group = SSOGroups(name = group_name)
-            user.sso_groups.append(group)
+            logger.debug("SSOGroupsCreate: Create %s group" % group_name)
             db.session.add(group)
             db.session.commit()
 
 def SSOGroupsUpdate(user_name, group_name):
     with tracer.start_as_current_span("update-sso-group") if tracer else nullcontext() as span:
         group = SSOGroupTest(group_name)
         user = UserTest(user_name)
-        if user and group:
+        user_not_member = SSOUserGroups.query.filter(SSOUserGroups.group_id == group.id).filter(SSOUserGroups.user_id == user.id).all()
+        if user and group and not user_not_member:
             if tracer and span.is_recording():
                 span.set_attribute("group.name", group_name)
-                span.set_attribute("user.name", group_name)
+                span.set_attribute("user.name", user_name)
+            logger.debug("SSOGroupsUpdate: Add %s user to %s group" % (user_name, group_name))
             user.sso_groups.append(group)
 
 def SSOGroupsList():