diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-10 14:24:16 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-10 14:24:16 -0500 |
| commit | 8d5aa69950032777ea7286329d920de36aaa8a73 (patch) | |
| tree | 8a4e32401d3bc9615221ab5a31015bff842be715 /api | |
| parent | 805659239098a0b382a2a8bad704c2e91ab38ed6 (diff) | |
| parent | bd106bb4018ab71dc1bc973d562bcda3dfbb6868 (diff) | |
| download | chat-8d5aa69950032777ea7286329d920de36aaa8a73.tar.gz chat-8d5aa69950032777ea7286329d920de36aaa8a73.tar.bz2 chat-8d5aa69950032777ea7286329d920de36aaa8a73.zip | |
Merge branch 'release-3.3' RC4
Diffstat (limited to 'api')
| -rw-r--r-- | api/oauth.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/api/oauth.go b/api/oauth.go index fe2ecf166..546b0bdca 100644 --- a/api/oauth.go +++ b/api/oauth.go @@ -33,11 +33,9 @@ func InitOAuth() { BaseRoutes.OAuth.Handle("/{service:[A-Za-z0-9]+}/complete", AppHandlerIndependent(completeOAuth)).Methods("GET") BaseRoutes.OAuth.Handle("/{service:[A-Za-z0-9]+}/login", AppHandlerIndependent(loginWithOAuth)).Methods("GET") BaseRoutes.OAuth.Handle("/{service:[A-Za-z0-9]+}/signup", AppHandlerIndependent(signupWithOAuth)).Methods("GET") - BaseRoutes.OAuth.Handle("/authorize", AppHandlerTrustRequester(authorizeOAuth)).Methods("GET") - BaseRoutes.OAuth.Handle("/access_token", ApiAppHandlerTrustRequester(getAccessToken)).Methods("POST") - BaseRoutes.Root.Handle("/authorize", AppHandlerTrustRequester(authorizeOAuth)).Methods("GET") - BaseRoutes.Root.Handle("/access_token", ApiAppHandlerTrustRequester(getAccessToken)).Methods("POST") + BaseRoutes.Root.Handle("/oauth/authorize", AppHandlerTrustRequester(authorizeOAuth)).Methods("GET") + BaseRoutes.Root.Handle("/oauth/access_token", ApiAppHandlerTrustRequester(getAccessToken)).Methods("POST") // Handle all the old routes, to be later removed BaseRoutes.Root.Handle("/{service:[A-Za-z0-9]+}/complete", AppHandlerIndependent(completeOAuth)).Methods("GET") |