feat(outlook_token): store access token

Author: timonegk

internal/adapter/outlook_token/adapter.go

@@ -31,8 +31,6 @@ type ROCalendarAPI struct {
 	outlookClient ROOutlookCalendarClient
 	calendarID    string
 
-	accessToken string
-
 	logger *log.Logger
 
 	storage auth.Storage
@@ -42,6 +40,7 @@ type ROCalendarAPI struct {
 var _ port.Configurable = &ROCalendarAPI{}
 var _ port.LogSetter = &ROCalendarAPI{}
 var _ port.CalendarIDSetter = &ROCalendarAPI{}
+var _ port.StorageSetter = &ROCalendarAPI{}
 
 func (c *ROCalendarAPI) SetCalendarID(calendarID string) error {
 	if calendarID == "" {
@@ -52,7 +51,15 @@ func (c *ROCalendarAPI) SetCalendarID(calendarID string) error {
 }
 
 func (c *ROCalendarAPI) Initialize(ctx context.Context, openBrowser bool, config map[string]interface{}) error {
-	if c.accessToken == "" {
+	storedAuth, err := c.storage.ReadCalendarAuth(c.calendarID)
+	if err != nil {
+		return err
+	}
+	accessToken := ""
+	if storedAuth != nil && storedAuth.AccessToken.Expiry.After(time.Now()) {
+		c.logger.Debug("adapter is already authenticated, loading access token")
+		accessToken = storedAuth.AccessToken.AccessToken
+	} else {
 		if openBrowser {
 			c.logger.Infof("opening browser window for authentication of %s\n", c.Name())
 			err := browser.OpenURL(graphUrl)
@@ -81,13 +88,24 @@ func (c *ROCalendarAPI) Initialize(ctx context.Context, openBrowser bool, config
 			return errors.New("Access token expired")
 		}
 
-		c.accessToken = tokenString
-	} else {
-		c.logger.Debug("adapter is already authenticated, loading access token")
+		c.logger.Infof("access token valid until %v", expirationTime.Time.Format(time.RFC1123))
+
+		accessToken = tokenString
+		_, err = c.storage.WriteCalendarAuth(auth.CalendarAuth{
+			CalendarID: c.calendarID,
+			AccessToken: auth.AccessTokenObject{
+				AccessToken: accessToken,
+				Expiry:      expirationTime.Time,
+			},
+		})
+		if err != nil {
+			return err
+		}
+		c.logger.Debugf("access token stored successfully")
 	}
 
 	client := &http.Client{}
-	c.outlookClient = &ROOutlookClient{Client: client, AccessToken: c.accessToken, CalendarID: c.calendarID}
+	c.outlookClient = &ROOutlookClient{Client: client, AccessToken: accessToken, CalendarID: c.calendarID}
 	return nil
 }
 
@@ -113,3 +131,7 @@ func (c *ROCalendarAPI) Name() string {
 func (c *ROCalendarAPI) SetLogger(logger *log.Logger) {
 	c.logger = logger
 }
+
+func (c *ROCalendarAPI) SetStorage(storage auth.Storage) {
+	c.storage = storage
+}

internal/adapter/port/interface.go

@@ -18,6 +18,11 @@ type CalendarIDSetter interface {
 	SetCalendarID(calendarID string) error
 }
 
+// StorageSetter can be implemented by a struct to use persistent storage
+type StorageSetter interface {
+	SetStorage(storage auth.Storage)
+}
+
 // Configurable is an interface which defines how arbitrary configuration data can be passed
 // to a struct which implements this interface. Clients should be configurable.
 type Configurable interface {

internal/adapter/source_adapter.go

@@ -58,6 +58,10 @@ func NewSourceAdapterFromConfig(ctx context.Context, bindPort uint, openBrowser
 		}
 	}
 
+	if c, ok := client.(port.StorageSetter); ok {
+		c.SetStorage(storage)
+	}
+
 	if c, ok := client.(port.OAuth2Adapter); ok {
 		if err := c.SetupOauth2(ctx,
 			auth.Credentials{

internal/auth/storage.go

@@ -3,6 +3,7 @@ package auth
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/inovex/CalendarSync/internal/config"
 )
@@ -15,8 +16,9 @@ type Storage interface {
 }
 
 type CalendarAuth struct {
-	CalendarID string
-	OAuth2     OAuth2Object
+	CalendarID  string
+	OAuth2      OAuth2Object
+	AccessToken AccessTokenObject
 }
 
 type OAuth2Object struct {
@@ -26,6 +28,11 @@ type OAuth2Object struct {
 	TokenType    string
 }
 
+type AccessTokenObject struct {
+	AccessToken string
+	Expiry      time.Time
+}
+
 func StorageFactory(typ string) (Storage, error) {
 	switch typ {
 	case "yaml":