From 9cefb4d0b9df41f749669c84ccd450473d420407 Mon Sep 17 00:00:00 2001
From: Raphael Simon <simon.raphael@gmail.com>
Date: Sun, 21 Jan 2024 10:48:21 -0800
Subject: [PATCH] Generate valid OpenAPI specifications

When security requirements are empty (needs to be empty array and not nil).
Also take into consideration metadata set at service level to generate summary.
---
 http/codegen/openapi/v2/builder.go | 14 +++++++++++++-
 http/codegen/openapi/v3/builder.go |  9 ++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/http/codegen/openapi/v2/builder.go b/http/codegen/openapi/v2/builder.go
index ddfd2fcfde..875c7300f0 100644
--- a/http/codegen/openapi/v2/builder.go
+++ b/http/codegen/openapi/v2/builder.go
@@ -258,6 +258,16 @@ func summaryFromExpr(name string, e *expr.HTTPEndpointExpr) string {
 			return mdata[0]
 		}
 	}
+	for n, mdata := range e.Service.ServiceExpr.Meta {
+		if (n == "openapi:summary" || n == "swagger:summary") && len(mdata) > 0 {
+			return mdata[0]
+		}
+	}
+	for n, mdata := range expr.Root.API.Meta {
+		if (n == "openapi:summary" || n == "swagger:summary") && len(mdata) > 0 {
+			return mdata[0]
+		}
+	}
 	return name
 }
 
@@ -623,7 +633,9 @@ func buildPathFromExpr(s *V2, root *expr.RootExpr, h *expr.HostExpr, route *expr
 				requirement[s.Hash()] = []string{}
 				switch s.Kind {
 				case expr.OAuth2Kind:
-					requirement[s.Hash()] = append(requirement[s.Hash()], req.Scopes...)
+					if len(req.Scopes) > 0 {
+						requirement[s.Hash()] = req.Scopes
+					}
 				case expr.BasicAuthKind, expr.APIKeyKind, expr.JWTKind:
 					lines := make([]string, 0, len(req.Scopes))
 					for _, scope := range req.Scopes {
diff --git a/http/codegen/openapi/v3/builder.go b/http/codegen/openapi/v3/builder.go
index bba1a1da5f..fef6cda024 100644
--- a/http/codegen/openapi/v3/builder.go
+++ b/http/codegen/openapi/v3/builder.go
@@ -213,6 +213,7 @@ func buildOperation(key string, r *expr.RouteExpr, bodies *EndpointBodies, rand
 	{
 		summary = fmt.Sprintf("%s %s", e.Name(), svc.Name())
 		setSummary(expr.Root.API.Meta)
+		setSummary(svc.ServiceExpr.Meta)
 		setSummary(r.Endpoint.Meta)
 		setSummary(m.Meta)
 	}
@@ -548,12 +549,14 @@ func buildSecurityRequirements(reqs []*expr.SecurityExpr) []map[string][]string
 	for i, req := range reqs {
 		sr := make(map[string][]string, len(req.Schemes))
 		for _, sch := range req.Schemes {
+			scopes := []string{}
 			switch sch.Kind {
-			case expr.BasicAuthKind, expr.APIKeyKind:
-				sr[sch.Hash()] = []string{}
 			case expr.OAuth2Kind, expr.JWTKind:
-				sr[sch.Hash()] = req.Scopes
+				if len(req.Scopes) > 0 {
+					scopes = req.Scopes
+				}
 			}
+			sr[sch.Hash()] = scopes
 		}
 		srs[i] = sr
 	}