mirror of
https://github.com/portainer/portainer.git
synced 2025-07-26 00:39:41 +02:00
* add updateSettingsToDB28 func and test * update DBversion const * migration func naming modification * feat(oauth): add sso, hide internal auth teaser and logout options. (#5039) * cleanup and make helper func for unit testing * dbversion update * feat(publicSettings): public settings response modification for OAuth SSO EE-608 (#5062) * feat(oauth): updated logout logic with logoutUrl. (#5064) * add exclusive token generation for OAuth * swagger annotation revision * add unit test * updates based on tech review feedback * feat(oauth): updated oauth settings model * feat(oauth): added oauth logout url * feat(oauth): fixed SSO toggle and logout issue. * set SSO to ON by default * update migrator unit test * set SSO to true by default for new instance * prevent applying the SSO logout url to the initial admin user Co-authored-by: fhanportainer <79428273+fhanportainer@users.noreply.github.com> Co-authored-by: Felix Han <felix.han@portainer.io>
38 lines
1.2 KiB
Go
38 lines
1.2 KiB
Go
package migrator
|
|
|
|
import (
|
|
"path"
|
|
"time"
|
|
|
|
"github.com/boltdb/bolt"
|
|
"github.com/portainer/portainer/api/bolt/internal"
|
|
"github.com/portainer/portainer/api/bolt/settings"
|
|
)
|
|
|
|
// initTestingDBConn creates a raw bolt DB connection
|
|
// for unit testing usage only since using NewStore will cause cycle import inside migrator pkg
|
|
func initTestingDBConn(storePath, fileName string) (*bolt.DB, error) {
|
|
databasePath := path.Join(storePath, fileName)
|
|
dbConn, err := bolt.Open(databasePath, 0600, &bolt.Options{Timeout: 1 * time.Second})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return dbConn, nil
|
|
}
|
|
|
|
// initTestingDBConn creates a settings service with raw bolt DB connection
|
|
// for unit testing usage only since using NewStore will cause cycle import inside migrator pkg
|
|
func initTestingSettingsService(dbConn *bolt.DB, preSetObj map[string]interface{}) (*settings.Service, error) {
|
|
internalDBConn := &internal.DbConnection{
|
|
DB: dbConn,
|
|
}
|
|
settingsService, err := settings.NewService(internalDBConn)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
//insert a obj
|
|
if err := internal.UpdateObject(internalDBConn, "settings", []byte("SETTINGS"), preSetObj); err != nil {
|
|
return nil, err
|
|
}
|
|
return settingsService, nil
|
|
}
|