go-duck-cli 1.1.32 → 1.1.36

package/generators/devops.js

@@ -363,6 +363,17 @@ jobs:
                 "publicClient": false,
                 "protocol": "openid-connect",
                 "fullScopeAllowed": true
+            },
+            {
+                "clientId": "go-client",
+                "enabled": true,
+                "publicClient": true,
+                "standardFlowEnabled": true,
+                "directAccessGrantsEnabled": true,
+                "protocol": "openid-connect",
+                "redirectUris": ["*"],
+                "webOrigins": ["*"],
+                "fullScopeAllowed": true
             }
         ],
         "users": [

package/generators/kratos.js

@@ -217,6 +217,8 @@ find api -name "*.proto" -exec protoc --proto_path=. \\
 echo "✅ Protos compiled successfully!"
 `;
     const generateBat = `@echo off
+setlocal enabledelayedexpansion
+
 echo 🦆 Syncing Protobuf Dependencies...
 if not exist "third_party\\google\\api" mkdir "third_party\\google\\api"
 curl -sSL https://raw.githubusercontent.com/googleapis/googleapis/master/google/api/annotations.proto > third_party\\google\\api\\annotations.proto
@@ -230,7 +232,13 @@ if %errorlevel% neq 0 (
 )
 
 for /f "tokens=*" %%f in ('dir /b /s api\\*.proto') do (
-    protoc --proto_path=. --proto_path=./api --proto_path=./third_party --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. "%%f"
+    set "abspath=%%f"
+    set "relpath=!abspath:%CD%\\=!"
+    protoc --proto_path=. --proto_path=./api --proto_path=./third_party --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. "!relpath!"
+    if !errorlevel! neq 0 (
+        echo ❌ Error: Failed to compile !relpath!
+        exit /b 1
+    )
 )
 
 echo ✅ Protos compiled successfully!
@@ -302,7 +310,11 @@ func TenantServerInterceptor(conf *config.Config, db *gorm.DB) middleware.Middle
 
             var mappings []models.TenantRole
             if requestedTenant != "" {
-                db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE LOWER(role_name) IN ? AND tenant_id = ?", lowerRoles, requestedTenant).Scan(&mappings)
+                if isAdmin {
+                    db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE tenant_id = ?", requestedTenant).Scan(&mappings)
+                } else {
+                    db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE LOWER(role_name) IN ? AND tenant_id = ?", lowerRoles, requestedTenant).Scan(&mappings)
+                }
             } else {
                 db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE LOWER(role_name) IN ?", lowerRoles).Scan(&mappings)
             }
@@ -310,6 +322,16 @@ func TenantServerInterceptor(conf *config.Config, db *gorm.DB) middleware.Middle
             siloConnections := make(map[string]*gorm.DB)
             mongoConnections := make(map[string]*mongo.Database)
 
+            // Filter out unauthorized mappings (e.g. admin_db for non-admins)
+            var authorizedMappings []models.TenantRole
+            for _, m := range mappings {
+                if m.DBName == "admin_db" && !isAdmin {
+                    continue
+                }
+                authorizedMappings = append(authorizedMappings, m)
+            }
+            mappings = authorizedMappings
+
             if len(mappings) == 0 {
                 conn, _ := mgr.GetDB(fallbackDB)
                 siloConnections["fallback"] = conn
@@ -343,7 +365,6 @@ func TenantServerInterceptor(conf *config.Config, db *gorm.DB) middleware.Middle
                 })
 
                 for _, m := range mappings {
-                    if m.DBName == "admin_db" && !isAdmin { continue }
                     if conn, err := mgr.GetDB(m.DBName); err == nil {
                         siloConnections[m.RoleName] = conn
                     }

package/generators/multitenancy.js

@@ -173,11 +173,25 @@ 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 LOWER(role_name) IN ? AND tenant_id IN ?", lowerRoles, requestedTenants).Scan(&mappings)
+			if isAdmin {
+				db.Raw("SELECT role_name, db_name, is_primary FROM tenant_roles WHERE tenant_id IN ?", requestedTenants).Scan(&mappings)
+			} else {
+				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 LOWER(role_name) IN ?", lowerRoles).Scan(&mappings)
 		}
 
+		// Filter out unauthorized mappings (e.g. admin_db for non-admins)
+		var authorizedMappings []models.TenantRole
+		for _, m := range mappings {
+			if m.DBName == "admin_db" && !isAdmin {
+				continue
+			}
+			authorizedMappings = append(authorizedMappings, m)
+		}
+		mappings = authorizedMappings
+
         if len(mappings) == 0 {
              conn, err := mgr.GetDB(fallbackDB)
              if err != nil || conn == nil {
@@ -221,7 +235,6 @@ func TenantMiddleware(db *gorm.DB, cfg *config.Config) gin.HandlerFunc {
             })
 
             for _, m := range mappings {
-                if m.DBName == "admin_db" && !isAdmin { continue }
                 conn, err := mgr.GetDB(m.DBName)
                 if err == nil {
                     siloConnections[m.RoleName] = conn

package/package.json

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