Rename token fields (#4471)

Co-authored-by: Anbraten <6918444+anbraten@users.noreply.github.com>
This commit is contained in:
qwerty287 2024-11-28 10:27:28 +02:00 committed by GitHub
parent de82236aee
commit 6f7f7692e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 44 additions and 2 deletions

View file

@ -44,10 +44,10 @@ type User struct {
Login string `json:"login" xorm:"UNIQUE 'login'"`
// AccessToken is the oauth2 access token.
AccessToken string `json:"-" xorm:"TEXT 'token'"`
AccessToken string `json:"-" xorm:"TEXT 'access_token'"`
// RefreshToken is the oauth2 refresh token.
RefreshToken string `json:"-" xorm:"TEXT 'secret'"`
RefreshToken string `json:"-" xorm:"TEXT 'refresh_token'"`
// Expiry is the AccessToken expiration timestamp (unix seconds).
Expiry int64 `json:"-" xorm:"expiry"`

View file

@ -0,0 +1,41 @@
// Copyright 2024 Woodpecker Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package migration
import (
"src.techknowlogick.com/xormigrate"
"xorm.io/xorm"
)
var renameTokenFields = xormigrate.Migration{
ID: "rename-token-fields",
MigrateSession: func(sess *xorm.Session) (err error) {
type users struct {
AccessToken string `xorm:"TEXT 'token'"`
RefreshToken string `xorm:"TEXT 'secret'"`
}
// ensure columns to rename exist
if err := sess.Sync(new(users)); err != nil {
return err
}
if err := renameColumn(sess, "users", "token", "access_token"); err != nil {
return err
}
return renameColumn(sess, "users", "secret", "refresh_token")
},
}

View file

@ -49,6 +49,7 @@ var migrationTasks = []*xormigrate.Migration{
&correctPotentialCorruptOrgsUsersRelation,
&gatedToRequireApproval,
&removeRepoNetrcOnlyTrusted,
&renameTokenFields,
}
var allBeans = []any{