Merge pull request #11 from Stratoscale/default-auth

Add default behavior for auth functions
Stratoscale · Jun 6, 2018 · addf1fa · addf1fa
2 parents 0274885 + 8418584
commit addf1fa
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/example/client/pet/mock_API.go b/example/client/pet/mock_API.go
diff --git a/example/client/store/mock_API.go b/example/client/store/mock_API.go
diff --git a/example/restapi/configure_swagger_petstore.go b/example/restapi/configure_swagger_petstore.go
diff --git a/example/restapi/mock_PetAPI.go b/example/restapi/mock_PetAPI.go
diff --git a/example/restapi/mock_StoreAPI.go b/example/restapi/mock_StoreAPI.go
diff --git a/templates/server/configureapi.gotmpl b/templates/server/configureapi.gotmpl
@@ -110,19 +110,25 @@ func Handler(c Config) (http.Handler, error) {
 	{{ range .SecurityDefinitions -}}
 	{{ if .IsBasicAuth -}}
 	api.{{ pascalize .ID }}Auth = func(user string, pass string) ({{if not ( eq .Principal "interface{}" )}}*{{ end }}{{.Principal}}, error) {
+        if c.Auth{{ pascalize .ID }} == nil {
+            return "", nil
+        }
 		return c.Auth{{ pascalize .ID }}(user, pass)
 	}
 	{{ end -}}
 	{{ if .IsAPIKeyAuth -}}
 	api.{{ pascalize .ID }}Auth = func(token string) ({{if not ( eq .Principal "interface{}" )}}*{{ end }}{{.Principal}}, error) {
+	    if c.Auth{{ pascalize .ID }} == nil {
+	        return token, nil
+	    }
 		return c.Auth{{ pascalize .ID }}(token)
 	}
 	{{ end }}
 	{{ if .IsOAuth2 -}}
-	if c.Auth == nil {
-		return nil, fmt.Errorf("Authenticator was not defined")
-	}
 	api.{{ pascalize .ID }}Auth = func(token string, scopes []string) ({{if not ( eq .Principal "interface{}" )}}*{{ end }}{{.Principal}}, error) {
+        if c.Auth{{ pascalize .ID }} == nil {
+            return token, nil
+        }
 		return c.Auth{{ pascalize .ID }}(token, scopes)
 	}
 	{{ end -}}