OAuth improvements: Also ensure tokens based on config state

1 files changed, 8 insertions, 4 deletions

diff --git a/src/server.go b/src/server.go
index b398183..69df14f 100644
--- a/src/server.go
+++ b/src/server.go
@@ -54,10 +54,14 @@ func (server *Server) Initialize(url string) error {
 	return nil
 }
 
-// FIXME: Check validity of tokens
-func (server *Server) IsAuthenticated() bool {
-	return server.OAuth != nil
-	// return GetVPNState().HasTransition(SERVER_NOT_AUTHENTICATED)
+func (server *Server) NeedsRelogin() bool {
+	// Server has no oauth tokens
+	if server.OAuth == nil {
+		return true
+	}
+
+	// Server has oauth tokens, check if they need a relogin
+	return server.OAuth.NeedsRelogin()
 }
 
 func (server *Server) GetEndpoints() error {