Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-23 20:35:24 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(be): do not return error if update session returns no rows.

Browse Source
This commit is contained in:
Denis Gukov 2020-12-05 23:28:22 +05:00
parent fd1d42782b
commit f3a786c684
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/sql/SqlDb.go
View File

@ -115,7 +115,6 @@ func (d *SqlDb) applyMigration(version *Version) error {
return tx.Commit()
}
// TryRollback attempts to rollback the database to an earlier version if a rollback exists
func (d *SqlDb) tryRollbackMigration(version *Version) {
fmt.Printf("Rolling back %s (time: %v)...\n", version.HumanoidVersion(), time.Now())
@ -342,7 +341,6 @@ func (d *SqlDb) SetUserPassword(userID int, password string) error {
return err
}
func (d *SqlDb) CreateProjectUser(projectUser db.ProjectUser) (newProjectUser db.ProjectUser, err error) {
_, err = d.sql.Exec("insert into project__user (project_id, user_id, `admin`) values (?, ?, ?)",
projectUser.ProjectID,
@ -377,7 +375,6 @@ func (d *SqlDb) CreateEvent(evt db.Event) (newEvent db.Event, err error) {
return
}
func (d *SqlDb) DeleteProjectUser(projectID, userID int) error {
_, err := d.sql.Exec("delete from project__user where user_id=? and project_id=?", userID, projectID)
return err
@ -440,14 +437,12 @@ func (d *SqlDb) Sql() *gorp.DbMap {
return d.sql
}
func (d *SqlDb) CreateAPIToken(token db.APIToken) (db.APIToken, error) {
token.Created = db.GetParsedTime(time.Now())
err := d.sql.Insert(&token)
return token, err
}
func (d *SqlDb) GetAPIToken(tokenID string) (token db.APIToken, err error) {
err = d.sql.SelectOne(&token, "select * from user__token where id=? and expired=0", tokenID)
@ -480,10 +475,10 @@ func (d *SqlDb) ExpireSession(userID int, sessionID int) error {
return validateMutationResult(res, err)
}
func (d *SqlDb) TouchSession(userID int, sessionID int) error{
res, err := d.sql.Exec("update session set last_active=? where id=? and user_id=?", time.Now(), sessionID, userID)
func (d *SqlDb) TouchSession(userID int, sessionID int) error {
_, err := d.sql.Exec("update session set last_active=? where id=? and user_id=?", time.Now(), sessionID, userID)
return validateMutationResult(res, err)
return err
}
func (d *SqlDb) GetAPITokens(userID int) (tokens []db.APIToken, err error) {