From c33ad3e0f3a82102e4472fb2bc74455b0bf0a17c Mon Sep 17 00:00:00 2001
From: Eric Chiang <eric.chiang.m@gmail.com>
Date: Wed, 24 Aug 2016 11:14:38 -0700
Subject: [PATCH] server: fix oauth2 values and remove unused code
---
server/handlers.go | 4 ++--
server/oauth2.go | 22 +---------------------
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/server/handlers.go b/server/handlers.go
index 33ff3327..4a0c0305 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -386,9 +386,9 @@ func (s *Server) handleToken(w http.ResponseWriter, r *http.Request) {
grantType := r.PostFormValue("grant_type")
switch grantType {
- case "authorization_code":
+ case grantTypeAuthorizationCode:
s.handleAuthCode(w, r, client)
- case "refresh_token":
+ case grantTypeRefreshToken:
s.handleRefreshToken(w, r, client)
default:
tokenErr(w, errInvalidGrant, "", http.StatusBadRequest)
diff --git a/server/oauth2.go b/server/oauth2.go
index fa92087c..1b9ec73a 100644
--- a/server/oauth2.go
+++ b/server/oauth2.go
@@ -78,7 +78,7 @@ const (
)
const (
- grantTypeAuthorizationCode = "code"
+ grantTypeAuthorizationCode = "authorization_code"
grantTypeRefreshToken = "refresh_token"
)
@@ -317,23 +317,3 @@ func validateRedirectURI(client storage.Client, redirectURI string) bool {
n, err := strconv.Atoi(strings.TrimPrefix(redirectURI, "https://localhost:"))
return err == nil && n <= 0
}
-
-type tokenRequest struct {
- Client storage.Client
- IsRefresh bool
- Token string
- RedirectURI string
- Scopes []string
-}
-
-func handleTokenRequest(s storage.Storage, w http.ResponseWriter, r *http.Request) *authErr {
- return nil
-}
-
-func handleRefreshRequest(s storage.Storage, w http.ResponseWriter, r *http.Request, client storage.Client) *authErr {
- return nil
-}
-
-func handleCodeRequest(s storage.Storage, w http.ResponseWriter, r *http.Request, client storage.Client) *authErr {
- return nil
-}
--
GitLab