diff --git a/client/ios/NetBirdSDK/client.go b/client/ios/NetBirdSDK/client.go index 4f0bddca7a4..ef61eee3fcb 100644 --- a/client/ios/NetBirdSDK/client.go +++ b/client/ios/NetBirdSDK/client.go @@ -86,7 +86,9 @@ func (c *Client) Run(fd int32, interfaceName string) error { var ctx context.Context //nolint ctxWithValues := context.WithValue(context.Background(), system.DeviceNameCtxKey, c.deviceName) + //nolint ctxWithValues = context.WithValue(ctxWithValues, system.OsNameCtxKey, c.osName) + //nolint ctxWithValues = context.WithValue(ctxWithValues, system.OsVersionCtxKey, c.osVersion) c.ctxCancelLock.Lock() ctx, c.ctxCancel = context.WithCancel(ctxWithValues) @@ -151,8 +153,11 @@ func (c *Client) RemoveConnectionListener() { func (c *Client) IsLoginRequired() bool { var ctx context.Context + //nolint ctxWithValues := context.WithValue(context.Background(), system.DeviceNameCtxKey, c.deviceName) + //nolint ctxWithValues = context.WithValue(ctxWithValues, system.OsNameCtxKey, c.osName) + //nolint ctxWithValues = context.WithValue(ctxWithValues, system.OsVersionCtxKey, c.osVersion) c.ctxCancelLock.Lock() defer c.ctxCancelLock.Unlock() @@ -168,8 +173,11 @@ func (c *Client) IsLoginRequired() bool { func (c *Client) LoginForMobile() string { var ctx context.Context + //nolint ctxWithValues := context.WithValue(context.Background(), system.DeviceNameCtxKey, c.deviceName) + //nolint ctxWithValues = context.WithValue(ctxWithValues, system.OsNameCtxKey, c.osName) + //nolint ctxWithValues = context.WithValue(ctxWithValues, system.OsVersionCtxKey, c.osVersion) c.ctxCancelLock.Lock() defer c.ctxCancelLock.Unlock() diff --git a/client/ios/NetBirdSDK/logger.go b/client/ios/NetBirdSDK/logger.go index 674e296fb36..f1ad1b9f6a6 100644 --- a/client/ios/NetBirdSDK/logger.go +++ b/client/ios/NetBirdSDK/logger.go @@ -1,16 +1,10 @@ package NetBirdSDK import ( - "os" - "github.com/netbirdio/netbird/util" ) -var logFile *os.File - // InitializeLog initializes the log file. func InitializeLog(logLevel string, filePath string) error { - var err error - err = util.InitLog(logLevel, filePath) - return err + return util.InitLog(logLevel, filePath) } diff --git a/client/ios/NetBirdSDK/login.go b/client/ios/NetBirdSDK/login.go index 50a0425387d..257329e5c9f 100644 --- a/client/ios/NetBirdSDK/login.go +++ b/client/ios/NetBirdSDK/login.go @@ -12,7 +12,6 @@ import ( "github.com/netbirdio/netbird/client/cmd" "github.com/netbirdio/netbird/client/internal" - "github.com/netbirdio/netbird/client/internal/auth" "github.com/netbirdio/netbird/client/system" ) @@ -150,30 +149,6 @@ func (a *Auth) Login() error { return nil } -func (a *Auth) foregroundGetTokenInfo(urlOpener URLOpener) (*auth.TokenInfo, error) { - oAuthFlow, err := auth.NewOAuthFlow(a.ctx, a.config, false) - if err != nil { - return nil, err - } - - flowInfo, err := oAuthFlow.RequestAuthInfo(context.TODO()) - if err != nil { - return nil, fmt.Errorf("getting a request OAuth flow info failed: %v", err) - } - - go urlOpener.Open(flowInfo.VerificationURIComplete) - - waitTimeout := time.Duration(flowInfo.ExpiresIn) - waitCTX, cancel := context.WithTimeout(a.ctx, waitTimeout*time.Second) - defer cancel() - tokenInfo, err := oAuthFlow.WaitToken(waitCTX, flowInfo) - if err != nil { - return nil, fmt.Errorf("waiting for browser login failed: %v", err) - } - - return &tokenInfo, nil -} - func (a *Auth) withBackOff(ctx context.Context, bf func() error) error { return backoff.RetryNotify( bf, diff --git a/client/ios/NetBirdSDK/preferences_test.go b/client/ios/NetBirdSDK/preferences_test.go index bb4531b6141..aa6a475aeab 100644 --- a/client/ios/NetBirdSDK/preferences_test.go +++ b/client/ios/NetBirdSDK/preferences_test.go @@ -57,11 +57,11 @@ func TestPreferences_ReadUncommitedValues(t *testing.T) { p.SetManagementURL(exampleString) resp, err = p.GetManagementURL() if err != nil { - t.Fatalf("failed to read managmenet url: %s", err) + t.Fatalf("failed to read management url: %s", err) } if resp != exampleString { - t.Errorf("unexpected managemenet url: %s", resp) + t.Errorf("unexpected management url: %s", resp) } p.SetPreSharedKey(exampleString) @@ -102,11 +102,11 @@ func TestPreferences_Commit(t *testing.T) { resp, err = p.GetManagementURL() if err != nil { - t.Fatalf("failed to read managmenet url: %s", err) + t.Fatalf("failed to read management url: %s", err) } if resp != exampleURL { - t.Errorf("unexpected managemenet url: %s", resp) + t.Errorf("unexpected management url: %s", resp) } resp, err = p.GetPreSharedKey() diff --git a/client/system/info.go b/client/system/info.go index b6254ef476c..2d5b7192ece 100644 --- a/client/system/info.go +++ b/client/system/info.go @@ -58,24 +58,6 @@ func extractDeviceName(ctx context.Context, defaultName string) string { return v } -// extractOsVersion extracts operating system version from context or returns the default -func extractOsVersion(ctx context.Context, defaultName string) string { - v, ok := ctx.Value(OsVersionCtxKey).(string) - if !ok { - return defaultName - } - return v -} - -// extractOsName extracts operating system name from context or returns the default -func extractOsName(ctx context.Context, defaultName string) string { - v, ok := ctx.Value(OsNameCtxKey).(string) - if !ok { - return defaultName - } - return v -} - // GetDesktopUIUserAgent returns the Desktop ui user agent func GetDesktopUIUserAgent() string { return "netbird-desktop-ui/" + version.NetbirdVersion() diff --git a/client/system/info_ios.go b/client/system/info_ios.go index 762117afa6b..1a1203f79c9 100644 --- a/client/system/info_ios.go +++ b/client/system/info_ios.go @@ -25,3 +25,21 @@ func GetInfo(ctx context.Context) *Info { return gio } + +// extractOsVersion extracts operating system version from context or returns the default +func extractOsVersion(ctx context.Context, defaultName string) string { + v, ok := ctx.Value(OsVersionCtxKey).(string) + if !ok { + return defaultName + } + return v +} + +// extractOsName extracts operating system name from context or returns the default +func extractOsName(ctx context.Context, defaultName string) string { + v, ok := ctx.Value(OsNameCtxKey).(string) + if !ok { + return defaultName + } + return v +}