diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2024-03-07 14:28:39 +0100 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2024-03-07 14:28:39 +0100 |
| commit | a76f86164aecd7adfdca373b044ba250acbd58b2 (patch) | |
| tree | 56a0f172f68a0b14ab0a61d70bab1af7e848229b /internal/config/v2/convert.go | |
| parent | 987f2e3041e0b5d6e06cdc29657be99de9c1cd60 (diff) | |
Config: Fix current server and profiles for v1 -> v2
Diffstat (limited to 'internal/config/v2/convert.go')
| -rw-r--r-- | internal/config/v2/convert.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/config/v2/convert.go b/internal/config/v2/convert.go index 21f39a9..439716a 100644 --- a/internal/config/v2/convert.go +++ b/internal/config/v2/convert.go @@ -26,8 +26,8 @@ func convertV1Server(list v1.InstituteServers, iscurrent bool, t server.Type) (m if iscurrent && k == list.CurrentURL { lc = &key } - prfs := v.Profiles.Public() - prfs.Current = v.Profiles.Current + prfs := v.Base.Profiles.Public() + prfs.Current = v.Base.Profiles.Current ret[key] = &Server{ Profiles: prfs, LastAuthorizeTime: v1AuthTime(v.Base.StartTime, v.Base.StartTimeOAuth), @@ -42,11 +42,11 @@ func FromV1(ver1 *v1.V1) *V2 { gsrvs := ver1.Servers var lc *ServerKey - cust, glc := convertV1Server(gsrvs.Custom, gsrvs.IsType == server.TypeCustom, server.TypeCustom) + cust, glc := convertV1Server(gsrvs.Custom, gsrvs.IsType == v1.CustomServerType, server.TypeCustom) if lc == nil { lc = glc } - res, glc := convertV1Server(gsrvs.Institute, gsrvs.IsType == server.TypeInstituteAccess, server.TypeInstituteAccess) + res, glc := convertV1Server(gsrvs.Institute, gsrvs.IsType == v1.InstituteAccessServerType, server.TypeInstituteAccess) if lc == nil { lc = glc } @@ -69,7 +69,7 @@ func FromV1(ver1 *v1.V1) *V2 { T: server.TypeSecureInternet, ID: sec.HomeOrganizationID, } - if gsrvs.IsType == server.TypeSecureInternet { + if gsrvs.IsType == v1.SecureInternetServerType { lc = &t } prfs := v.Profiles.Public() |