Logout - Auth Services added.

Author: raul-brainattica

controllers/auth_controller.go

@@ -1,12 +1,9 @@
 package controllers
 
 import (
-	"api.jwt.auth/core/authentication"
 	"api.jwt.auth/services"
 	"api.jwt.auth/services/models"
 	"encoding/json"
-	"fmt"
-	jwt "github.com/dgrijalva/jwt-go"
 	"net/http"
 )
 
@@ -27,21 +24,11 @@ func RefresfhToken(w http.ResponseWriter, r *http.Request, next http.HandlerFunc
 }
 
 func Logout(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
-	authBackend := authentication.InitJWTAuthenticationBackend()
-	token, err := jwt.ParseFromRequest(r, func(token *jwt.Token) (interface{}, error) {
-		return authBackend.PublicKey, nil
-	})
-	tokenString := r.Header.Get("Authorization")
-
-	err = authBackend.Logout(tokenString, token)
-
+	err := services.Logout(r)
 	w.Header().Set("Content-Type", "application/json")
 	if err != nil {
-		fmt.Println(http.StatusInternalServerError)
-		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 	} else {
-		fmt.Println(http.StatusOK)
 		w.WriteHeader(http.StatusOK)
 	}
 }

services/auth_service.go

@@ -5,6 +5,7 @@ import (
 	"api.jwt.auth/core/authentication"
 	"api.jwt.auth/services/models"
 	"encoding/json"
+	jwt "github.com/dgrijalva/jwt-go"
 	"net/http"
 )
 
@@ -30,6 +31,14 @@ func RefreshToken() []byte {
 	return response
 }
 
-/*func Logout() {
-
-}*/
+func Logout(req *http.Request) error {
+	authBackend := authentication.InitJWTAuthenticationBackend()
+	tokenRequest, err := jwt.ParseFromRequest(req, func(token *jwt.Token) (interface{}, error) {
+		return authBackend.PublicKey, nil
+	})
+	if err != nil {
+		return err
+	}
+	tokenString := req.Header.Get("Authorization")
+	return authBackend.Logout(tokenString, tokenRequest)
+}