branchmispredictor
/
api
forked from vikunja/vikunja
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rebase errors

This commit is contained in:
branchmispredictor 2021-05-17 15:34:19 -04:00
parent 93dee49b25
commit 440e0e2b27
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/modules/auth/auth.go
View File

@ -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
}

1
pkg/modules/auth/openid/openid.go
View File

@ -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"