Refactor example

README.md

@@ -21,48 +21,36 @@ func protectMe(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "secured")
 }
 
-func main() {
-    authFunc := func(email string, password string) error {
-        // Hard-code a user --- this could easily be a database call, etc.
+func dontProtectMe(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "not secured")
+}
+
+func auth(email string, password string) error {
+	// Hard-code a user
 	if email != "test" || password != "test" {
 		return errors.New("invalid credentials")
 	}
 	return nil
 }
 
-    claimsFunc := func(userId string) (map[string]interface{}, error) {
+func setClaims(id string) (map[string]interface{}, error) {
 	currentTime := time.Now()
 	return map[string]interface{}{
 		"iat": currentTime.Unix(),
 		"exp": currentTime.Add(time.Minute * 60 * 24).Unix(),
-            "sub": userId,
 	}, nil
 }
 
-    verifyClaimsFunc := func(claims []byte) error {
-        currentTime := time.Now()
-        var c struct {
-            Exp int64
-            Iat int64
-            Sub string
-        }
-        err := json.Unmarshal(claims, &c)
-        if err != nil {
-            return err
-        }
-        if currentTime.After(time.Unix(c.Exp, 0)) {
-            return errors.New("this token has expired!")
-        }
-        if c.Sub != "test" {
-            return errors.New("who are you??!")
-        }
+func verifyClaims([]byte) error {
+	// We don't really care about the claims, just approve as-is
 	return nil
 }
 
+func main() {
 	config := &jwt.Config{
 		Secret: "password",
-        Auth:   authFunc,
-        Claims: claimsFunc,
+		Auth:   auth,
+		Claims: setClaims,
 	}
 
 	j, err := jwt.New(config)
@@ -71,10 +59,11 @@ func main() {
 	}
 
 	protect := http.HandlerFunc(protectMe)
+	dontProtect := http.HandlerFunc(dontProtectMe)
 
 	http.Handle("/authenticate", j.GenerateToken())
-    http.Handle("/secure", j.Secure(protect, verifyClaimsFunc))
-
+	http.Handle("/secure", j.Secure(protect, verifyClaims))
+	http.Handle("/insecure", dontProtect)
 	http.ListenAndServe(":8080", nil)
 }
 ```

examples/net-http.go

@@ -17,8 +17,7 @@ func dontProtectMe(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "not secured")
 }
 
-func main() {
-	authFunc := func(email string, password string) error {
+func auth(email string, password string) error {
 	// Hard-code a user
 	if email != "test" || password != "test" {
 		return errors.New("invalid credentials")
@@ -26,7 +25,7 @@ func main() {
 	return nil
 }
 
-	claimsFunc := func(string) (map[string]interface{}, error) {
+func setClaims(id string) (map[string]interface{}, error) {
 	currentTime := time.Now()
 	return map[string]interface{}{
 		"iat": currentTime.Unix(),
@@ -34,15 +33,16 @@ func main() {
 	}, nil
 }
 
-	verifyClaimsFunc := func([]byte) error {
+func verifyClaims([]byte) error {
 	// We don't really care about the claims, just approve as-is
 	return nil
 }
 
+func main() {
 	config := &jwt.Config{
 		Secret: "password",
-		Auth:   authFunc,
-		Claims: claimsFunc,
+		Auth:   auth,
+		Claims: setClaims,
 	}
 
 	j, err := jwt.New(config)
@@ -54,7 +54,7 @@ func main() {
 	dontProtect := http.HandlerFunc(dontProtectMe)
 
 	http.Handle("/authenticate", j.GenerateToken())
-	http.Handle("/secure", j.Secure(protect, verifyClaimsFunc))
+	http.Handle("/secure", j.Secure(protect, verifyClaims))
 	http.Handle("/insecure", dontProtect)
 	http.ListenAndServe(":8080", nil)
 }