go-duck-cli 1.1.24 → 1.1.25

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 {

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.25",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",