From 440e0e2b2747efe723da4e08fffe028215d02f6f Mon Sep 17 00:00:00 2001
From: branchmispredictor <msm595dev@gmail.com>
Date: Mon, 17 May 2021 15:34:19 -0400
Subject: [PATCH] Fix rebase errors

---
 pkg/modules/auth/auth.go          | 2 +-
 pkg/modules/auth/openid/openid.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/modules/auth/auth.go b/pkg/modules/auth/auth.go
index fd03edffe7..302b9f99ef 100644
--- a/pkg/modules/auth/auth.go
+++ b/pkg/modules/auth/auth.go
@@ -216,7 +216,7 @@ func RenewToken(s *xorm.Session, c echo.Context) (token string, err error) {
 		}
 		share := &models.LinkSharing{}
 		share.ID = oldShare.ID
-		err = share.ReadOne(s)
+		err = share.ReadOne(s, share)
 		if err != nil {
 			return "", err
 		}
diff --git a/pkg/modules/auth/openid/openid.go b/pkg/modules/auth/openid/openid.go
index 8ba382aea2..b445b0c0b9 100644
--- a/pkg/modules/auth/openid/openid.go
+++ b/pkg/modules/auth/openid/openid.go
@@ -30,6 +30,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/auth"
+	"code.vikunja.io/api/pkg/user"
 	"github.com/coreos/go-oidc"
 	"github.com/labstack/echo/v4"
 	"golang.org/x/oauth2"