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

fix

This commit is contained in:
branchmispredictor 2021-05-18 18:30:00 -04:00
parent 575414b329
commit 213a7db661
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,8 +228,8 @@ func RenewToken(s *xorm.Session, c echo.Context) (token string, err error) {
} }
return NewUserJWTAuthtoken(u) return NewUserJWTAuthtoken(u)
} }
if authProvider, ok := authProviders[claims.Type]; ok { if _, ok := authProviders[claims.Type]; ok {
return "", echo.NewHTTPError(http.StatusBadRequest, models.Message{Message: "External auth types do not use JWT tokens."} return "", echo.NewHTTPError(http.StatusBadRequest, models.Message{Message: "External auth types do not use JWT tokens."})
} }
return "", echo.NewHTTPError(http.StatusBadRequest, models.Message{Message: "Invalid JWT token."}) return "", echo.NewHTTPError(http.StatusBadRequest, models.Message{Message: "Invalid JWT token."})
} }

4
pkg/modules/auth/identityawareproxy/identityawareproxy.go
View File

@ -21,8 +21,6 @@ import (
"time" "time"
"code.vikunja.io/api/pkg/db" "code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/modules/auth" "code.vikunja.io/api/pkg/modules/auth"
"code.vikunja.io/api/pkg/user" "code.vikunja.io/api/pkg/user"
"github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go"
@ -83,7 +81,7 @@ func newIAPUserJWTAuthClaims(u *user.User) (claims *auth.AuthClaims) {
func (p IAPAuthProvider) GetUser(c echo.Context, authClaims *auth.AuthClaims) (*user.User, error) { func (p IAPAuthProvider) GetUser(c echo.Context, authClaims *auth.AuthClaims) (*user.User, error) {
// The IAP middleware already checked and created a user if needed, no need to regenerate them // The IAP middleware already checked and created a user if needed, no need to regenerate them
// Just use the authClaims provided by the middleware // Just use the authClaims provided by the middleware
u = &user.User{ u := &user.User{
ID: authClaims.UserID, ID: authClaims.UserID,
Email: authClaims.UserEmail, Email: authClaims.UserEmail,
Username: authClaims.UserUsername, Username: authClaims.UserUsername,