Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/api/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ func HandleAuth(c *gin.Context) {
// insert the user into the database
if err := _store.CreateUser(user); err != nil {
log.Error().Err(err).Msgf("cannot insert %s", user.Login)
log.Trace().Msgf("user was: %#v", user)
c.Redirect(http.StatusSeeOther, server.Config.Server.RootPath+"/login?error=internal_error")
return
}
Expand Down
6 changes: 3 additions & 3 deletions server/forge/gitea/gitea.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,16 @@ func (c *Gitea) Login(ctx context.Context, req *forge_types.OAuthRequest) (*mode

token, err := config.Exchange(oauth2Ctx, req.Code)
if err != nil {
return nil, redirectURL, err
return nil, redirectURL, fmt.Errorf("oauth2 config exchange failed: %w", err)
}

client, err := c.newClientToken(ctx, token.AccessToken)
if err != nil {
return nil, redirectURL, err
return nil, redirectURL, fmt.Errorf("client creation with new access token failed: %w", err)
}
account, _, err := client.GetMyUserInfo()
if err != nil {
return nil, redirectURL, err
return nil, redirectURL, fmt.Errorf("fetching user info failed: %w", err)
}

return &model.User{
Expand Down
6 changes: 3 additions & 3 deletions server/model/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ type User struct {
// required: true
ID int64 `json:"id" xorm:"pk autoincr 'id'"`

ForgeID int64 `json:"forge_id,omitempty" xorm:"forge_id UNIQUE(forge)"`
ForgeID int64 `json:"forge_id,omitempty" xorm:"forge_id UNIQUE(forge_id) UNIQUE(forge_login)"`

ForgeRemoteID ForgeRemoteID `json:"forge_remote_id" xorm:"forge_remote_id UNIQUE(forge)"`
ForgeRemoteID ForgeRemoteID `json:"forge_remote_id" xorm:"forge_remote_id UNIQUE(forge_id)"`

// Login is the username for this user.
//
// required: true
Login string `json:"login" xorm:"UNIQUE 'login'"`
Login string `json:"login" xorm:"'login' UNIQUE(forge_login)"`
Comment thread
anbraten marked this conversation as resolved.

// AccessToken is the oauth2 access token.
AccessToken string `json:"-" xorm:"TEXT 'access_token'"`
Expand Down