From 208c3aa697e80c96c0e01840b86a5f9e5f176ffe Mon Sep 17 00:00:00 2001
From: franzwilhelm <franz.vonderlippe@gmail.com>
Date: Sat, 13 May 2017 15:13:56 +0200
Subject: [PATCH 1/3] add global securitydefinitions to parameters set in
 router

---
 generate/swaggergen/g_docs.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go
index a9f1c0a..2f4cb9a 100644
--- a/generate/swaggergen/g_docs.go
+++ b/generate/swaggergen/g_docs.go
@@ -184,6 +184,13 @@ func GenerateDocs(curpath string) {
 					rootapi.Schemes = strings.Split(strings.TrimSpace(s[len("@Schemes"):]), ",")
 				} else if strings.HasPrefix(s, "@Host") {
 					rootapi.Host = strings.TrimSpace(s[len("@Host"):])
+				} else if strings.HasPrefix(s, "@SecurityDefinition") {
+					if len(rootapi.SecurityDefinitions) == 0 {
+						rootapi.SecurityDefinitions = make(map[string]swagger.Security)
+					}
+					fullString := strings.TrimSpace(s[len("@SecurityDefinition"):])
+					e := strings.SplitN(fullString, " ", 4)
+					rootapi.SecurityDefinitions[e[0]] = swagger.Security{Type: e[1], Name: e[2], In: e[3]}
 				}
 			}
 		}

From ae8aea4ec40e973be6b5ae1c4da3ebfae18f5dad Mon Sep 17 00:00:00 2001
From: franzwilhelm <franz.vonderlippe@gmail.com>
Date: Sat, 13 May 2017 15:16:27 +0200
Subject: [PATCH 2/3] add security definition on controller basis

---
 generate/swaggergen/g_docs.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go
index 2f4cb9a..112b574 100644
--- a/generate/swaggergen/g_docs.go
+++ b/generate/swaggergen/g_docs.go
@@ -640,7 +640,17 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat
 						opts.Produces = append(opts.Produces, ahtml)
 					}
 				}
+			} else if strings.HasPrefix(t, "@Security") {
+				if len(opts.Security) == 0 {
+					opts.Security = make([]map[string]swagger.Security, 0)
+				}
+				fullString := strings.TrimSpace(t[len("@Security"):])
+				e := strings.SplitN(fullString, " ", 4)
+				newMap := make(map[string]swagger.Security)
+				newMap[e[0]] = swagger.Security{}
+				opts.Security = append(opts.Security, newMap)
 			}
+
 		}
 	}
 	if routerPath != "" {

From b74472d53d05948933f13381d528faab4b6a03d5 Mon Sep 17 00:00:00 2001
From: franzwilhelm <franz.vonderlippe@gmail.com>
Date: Sun, 14 May 2017 00:30:10 +0200
Subject: [PATCH 3/3] add complete securitydefinition support for oauth2,
 apiKey and basic

---
 generate/swaggergen/g_docs.go | 65 +++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go
index 112b574..024098b 100644
--- a/generate/swaggergen/g_docs.go
+++ b/generate/swaggergen/g_docs.go
@@ -188,14 +188,53 @@ func GenerateDocs(curpath string) {
 					if len(rootapi.SecurityDefinitions) == 0 {
 						rootapi.SecurityDefinitions = make(map[string]swagger.Security)
 					}
-					fullString := strings.TrimSpace(s[len("@SecurityDefinition"):])
-					e := strings.SplitN(fullString, " ", 4)
-					rootapi.SecurityDefinitions[e[0]] = swagger.Security{Type: e[1], Name: e[2], In: e[3]}
+					var out swagger.Security
+					p := getparams(strings.TrimSpace(s[len("@SecurityDefinition"):]))
+					out.Type = p[1]
+					switch out.Type {
+					case "oauth2":
+						if len(p) < 6 {
+							beeLogger.Log.Fatalf("Not enough params for oauth2: %d\n", len(p))
+						}
+						if !(p[3] == "implicit" || p[3] == "password" || p[3] == "application" || p[3] == "accessCode") {
+							beeLogger.Log.Fatalf("Unknown flow type: %s. Possible values are `implicit`, `password`, `application` or `accessCode`.\n", p[1])
+						}
+						out.AuthorizationURL = p[2]
+						out.Flow = p[3]
+						if len(p)%2 != 0 {
+							out.Description = strings.Trim(p[len(p)-1], `" `)
+						}
+						out.Scopes = make(map[string]string)
+						for i := 4; i < len(p)-1; i += 2 {
+							out.Scopes[p[i]] = strings.Trim(p[i+1], `" `)
+						}
+						break
+					case "apiKey":
+						if len(p) < 4 {
+							beeLogger.Log.Fatalf("Not enough params for apiKey: %d\n", len(p))
+						}
+						if !(p[3] == "header" || p[3] == "query") {
+							beeLogger.Log.Fatalf("Unknown in type: %s. Possible values are `query` or `header`.\n", p[4])
+						}
+						out.Name = p[2]
+						out.In = p[3]
+						if len(p) > 4 {
+							out.Description = strings.Trim(p[4], `" `)
+						}
+						break
+					case "basic":
+						if len(p) > 2 {
+							out.Description = strings.Trim(p[2], `" `)
+						}
+						break
+					default:
+						beeLogger.Log.Fatalf("Unknown security type: %s. Possible values are `oauth2`, `apiKey` or `basic`.\n", p[1])
+					}
+					rootapi.SecurityDefinitions[p[0]] = out
 				}
 			}
 		}
 	}
-
 	// Analyse controller package
 	for _, im := range f.Imports {
 		localName := ""
@@ -641,16 +680,20 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat
 					}
 				}
 			} else if strings.HasPrefix(t, "@Security") {
+				strs := make(map[string][]string)
 				if len(opts.Security) == 0 {
-					opts.Security = make([]map[string]swagger.Security, 0)
+					opts.Security = make([]map[string][]string, 0)
 				}
-				fullString := strings.TrimSpace(t[len("@Security"):])
-				e := strings.SplitN(fullString, " ", 4)
-				newMap := make(map[string]swagger.Security)
-				newMap[e[0]] = swagger.Security{}
-				opts.Security = append(opts.Security, newMap)
+				p := getparams(strings.TrimSpace(t[len("@Security"):]))
+				if len(p) == 0 {
+					beeLogger.Log.Fatalf("[%s.%s] No params for security specified\n", controllerName, funcName)
+				}
+				strs[p[0]] = make([]string, 0)
+				for i := 1; i < len(p); i++ {
+					strs[p[0]] = append(strs[p[0]], p[i])
+				}
+				opts.Security = append(opts.Security, strs)
 			}
-
 		}
 	}
 	if routerPath != "" {