github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(auth): move oauth handler under auth

pull/2749/head
Chaim Lev Ari 2019-01-16 17:24:58 +02:00
parent f6bdc5c2b3
commit 4cbde7bb0d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/http/handler/auth/handler.go
View File

@ -37,10 +37,11 @@ func NewHandler(bouncer *security.RequestBouncer, rateLimiter *security.RateLimi
Router: mux.NewRouter(), Router: mux.NewRouter(),
authDisabled: authDisabled, authDisabled: authDisabled,
} }
h.Handle("/auth/oauth",
rateLimiter.LimitAccess(bouncer.PublicAccess(httperror.LoggerHandler(h.authenticateOAuth)))).Methods(http.MethodPost)
h.Handle("/auth", h.Handle("/auth",
rateLimiter.LimitAccess(bouncer.PublicAccess(httperror.LoggerHandler(h.authenticate)))).Methods(http.MethodPost) rateLimiter.LimitAccess(bouncer.PublicAccess(httperror.LoggerHandler(h.authenticate)))).Methods(http.MethodPost)
h.Handle("/oauth",
rateLimiter.LimitAccess(bouncer.PublicAccess(httperror.LoggerHandler(h.authenticateOAuth)))).Methods(http.MethodPost)
return h return h
} }

2
app/extensions/oauth/__module.js
View File

@ -1,2 +1,2 @@
angular.module('portainer.extensions.oauth', ['ngResource']) angular.module('portainer.extensions.oauth', ['ngResource'])
.constant('API_ENDPOINT_OAUTH', 'api/oauth'); .constant('API_ENDPOINT_OAUTH', 'api/auth/oauth');