From 3cf6a5b9641bf9ad0a6da4ec7e483144c23f2cc5 Mon Sep 17 00:00:00 2001
From: Vishnu Jayadevan <vishnu@deepsource.io>
Date: Thu, 12 Oct 2023 14:59:45 +0530
Subject: [PATCH] fix: fix minor issue in rqlite store

---
 auth/oauth/handler.go        | 4 ++--
 auth/store/rqlite/session.go | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/auth/oauth/handler.go b/auth/oauth/handler.go
index 1d4c2c0..c7ed76e 100644
--- a/auth/oauth/handler.go
+++ b/auth/oauth/handler.go
@@ -32,7 +32,7 @@ func NewHandler(service *Service) *Handler {
 func (h *Handler) HandleAuthorize(c echo.Context) error {
 	req, err := contract.NewAuthorizationRequest(c)
 	if err != nil {
-		return err
+		return httperror.ErrBadRequest(err)
 	}
 	url, err := h.service.GetAuthorizationURL(req)
 	if err != nil {
@@ -45,7 +45,7 @@ func (h *Handler) HandleAuthorize(c echo.Context) error {
 func (h *Handler) HandleCallback(c echo.Context) error {
 	req, err := NewCallbackRequest(c)
 	if err != nil {
-		return err
+		return httperror.ErrBadRequest(err)
 	}
 
 	session, err := h.service.CreateSession(req)
diff --git a/auth/store/rqlite/session.go b/auth/store/rqlite/session.go
index 60110d7..7fb475e 100644
--- a/auth/store/rqlite/session.go
+++ b/auth/store/rqlite/session.go
@@ -26,6 +26,7 @@ func (s *SessionStore) Create(session *session.Session) error {
 	if err != nil {
 		return fmt.Errorf("persistence/rqlite: failed to build query for insert: %w", err)
 	}
+
 	_, err = s.db.WriteOneParameterized(
 		gorqlite.ParameterizedStatement{
 			Query:     query,
@@ -44,7 +45,7 @@ func (s *SessionStore) Update(session *session.Session) error {
 		Set("code", session.Code).
 		Set("backend_token", session.BackendToken).
 		Set("runner_access_token", session.RunnerAccessToken).
-		Set("runner_access_token_expires_at", session.RunnerTokenExpiry).
+		Set("runner_token_expiry", session.RunnerTokenExpiry).
 		Set("runner_refresh_token", session.RunnerRefreshToken).
 		Where(squirrel.Eq{"id": session.ID})
 	query, args, err := builder.ToSql()