Make new release

Author: Karl Wolffgang

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [1.2]
+### Added
+
+- Refresh the access token automaticaly
+
 ### Changed
 
 - the structur of the userinfo

src/main.go

@@ -16,9 +16,6 @@ type void struct{}
 
 type userState struct {
 	username          string
-	accessToken       string
-	refreshToken      string
-	expiry            time.Time
 	superuser         bool
 	readTopics        []string
 	writeTopics       []string
@@ -27,6 +24,7 @@ type userState struct {
 	updatedAt         time.Time
 	usernameIsToken   bool
 	client            *http.Client
+	token             *oauth2.Token
 }
 
 // type Topics struct {
@@ -122,17 +120,6 @@ func cacheIsValid(cache *userState) bool {
 	return false
 }
 
-func tokenNotExpired(expiredAt time.Time) bool {
-	log.Debugf("Token should expired at: %s", expiredAt.Format(time.RFC3339))
-
-	if (time.Now().Sub(expiredAt)) < 0 {
-		log.Debug("Token is still valid.")
-		return true
-	}
-
-	return false
-}
-
 func createUserWithCredentials(username, password string) bool {
 	token, err := config.PasswordCredentialsToken(context.Background(), username, password)
 
@@ -145,43 +132,39 @@ func createUserWithCredentials(username, password string) bool {
 
 	userCache[username] = userState{
 		username:     username,
-		accessToken:  token.AccessToken,
-		refreshToken: token.RefreshToken,
-		expiry:       token.Expiry,
 		superuser:    false,
 		createdAt:    time.Now(),
 		updatedAt:    time.Unix(0, 0),
 		client:       oauthClient,
+		token: 		  token,
 	}
 
 	return true
 }
 
-func createUserWithToken(token string) bool {
-	tokenSet := &oauth2.Token{
-		AccessToken: token,
+func createUserWithToken(accessToken string) bool {
+	token := &oauth2.Token{
+		AccessToken: accessToken,
 		TokenType: "Bearer",
 	}
-	client := config.Client(context.Background(), tokenSet)
+	client := config.Client(context.Background(), token)
 	info, err := getUserInfo(client)
 
 	if err != nil {
 		log.Println(err)
 		return false
 	}
 
-	userCache[token] = userState{
-		username:        token,
-		accessToken:     token,
+	userCache[accessToken] = userState{
+		username:        accessToken,
 		usernameIsToken: true,
-		refreshToken:    "",
-		expiry:          time.Unix(0, 0),
 		superuser:       info.MQTT.Superuser,
 		createdAt:       time.Now(),
 		updatedAt:       time.Now(),
 		readTopics:      info.MQTT.Topics.Read,
 		writeTopics:     info.MQTT.Topics.Write,
 		client:          client,
+		token:           token,
 	}
 
 	return true
@@ -261,8 +244,8 @@ func GetSuperuser(username string) bool {
 	}
 
 	if !cacheIsValid(&cache) {
-		if !tokenNotExpired(cache.expiry) {
-			log.Warningf("Token for user %s expired. Try to refresh.", username)
+		if !cache.token.Valid() {
+			log.Warningf("Token for user %s invalid. Try to refresh.", username)
 		}
 
 		info, err := getUserInfo(cache.client)

src/main_test.go

@@ -5,10 +5,15 @@ import (
 	"net/http/httptest"
 	"strconv"
 	"testing"
+	"time"
+	"os"
 
 	log "github.com/sirupsen/logrus"
 )
 
+// init environmental infos
+var CI bool
+
 func setupMockOAuthServer() (*httptest.Server, func()) {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/userinfo", func(w http.ResponseWriter, r *http.Request) {
@@ -92,6 +97,9 @@ func createOAuthServer(t *testing.T, duration int) (*httptest.Server, func()) {
 }
 
 func TestInit(t *testing.T) {
+	CI = (os.Getenv("DRONE") == "true")
+	log.Infof("Run the test in the ci: %t", CI)
+
 	_, closeServer := createOAuthServer(t, 0)
 	defer closeServer()
 }
@@ -233,16 +241,48 @@ func TestGetUserinfoFromCache(t *testing.T) {
 	}
 }
 
-func TestTokenExpired(t *testing.T) {
+func TestRefreshExpiredAccessTokenCredentials(t *testing.T) {
+	// hard to test. when set the expired_at in the response to a
+	// short time, the client call the refresh request instant
+	// but nobody like long tests so the test only runs on ci
+	if CI {
+		// first init plugin to create oauth server and client
+		_, closeServer := createOAuthServer(t, 0)
+		defer closeServer()
+
+		GetUser("test_superuser", "test_superuser")
+
 
+		time.Sleep(65 * time.Second)
+
+		// second try after expired
+		allowed := GetSuperuser("test_superuser")
+		if !allowed {
+			t.Errorf("Test cache check was positive")
+		}
+	}
 }
 
-func TestRefreshExpiredAccessToken(t *testing.T) {
-	// first init plugin to create oauth server and client
-	_, closeServer := createOAuthServer(t, 10)
-	defer closeServer()
+func TestRefreshExpiredAccessTokenWithoutCrediantials(t *testing.T) {
+	// hard to test. when set the expired_at in the response to a
+	// short time, the client call the refresh request instant
+	// but nobody like long tests so the test only runs on ci
+	if CI {
+		// first init plugin to create oauth server and client
+		_, closeServer := createOAuthServer(t, 0)
+		defer closeServer()
+
+		GetUser("mock_token_superuser", "")
 
-	GetUser("test_superuser", "test_superuser")
 
+		time.Sleep(65 * time.Second)
 
+		// second try after expired
+		allowed := GetSuperuser("mock_token_superuser")
+		if !allowed {
+			t.Errorf("Test cache check was positive")
+		}
+	}
 }
+
+