pkg/models/team_members.go

@@ -115,6 +115,15 @@ func (tm *TeamMember) CheckMembership(s *xorm.Session) (exists bool, err error)
 	return exists, err
 }
 
+func (tm *TeamMember) GetMemberCount(s *xorm.Session) (memberCount int, err error) {
+	members := []TeamMember{}
+	err = s.
+		Where("team_id = ?", tm.TeamID).
+		Cols("user_id").
+		Find(&members)
+	return len(members), err
+}
+
 // Update toggles a team member's admin status
 // @Summary Toggle a team member's admin status
 // @Description If a user is team admin, this will make them member and vise-versa.

pkg/modules/auth/openid/openid.go

@@ -195,7 +195,6 @@ func HandleCallback(c echo.Context) error {
 
 	// Check if we have seen this user before
 	u, err := getOrCreateUser(s, cl, idToken.Issuer, idToken.Subject)
-
 	if err != nil {
 		_ = s.Rollback()
 		log.Errorf("Error creating new user for provider %s: %v", provider.Name, err)
@@ -203,14 +202,18 @@ func HandleCallback(c echo.Context) error {
 	}
 
 	// does the oidc token contain well formed "vikunja_groups" through vikunja_scope
-	teamData, err := getTeamDataFromToken(cl.VikunjaGroups, provider)
-	if err != nil {
-		log.Errorf("Error creating teams for user and vikunja groups %s: %v", cl.VikunjaGroups, err)
-		return handler.HandleHTTPError(err, c)
+	teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, provider)
+	if len(errs) > 0 {
+		for _, err := range errs {
+			log.Errorf("Error creating teams for user and vikunja groups %s: %v", cl.VikunjaGroups, err)
+		}
 	}
 
 	//find old teams for user through oidc
-	oldOidcTeams, _ := models.FindAllOidcTeamIDsForUser(s, u.ID)
+	oldOidcTeams, err := models.FindAllOidcTeamIDsForUser(s, u.ID)
+	if err != nil {
+		log.Errorf("No Oidc Teams found for user", err)
+	}
 	var oidcTeams []int64
 	if len(teamData) > 0 {
 		// check if we have seen these teams before.
@@ -236,7 +239,10 @@ func HandleCallback(c echo.Context) error {
 			log.Errorf("Found Error while signing out from teams %v", err)
 		}
 	}
-	SignOutFromOrDeleteTeamsByID(s, u, notIn(oldOidcTeams, oidcTeams))
+	errs = SignOutFromOrDeleteTeamsByID(s, u, utils.NotIn(oldOidcTeams, oidcTeams))
+	for _, err := range errs {
+		log.Errorf("Found Error while signing out from teams %v", err)
+	}
 	err = s.Commit()
 	if err != nil {
 		_ = s.Rollback()
@@ -358,7 +364,6 @@ func GetOrCreateTeamsByOIDCAndNames(s *xorm.Session, teamData []models.OIDCTeamD
 		}
 
 	}
-	log.Debugf("Array: %v", te)
 	return te, err
 }
 
@@ -429,23 +434,3 @@ func getOrCreateUser(s *xorm.Session, cl *claims, issuer, subject string) (u *us
 
 	return
 }
-
-// find the elements which appear in slice1,but not in slice2
-func notIn(slice1 []int64, slice2 []int64) []int64 {
-	var diff []int64
-
-	for _, s1 := range slice1 {
-		found := false
-		for _, s2 := range slice2 {
-			if s1 == s2 {
-				found = true
-				break
-			}
-		}
-		// String not found. We add it to return slice
-		if !found {
-			diff = append(diff, s1)
-		}
-	}
-	return diff
-}