chore: move all parsing logic to internal

Author: shaj13

auth/strategies/token/parser.go

@@ -2,7 +2,8 @@ package token
 
 import (
 	"net/http"
-	"strings"
+
+	"github.com/shaj13/go-guardian/internal"
 )
 
 // Parser parse and extract token from incoming HTTP request.
@@ -19,14 +20,7 @@ func (fn tokenFn) Token(r *http.Request) (string, error) {
 // XHeaderParser return a token parser, where token extracted form "X-" header.
 func XHeaderParser(header string) Parser {
 	fn := func(r *http.Request) (string, error) {
-		val := r.Header.Get(header)
-		val = strings.TrimSpace(val)
-
-		if val == "" {
-			return "", ErrInvalidToken
-		}
-
-		return val, nil
+		return internal.ParseHeader(header, r, ErrInvalidToken)
 	}
 
 	return tokenFn(fn)
@@ -35,23 +29,7 @@ func XHeaderParser(header string) Parser {
 // AuthorizationParser return a token parser, where token extracted form Authorization header.
 func AuthorizationParser(key string) Parser {
 	fn := func(r *http.Request) (string, error) {
-		header := r.Header.Get("Authorization")
-		header = strings.TrimSpace(header)
-
-		if header == "" {
-			return "", ErrInvalidToken
-		}
-
-		token := strings.Split(header, " ")
-		if len(token) < 2 || token[0] != key {
-			return "", ErrInvalidToken
-		}
-
-		if len(token[1]) == 0 {
-			return "", ErrInvalidToken
-		}
-
-		return token[1], nil
+		return internal.ParseAuthorizationHeader(key, r, ErrInvalidToken)
 	}
 
 	return tokenFn(fn)
@@ -60,15 +38,7 @@ func AuthorizationParser(key string) Parser {
 // QueryParser return a token parser, where token extracted form HTTP query string.
 func QueryParser(key string) Parser {
 	fn := func(r *http.Request) (string, error) {
-		query := r.URL.Query()
-		token := query.Get(key)
-		token = strings.TrimSpace(token)
-
-		if token == "" {
-			return "", ErrInvalidToken
-		}
-
-		return token, nil
+		return internal.ParseQuery(key, r, ErrInvalidToken)
 	}
 
 	return tokenFn(fn)
@@ -77,18 +47,7 @@ func QueryParser(key string) Parser {
 // CookieParser return a token parser, where token extracted form HTTP Cookie.
 func CookieParser(key string) Parser {
 	fn := func(r *http.Request) (string, error) {
-		cookie, err := r.Cookie(key)
-		if err != nil {
-			return "", err
-		}
-
-		token := strings.TrimSpace(cookie.Value)
-
-		if token == "" {
-			return "", ErrInvalidToken
-		}
-
-		return token, nil
+		return internal.ParseCookie(key, r, ErrInvalidToken)
 	}
 
 	return tokenFn(fn)

internal/parse.go

@@ -0,0 +1,69 @@
+// Package internal contains support & helpers for go-guardian packages.
+package internal
+
+import (
+	"net/http"
+	"strings"
+)
+
+//ParseHeader extract specific header value or return provided error.
+func ParseHeader(header string, r *http.Request, err error) (string, error) {
+	value := r.Header.Get(header)
+	value = strings.TrimSpace(value)
+
+	if value == "" {
+		return "", err
+	}
+
+	return value, nil
+}
+
+//ParseAuthorizationHeader extract Authorization header value or return provided error.
+func ParseAuthorizationHeader(key string, r *http.Request, err error) (string, error) {
+	header := r.Header.Get("Authorization")
+	header = strings.TrimSpace(header)
+
+	if header == "" {
+		return "", err
+	}
+
+	value := strings.Split(header, " ")
+	if len(value) < 2 || value[0] != key {
+		return "", err
+	}
+
+	if len(value[1]) == 0 {
+		return "", err
+	}
+
+	return value[1], nil
+}
+
+//ParseQuery extract key value form HTTP query string  or return provided error.
+func ParseQuery(key string, r *http.Request, err error) (string, error) {
+	query := r.URL.Query()
+	value := query.Get(key)
+	value = strings.TrimSpace(value)
+
+	if value == "" {
+		return "", err
+	}
+
+	return value, nil
+}
+
+//ParseCookie extract key value form form HTTP Cookie or return provided error.
+func ParseCookie(key string, r *http.Request, e error) (string, error) {
+	cookie, err := r.Cookie(key)
+	if err != nil {
+		return "", err
+	}
+
+	value := strings.TrimSpace(cookie.Value)
+
+	if value == "" {
+		return "", e
+	}
+
+	return value, nil
+}