feat: token refresh

api/joinroom.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 )
 
-func JoinRoom(userData LoginResponse, roomId string) error {
+func JoinRoom(token Token, roomId string) error {
 	request, err := http.NewRequest(
 		http.MethodPost,
 		fmt.Sprintf("https://matrix-client.matrix.org/_matrix/client/v3/rooms/%s/join", roomId),
@@ -14,7 +14,7 @@ func JoinRoom(userData LoginResponse, roomId string) error {
 	if err != nil {
 		panic(err)
 	}
-	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", userData.AccessToken))
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
 	_, err = http.DefaultClient.Do(request)
 	return err
 }

api/markread.go

@@ -15,7 +15,7 @@ type ReadReceiptRequest struct {
 	ReadPrivate string `json:"m.read.private"`
 }
 
-func SetReadReceipt(userData LoginResponse, roomId string, messageId string) error {
+func SetReadReceipt(token Token, roomId string, messageId string) error {
 	body, err := json.Marshal(ReadReceiptRequest{
 		FullyRead:   messageId,
 		Read:        messageId,
@@ -32,7 +32,7 @@ func SetReadReceipt(userData LoginResponse, roomId string, messageId string) err
 	if err != nil {
 		panic(err)
 	}
-	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", userData.AccessToken))
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
 	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return err

api/refresh.go

+package api
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/http"
+)
+
+type RefreshRequest struct {
+	RefreshToken string `json:"refresh_token"`
+}
+
+type RefreshResponse struct {
+	AccessToken  string `json:"access_token"`
+	ExpiresInMs  int    `json:"expires_in_ms"`
+	RefreshToken string `json:"refresh_token"`
+}
+
+func Refresh(refreshToken string) (RefreshResponse, error) {
+	body, err := json.Marshal(RefreshRequest{
+		RefreshToken: refreshToken,
+	})
+	if err != nil {
+		return RefreshResponse{}, err
+	}
+	resp, err := http.Post("https://matrix-client.matrix.org/_matrix/client/v3/refresh", "application/json", bytes.NewReader(body))
+	if err != nil {
+		return RefreshResponse{}, err
+	}
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return RefreshResponse{}, fmt.Errorf("request failed %d: %s", resp.StatusCode, resp.Status)
+	}
+	var responseBody RefreshResponse
+	err = json.NewDecoder(resp.Body).Decode(&responseBody)
+	return responseBody, err
+}

api/sendmessage.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 )
 
-func SendMessage(userData LoginResponse, roomId string, content interface{}) error {
+func SendMessage(token Token, roomId string, content interface{}) error {
 	transactionId, err := uuid.NewRandom()
 	if err != nil {
 		return err
@@ -29,7 +29,7 @@ func SendMessage(userData LoginResponse, roomId string, content interface{}) err
 	if err != nil {
 		panic(err)
 	}
-	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", userData.AccessToken))
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
 	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return err

api/setpusher.go

@@ -26,7 +26,7 @@ type PusherData struct {
 	Url    string `json:"url"`
 }
 
-func SetPusher(userData LoginResponse, url string) error {
+func SetPusher(token Token, url string) error {
 	body, err := json.Marshal(PusherRequest{
 		AppDisplayName: "webhook",
 		AppId:          "de.justjanne.webhook",
@@ -52,7 +52,7 @@ func SetPusher(userData LoginResponse, url string) error {
 	if err != nil {
 		panic(err)
 	}
-	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", userData.AccessToken))
+	request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
 	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return err

api/token.go

+package api
+
+import "time"
+
+type Token struct {
+	AccessToken  string
+	Expires      time.Time
+	RefreshToken string
+}

main.go

@@ -13,15 +13,11 @@ import (
 )
 
 func main() {
-	bot, err := NewMatrixBot(
-		os.Getenv("BOT_USERNAME"),
-		os.Getenv("BOT_PASSWORD"),
-		os.Getenv("BOT_DEVICEID"),
-		os.Getenv("BOT_PUSHURL"),
-	)
-	if err != nil {
-		panic(err)
-	}
+	var err error
+
+	bot := NewMatrixBot()
+
+	// !8ball handler
 	bot.HandleFunc("!8ball", func(bot *MatrixBot, notification api.Notification) error {
 		positive := []string{
 			"It is certain",
@@ -64,12 +60,14 @@ func main() {
 		}
 		answer := answers[rand.IntN(len(answers))]
 
-		err = api.SendMessage(bot.userData, notification.RoomId, api.MessageContent{
+		err = api.SendMessage(*bot.token, notification.RoomId, api.MessageContent{
 			Body:    answer,
 			MsgType: "m.text",
 		})
 		return nil
 	})
+
+	// !trains handler
 	bahnTpl, err := template.New("bahn").Parse(`{{- /*gotype: bahn.Timetable*/ -}}
 <b>{{.Station}}</b> Abfahrten
 {{- range .Stops -}}
@@ -103,12 +101,20 @@ func main() {
 		if err != nil {
 			return err
 		}
-		err = api.SendMessage(bot.userData, notification.RoomId, api.MessageContent{
+		err = api.SendMessage(*bot.token, notification.RoomId, api.MessageContent{
 			FormattedBody: buf.String(),
 			Format:        "org.matrix.custom.html",
 			MsgType:       "m.text",
 		})
 		return nil
 	})
+	err = bot.Login(os.Getenv("BOT_USERNAME"), os.Getenv("BOT_PASSWORD"), os.Getenv("BOT_DEVICEID"))
+	if err != nil {
+		panic(err)
+	}
+	err = bot.RegisterPusher(os.Getenv("BOT_PUSHURL"))
+	if err != nil {
+		panic(err)
+	}
 	bot.Serve(":8080")
 }

matrixbot.go

 package main
 
 import (
+	"fmt"
 	"git.kuschku.de/justjanne/stateless-matrix-bot/api"
 	"io"
 	"log"
 	"net/http"
 	"strings"
+	"time"
 )
 
 type MatrixBot struct {
-	userData api.LoginResponse
+	token    *api.Token
 	handlers map[string]func(bot *MatrixBot, notification api.Notification) error
 }
 
-func NewMatrixBot(
-	username string,
-	password string,
-	deviceId string,
-	url string,
-) (*MatrixBot, error) {
-	userData, err := api.Login(username, password, deviceId)
+func NewMatrixBot() *MatrixBot {
+	return &MatrixBot{
+		token:    nil,
+		handlers: make(map[string]func(bot *MatrixBot, notification api.Notification) error),
+	}
+}
+
+func (bot *MatrixBot) RefreshToken() error {
+	if bot.token == nil {
+		return fmt.Errorf("no refresh token available")
+	}
+	userData, err := api.Refresh(bot.token.RefreshToken)
 	if err != nil {
-		return nil, err
+		return err
+	}
+	bot.token = &api.Token{
+		AccessToken:  userData.AccessToken,
+		Expires:      time.Now().Add(time.Duration(userData.ExpiresInMs) / 2 * time.Millisecond),
+		RefreshToken: userData.RefreshToken,
 	}
-	err = api.SetPusher(userData, url)
+	return nil
+}
+
+func (bot *MatrixBot) Login(username string, password string, deviceId string) error {
+	userData, err := api.Login(username, password, deviceId)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return &MatrixBot{
-		userData: userData,
-		handlers: make(map[string]func(bot *MatrixBot, notification api.Notification) error),
-	}, nil
+	bot.token = &api.Token{
+		AccessToken:  userData.AccessToken,
+		Expires:      time.Now().Add(time.Duration(userData.ExpiresInMs) / 2 * time.Millisecond),
+		RefreshToken: userData.RefreshToken,
+	}
+	return nil
+}
+
+func (bot *MatrixBot) RefreshTask() {
+	for true {
+		if bot.token != nil && time.Now().After(bot.token.Expires) {
+			if err := bot.RefreshToken(); err != nil {
+				log.Printf("error refresh token: %s\n", err.Error())
+			}
+		}
+		time.Sleep(1 * time.Second)
+	}
+}
+
+func (bot *MatrixBot) RegisterPusher(url string) error {
+	return api.SetPusher(*bot.token, url)
 }
 
 func (bot *MatrixBot) HandleFunc(command string, handler func(bot *MatrixBot, notification api.Notification) error) {
@@ -39,7 +72,7 @@ func (bot *MatrixBot) HandleFunc(command string, handler func(bot *MatrixBot, no
 
 func (bot *MatrixBot) Serve(endpoint string) {
 	http.HandleFunc("/healthz", func(writer http.ResponseWriter, request *http.Request) {
-		io.WriteString(writer, "OK\n")
+		_, _ = io.WriteString(writer, "OK\n")
 	})
 	http.HandleFunc("/_matrix/push/v1/notify", func(writer http.ResponseWriter, request *http.Request) {
 		notification, err := api.ParseNotification(request.Body)
@@ -50,7 +83,7 @@ func (bot *MatrixBot) Serve(endpoint string) {
 		if notification.EventId == "" {
 			return
 		}
-		err = api.SetReadReceipt(bot.userData, notification.RoomId, notification.EventId)
+		err = api.SetReadReceipt(*bot.token, notification.RoomId, notification.EventId)
 		if err != nil {
 			log.Println(err.Error())
 			return