refactor: add method IsAuth

mgjules · Apr 11, 2022 · aa155e4 · aa155e4
1 parent 5a75e6d
commit aa155e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/middleware.go b/server/middleware.go
@@ -8,7 +8,7 @@ import (
 
 func (s *Server) unauthenticatedOnly() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		if s.spoty.Client != nil {
+		if s.spoty.IsAuth() {
 			c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"error": "you are already authenticated"})
 			return
 		}
@@ -19,7 +19,7 @@ func (s *Server) unauthenticatedOnly() gin.HandlerFunc {
 
 func (s *Server) authenticatedOnly() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		if s.spoty.Client == nil {
+		if !s.spoty.IsAuth() {
 			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "you must be authenticated to access this endpoint"})
 			return
 		}

diff --git a/spoty/spoty.go b/spoty/spoty.go
@@ -65,6 +65,10 @@ func New(clientID, clientSecret, host string, port int, cache *cache.Cache) (*Sp
 	}, nil
 }
 
+func (s *Spoty) IsAuth() bool {
+	return s.Client != nil
+}
+
 func (s *Spoty) IsPlaying() bool {
 	state, err := s.Client.PlayerState()
 	if err != nil {