From 95e51a9754347c541a5aafa5af5a750b878ebad3 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@lastzero.net>
Date: Wed, 7 Oct 2020 12:47:12 +0200
Subject: [PATCH] Config: Refresh expired sessions on startup

Signed-off-by: Michael Mayer <michael@lastzero.net>
---
 internal/pro/config.go   |  7 +++++++
 internal/pro/pro_test.go | 14 +++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/internal/pro/config.go b/internal/pro/config.go
index cb6263eb9..938fa4318 100644
--- a/internal/pro/config.go
+++ b/internal/pro/config.go
@@ -8,6 +8,7 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -197,6 +198,12 @@ func (c *Config) Load() error {
 	c.Sanitize()
 	c.Propagate()
 
+	if sess, err := c.DecodeSession(); err != nil {
+		return err
+	} else if sess.Expired() {
+		return errors.New("session expired")
+	}
+
 	return nil
 }
 
diff --git a/internal/pro/pro_test.go b/internal/pro/pro_test.go
index 46c99bce4..0c243a7b8 100644
--- a/internal/pro/pro_test.go
+++ b/internal/pro/pro_test.go
@@ -124,23 +124,15 @@ func TestConfig_DecodeSession(t *testing.T) {
 	t.Run("pro3.yml", func(t *testing.T) {
 		c := NewConfig("develop", "testdata/pro3.yml")
 
-		if err := c.Load(); err != nil {
-			t.Fatal(err)
-		}
+		err := c.Load()
+
+		assert.EqualError(t, err, "session expired")
 
 		assert.Equal(t, "8dd8b115d052f91ac74b1c2475e305009366c487", c.Key)
 		assert.Equal(t, "ddf4ce46afbf6c16a6bd8555ab1e4efb", c.Secret)
 		assert.Equal(t, "7607796238c26b2d95007957b05c72d63f504346576bc2aa064a6dc54344de47d2ab38422bd1d061c067a16ef517e6054d8b7f5336c120431935518277fed45e49472aaf740cac1bc33ab2e362c767007a59e953e9973709", c.Session)
 		assert.Equal(t, "unregistered", c.Status)
 		assert.Equal(t, "develop", c.Version)
-
-		if sess, err := c.DecodeSession(); err != nil {
-			t.Fatal(err)
-		} else if sess.Expired() {
-			t.Logf("expired session: %+v", sess)
-		} else {
-			t.Errorf("session should be expired: %+v", sess)
-		}
 	})
 }