go-duck-cli 1.1.24 → 1.1.26

package/generators/multitenancy.js

@@ -173,9 +173,9 @@ func TenantMiddleware(db *gorm.DB, cfg *config.Config) gin.HandlerFunc {
 		}
 
 		if len(requestedTenants) > 0 {
-			db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE role_name IN ? AND tenant_id IN ?", lowerRoles, requestedTenants).Scan(&mappings)
+			db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE LOWER(role_name) IN ? AND tenant_id IN ?", lowerRoles, requestedTenants).Scan(&mappings)
 		} else {
-			db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE role_name IN ?", lowerRoles).Scan(&mappings)
+			db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE LOWER(role_name) IN ?", lowerRoles).Scan(&mappings)
 		}
 
         if len(mappings) == 0 {
@@ -202,9 +202,22 @@ func TenantMiddleware(db *gorm.DB, cfg *config.Config) gin.HandlerFunc {
 
              c.Set("primaryRole", "fallback")
         } else {
-            // Sort by is_primary to ensure primary silo is selected as the default connection
+            isGenericRole := func(role string) bool {
+                r := strings.ToLower(role)
+                return r == "offline_access" || r == "uma_authorization" || strings.HasPrefix(r, "default-roles-")
+            }
+
+            // Sort by is_primary to ensure primary silo is selected, prioritizing dedicated roles over generic ones
             sort.Slice(mappings, func(i, j int) bool {
-                return mappings[i].IsPrimary && !mappings[j].IsPrimary
+                if mappings[i].IsPrimary != mappings[j].IsPrimary {
+                    return mappings[i].IsPrimary
+                }
+                gI := isGenericRole(mappings[i].RoleName)
+                gJ := isGenericRole(mappings[j].RoleName)
+                if gI != gJ {
+                    return !gI
+                }
+                return false
             })
 
             for _, m := range mappings {
@@ -339,15 +352,24 @@ func CreateDatabaseAndMigrate(masterDB *gorm.DB) gin.HandlerFunc {
 
 		// 3. Upsert mapping
         var existing models.TenantRole
+        isPrimary := req.IsPrimary
+        var count int64
+        masterDB.Model(&models.TenantRole{}).Where("role_name = ?", req.RoleName).Count(&count)
+        if count == 0 {
+            isPrimary = true
+        }
         if err := masterDB.Where("role_name = ? AND db_name = ?", req.RoleName, req.DBName).First(&existing).Error; err == nil {
-            existing.IsPrimary = req.IsPrimary
+            if count <= 1 {
+                isPrimary = true
+            }
+            existing.IsPrimary = isPrimary
             masterDB.Save(&existing)
         } else {
             masterDB.Create(&models.TenantRole{
                 TenantID:  uuid.New().String(),
                 RoleName:  req.RoleName,
                 DBName:    req.DBName,
-                IsPrimary: req.IsPrimary,
+                IsPrimary: isPrimary,
             })
         }
 
@@ -360,7 +382,7 @@ func CreateDatabaseAndMigrate(masterDB *gorm.DB) gin.HandlerFunc {
             migrations.RunGoNativeMigrationsForTenant(tenantDB)
         }
 
-		c.JSON(http.StatusOK, gin.H{"message": "Role silo assigned successfully", "role": req.RoleName, "primary": req.IsPrimary})
+		c.JSON(http.StatusOK, gin.H{"message": "Role silo assigned successfully", "role": req.RoleName, "primary": isPrimary})
 	}
 }
 

package/generators/security.js

@@ -174,9 +174,23 @@ func JWTMiddleware() gin.HandlerFunc {
 		if claims, ok := token.Claims.(jwt.MapClaims); ok {
 			c.Set("KeycloakID", claims["sub"])
 			c.Set("UserEmail", claims["email"])
+			
+			var allRoles []interface{}
 			if ra, ok := claims["realm_access"].(map[string]interface{}); ok {
-				c.Set("UserRoles", ra["roles"])
+				if rList, ok := ra["roles"].([]interface{}); ok {
+					allRoles = append(allRoles, rList...)
+				}
+			}
+			if resAcc, ok := claims["resource_access"].(map[string]interface{}); ok {
+				for _, clientObj := range resAcc {
+					if clientMap, ok := clientObj.(map[string]interface{}); ok {
+						if rList, ok := clientMap["roles"].([]interface{}); ok {
+							allRoles = append(allRoles, rList...)
+						}
+					}
+				}
 			}
+			c.Set("UserRoles", allRoles)
 		}
 
 		c.Next()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",