Merge pull request #93 from tigrisdata/main

Beta release
tigrisdata · May 9, 2023 · e664add · e664add
2 parents 5056284 + 1dfda94
commit e664add
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/models/user.go b/models/user.go
@@ -424,7 +424,6 @@ func FindUsersInAudience(ctx context.Context, database *tigris.Database, instanc
 	listUsersFilter := filter.Eq("aud", aud)
 	listUsersFilter = filter.And(listUsersFilter, filter.Eq("instance_id", instanceID.String()))
 
-	listUsersFilter = filter.And(listUsersFilter, filter.Eq("app_metadata.tigris_project", tigrisProject))
 	if tigrisNamespace != "" {
 		listUsersFilter = filter.And(listUsersFilter, filter.Eq("app_metadata.tigris_namespace", tigrisNamespace))
 	}
@@ -442,10 +441,8 @@ func FindUsersInAudience(ctx context.Context, database *tigris.Database, instanc
 	var user User
 	for it.Next(&user) {
 		u := user
-		if u.AppMetaData != nil {
-			if u.AppMetaData.TigrisProject != tigrisProject {
-				continue
-			}
+		if u.AppMetaData == nil || u.AppMetaData.TigrisProject != tigrisProject {
+			continue
 		}
 		// either the project field doesn't exist - this is required for backward compatibility
 		// or it has to match the requested project name