feat: remove license key activation (#59)

* feat: remove license key activation

* Update cmd/login.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: parfenovvs

cmd/login.go

@@ -1,6 +1,3 @@
-/*
-Copyright © 2025 NAME HERE <EMAIL ADDRESS>
-*/
 package cmd
 
 import (
@@ -15,24 +12,14 @@ func NewLoginCommand(sm session.SessionManager) *cobra.Command {
 		Long: `Uses provided credentials to perform activation for this device.
    The command claims available seat of your Malwarebytes license.`,
 		Run: func(cmd *cobra.Command, args []string) {
-			var err error
-
-			key, _ := cmd.Flags().GetString("licenseKey")
-			if key == "" {
-				code, _ := cmd.Flags().GetString("mbCode")
-				err = sm.LoginWithCode(code)
-			} else {
-				err = sm.LoginWithKey(key)
-			}
-
-			// Handle any errors that might have occurred
+			code, _ := cmd.Flags().GetString("code")
+			err := sm.LoginWithCode(code)
 			HandleError(err)
 		},
 	}
 
-	cmd.Flags().StringP("licenseKey", "k", "", "License key.")
-	cmd.Flags().StringP("mbCode", "c", "", "MB-code.")
-	cmd.MarkFlagsOneRequired("licenseKey", "mbCode")
+	cmd.Flags().StringP("code", "c", "", "MB-code.")
+	cmd.MarkFlagRequired("code")
 
 	return cmd
 }

cmd/login_test.go

@@ -6,95 +6,59 @@ import (
 
 func TestNewLoginCommand(t *testing.T) {
 	sm := &mockSessionManager{}
-	
+
 	cmd := NewLoginCommand(sm)
-	
+
 	if cmd.Use != "login" {
 		t.Errorf("Expected Use to be 'login', got '%s'", cmd.Use)
 	}
-	
+
 	if cmd.Short != "Activates this device with your Malwarebytes license." {
 		t.Errorf("Expected Short to be 'Activates this device with your Malwarebytes license.', got '%s'", cmd.Short)
 	}
-	
+
 	expectedLong := `Uses provided credentials to perform activation for this device.
    The command claims available seat of your Malwarebytes license.`
 	if cmd.Long != expectedLong {
 		t.Errorf("Expected Long to be '%s', got '%s'", expectedLong, cmd.Long)
 	}
-	
+
 	if cmd.Run == nil {
 		t.Error("Expected Run function to be defined")
 	}
 }
 
 func TestLoginCommandFlags(t *testing.T) {
 	sm := &mockSessionManager{}
-	
 	cmd := NewLoginCommand(sm)
-	
-	// Test licenseKey flag
-	licenseKeyFlag := cmd.Flags().Lookup("licenseKey")
-	if licenseKeyFlag == nil {
-		t.Error("Expected licenseKey flag to be defined")
-	} else {
-		if licenseKeyFlag.Shorthand != "k" {
-			t.Errorf("Expected licenseKey shorthand to be 'k', got '%s'", licenseKeyFlag.Shorthand)
-		}
-		if licenseKeyFlag.Usage != "License key." {
-			t.Errorf("Expected licenseKey usage to be 'License key.', got '%s'", licenseKeyFlag.Usage)
-		}
-	}
-	
-	// Test mbCode flag
-	mbCodeFlag := cmd.Flags().Lookup("mbCode")
+	mbCodeFlag := cmd.Flags().Lookup("code")
 	if mbCodeFlag == nil {
-		t.Error("Expected mbCode flag to be defined")
+		t.Error("Expected code flag to be defined")
 	} else {
 		if mbCodeFlag.Shorthand != "c" {
-			t.Errorf("Expected mbCode shorthand to be 'c', got '%s'", mbCodeFlag.Shorthand)
+			t.Errorf("Expected code shorthand to be 'c', got '%s'", mbCodeFlag.Shorthand)
 		}
 		if mbCodeFlag.Usage != "MB-code." {
-			t.Errorf("Expected mbCode usage to be 'MB-code.', got '%s'", mbCodeFlag.Usage)
+			t.Errorf("Expected code usage to be 'MB-code.', got '%s'", mbCodeFlag.Usage)
 		}
 	}
 }
 
-func TestLoginCommandWithLicenseKey(t *testing.T) {
-	sm := &mockSessionManager{}
-	
-	cmd := NewLoginCommand(sm)
-	cmd.Flags().Set("licenseKey", "test-license-key")
-	cmd.Run(cmd, []string{})
-	
-	// Verify that LoginWithKey was called with the correct parameter
-	// Note: We can't directly verify this with our simple mock, but we can test the logic
-}
-
 func TestLoginCommandWithMBCode(t *testing.T) {
 	sm := &mockSessionManager{}
-	
+
 	cmd := NewLoginCommand(sm)
-	cmd.Flags().Set("mbCode", "test-mb-code")
+	cmd.Flags().Set("code", "test-mb-code")
 	cmd.Run(cmd, []string{})
-	
+
 	// Verify that LoginWithCode was called with the correct parameter
 	// Note: We can't directly verify this with our simple mock, but we can test the logic
 }
 
 func TestLoginCommandLogic(t *testing.T) {
-	// Test the logic without running the command to avoid HandleError os.Exit
 	sm := &mockSessionManager{}
-	
-	// Test LoginWithKey
-	err := sm.LoginWithKey("test-license-key")
-	if err != nil {
-		t.Errorf("Expected no error from sm.LoginWithKey, got %v", err)
-	}
-	
-	// Test LoginWithCode
-	err = sm.LoginWithCode("test-mb-code")
+	err := sm.LoginWithCode("test-mb-code")
 	if err != nil {
 		t.Errorf("Expected no error from sm.LoginWithCode, got %v", err)
 	}
-}
+}

pkg/remote/holocron.go

@@ -25,7 +25,7 @@ var client = &http.Client{Timeout: time.Second * 10}
 
 type Holocron interface {
 	RegisterDevice() (string, error)
-	ActivateDevice(installationToken string, key string, mbcode bool) (*DeviceModule, error)
+	ActivateDevice(installationToken string, code string) (*DeviceModule, error)
 	CheckDevice(installationToken string) (*DeviceModule, error)
 	DeactivateDevice(installationToken string) (*DeviceModule, error)
 	VpnRegisterPublicKey(installationToken string, key string) (*VpnIpAddresses, error)
@@ -81,18 +81,13 @@ func (api *DefaultHolocron) RegisterDevice() (string, error) {
 	return response.Data.RegisterDevice.Device.InstallationToken, nil
 }
 
-func (api *DefaultHolocron) ActivateDevice(installationToken string, key string, mbcode bool) (*DeviceModule, error) {
+func (api *DefaultHolocron) ActivateDevice(installationToken string, code string) (*DeviceModule, error) {
 	log.Debugln("Begin: `ActivateDevice` request")
 	input := ActivateDeviceInput{
-		Modules:        []ProductModule{ProductModulePrivacy},
-		ActivationMode: ActivationModePassive,
-	}
-	if mbcode {
-		input.ActivationMethod = ActivationMethodOneTimeToken
-		input.OneTimeToken = key
-	} else {
-		input.ActivationMethod = ActivationMethodLicenseKey
-		input.LicenseKey = key
+		Modules:          []ProductModule{ProductModulePrivacy},
+		ActivationMode:   ActivationModePassive,
+		ActivationMethod: ActivationMethodOneTimeToken,
+		OneTimeToken:     code,
 	}
 
 	requestBody := map[string]interface{}{

pkg/remote/holocron_test.go

@@ -72,7 +72,7 @@ func TestApiSuccessCases(t *testing.T) {
 			name:     "ActivateDevice",
 			response: `{"data": {"activateDevice": {"deviceModules": {"privacy": {"status": "licensed", "termEndsOn": "2025-12-31"}}}}}`,
 			testFunc: func(api *DefaultHolocron) (interface{}, error) {
-				return api.ActivateDevice("mock-token", "mock-key", true)
+				return api.ActivateDevice("mock-token", "mock-code")
 			},
 			validate: func(t *testing.T, result interface{}) {
 				deviceModule := result.(*DeviceModule)
@@ -207,7 +207,7 @@ func TestApiErrorCases(t *testing.T) {
 			name:     "ActivateDevice",
 			response: `{ "errors": [ { "message": "mock-error" } ] }`,
 			testFunc: func(api *DefaultHolocron) (interface{}, error) {
-				return api.ActivateDevice("", "", false)
+				return api.ActivateDevice("", "")
 			},
 		},
 		{

pkg/remote/schema.go

@@ -18,7 +18,6 @@ type ActivationMethod string
 
 const (
 	ActivationMethodOneTimeToken ActivationMethod = "oneTimeToken"
-	ActivationMethodLicenseKey   ActivationMethod = "licenseKey"
 )
 
 type ActivationMode string
@@ -52,7 +51,6 @@ type ActivateDeviceInput struct {
 	ActivationMethod ActivationMethod `json:"activationMethod"`
 	ActivationMode   ActivationMode   `json:"activationMode"`
 	OneTimeToken     string           `json:"oneTimeToken"`
-	LicenseKey       string           `json:"licenseKey"`
 }
 
 type HolocronResponse[D any] struct {

pkg/remote/schema_test.go

@@ -15,9 +15,6 @@ func TestActivationMethod_Constants(t *testing.T) {
 	if ActivationMethodOneTimeToken != "oneTimeToken" {
 		t.Errorf("Expected ActivationMethodOneTimeToken to be 'oneTimeToken', got '%s'", ActivationMethodOneTimeToken)
 	}
-	if ActivationMethodLicenseKey != "licenseKey" {
-		t.Errorf("Expected ActivationMethodLicenseKey to be 'licenseKey', got '%s'", ActivationMethodLicenseKey)
-	}
 }
 
 func TestActivationMode_Constants(t *testing.T) {
@@ -73,7 +70,7 @@ func TestErrorResponse_JSONSerialization(t *testing.T) {
 
 	t.Run("Unmarshal ErrorResponse", func(t *testing.T) {
 		jsonData := `{"errors":[{"message":"Test error"}]}`
-		
+
 		var errResp ErrorResponse
 		err := json.Unmarshal([]byte(jsonData), &errResp)
 		if err != nil {
@@ -121,9 +118,9 @@ func TestRegisterDeviceInput_JSONSerialization(t *testing.T) {
 func TestActivateDeviceInput_JSONSerialization(t *testing.T) {
 	input := ActivateDeviceInput{
 		Modules:          []ProductModule{ProductModulePrivacy},
-		ActivationMethod: ActivationMethodLicenseKey,
+		ActivationMethod: ActivationMethodOneTimeToken,
 		ActivationMode:   ActivationModePassive,
-		LicenseKey:       "TEST-LICENSE-KEY",
+		OneTimeToken:     "TEST-TOKEN",
 	}
 
 	data, err := json.Marshal(input)
@@ -140,9 +137,6 @@ func TestActivateDeviceInput_JSONSerialization(t *testing.T) {
 	if unmarshaled.ActivationMethod != input.ActivationMethod {
 		t.Errorf("Expected ActivationMethod '%s', got '%s'", input.ActivationMethod, unmarshaled.ActivationMethod)
 	}
-	if unmarshaled.LicenseKey != input.LicenseKey {
-		t.Errorf("Expected LicenseKey '%s', got '%s'", input.LicenseKey, unmarshaled.LicenseKey)
-	}
 }
 
 func TestHolocronResponse_JSONSerialization(t *testing.T) {
@@ -190,11 +184,11 @@ func TestDeviceOutput_JSONSerialization(t *testing.T) {
 	}
 
 	if unmarshaled.Device.InstallationToken != output.Device.InstallationToken {
-		t.Errorf("Expected InstallationToken '%s', got '%s'", 
+		t.Errorf("Expected InstallationToken '%s', got '%s'",
 			output.Device.InstallationToken, unmarshaled.Device.InstallationToken)
 	}
 	if unmarshaled.DeviceModules.Privacy.Status != output.DeviceModules.Privacy.Status {
-		t.Errorf("Expected Status '%s', got '%s'", 
+		t.Errorf("Expected Status '%s', got '%s'",
 			output.DeviceModules.Privacy.Status, unmarshaled.DeviceModules.Privacy.Status)
 	}
 }
@@ -224,7 +218,7 @@ func TestVpnIpAddresses_JSONSerialization(t *testing.T) {
 		t.Errorf("Expected IPv6 '%s', got '%s'", ipAddrs.IpV6, unmarshaled.IpV6)
 	}
 	if unmarshaled.KeyExpirationHours != ipAddrs.KeyExpirationHours {
-		t.Errorf("Expected KeyExpirationHours %d, got %d", 
+		t.Errorf("Expected KeyExpirationHours %d, got %d",
 			ipAddrs.KeyExpirationHours, unmarshaled.KeyExpirationHours)
 	}
 }
@@ -298,7 +292,7 @@ func TestServer_JSONSerialization(t *testing.T) {
 	}
 	if len(unmarshaled.PortRanges) > 0 {
 		if unmarshaled.PortRanges[0].From != server.PortRanges[0].From {
-			t.Errorf("Expected port range From %d, got %d", 
+			t.Errorf("Expected port range From %d, got %d",
 				server.PortRanges[0].From, unmarshaled.PortRanges[0].From)
 		}
 	}
@@ -345,11 +339,11 @@ func TestVpnLocations_JSONSerialization(t *testing.T) {
 	if len(unmarshaled.Countries) != len(locations.Countries) {
 		t.Errorf("Expected %d countries, got %d", len(locations.Countries), len(unmarshaled.Countries))
 	}
-	
+
 	if len(unmarshaled.Countries) > 0 {
 		country := unmarshaled.Countries[0]
 		originalCountry := locations.Countries[0]
-		
+
 		if country.Code != originalCountry.Code {
 			t.Errorf("Expected country code '%s', got '%s'", originalCountry.Code, country.Code)
 		}
@@ -389,7 +383,7 @@ func TestVpnClientDefaults_JSONSerialization(t *testing.T) {
 		t.Errorf("Expected IPv4 MTU %d, got %d", defaults.IPv4.MTU, unmarshaled.IPv4.MTU)
 	}
 	if unmarshaled.KeyExpirationHours != defaults.KeyExpirationHours {
-		t.Errorf("Expected KeyExpirationHours %d, got %d", 
+		t.Errorf("Expected KeyExpirationHours %d, got %d",
 			defaults.KeyExpirationHours, unmarshaled.KeyExpirationHours)
 	}
 }
@@ -412,7 +406,7 @@ func TestEmptyStructs_JSONSerialization(t *testing.T) {
 		if err != nil {
 			t.Errorf("Failed to marshal empty struct %T: %v", test, err)
 		}
-		
+
 		// Basic check that we get valid JSON
 		if len(data) == 0 {
 			t.Errorf("Expected non-empty JSON for %T", test)
@@ -443,4 +437,4 @@ func TestNilSlicesAndPointers_JSONSerialization(t *testing.T) {
 	if unmarshaled.Modules == nil {
 		// This is acceptable behavior
 	}
-}
+}

pkg/session/session.go

@@ -13,8 +13,7 @@ import (
 )
 
 type SessionManager interface {
-	LoginWithKey(string) error
-	LoginWithCode(string) error
+	LoginWithCode(code string) error
 	Logout() error
 	Active() bool
 }
@@ -31,16 +30,6 @@ func NewDefaultSessionManager(cfgProvider config.ConfigProvider, holocron remote
 	}
 }
 
-func (sm *DefaultSessionManager) LoginWithKey(key string) error {
-	formattedKey := strings.ToUpper(key)
-
-	if len(formattedKey) != 23 {
-		return errors.NewUserError("Invalid license key. License key should be 23 characters long.", errors.ErrInvalidInput)
-	}
-
-	return sm.login(formattedKey, false)
-}
-
 func (sm *DefaultSessionManager) LoginWithCode(code string) error {
 	formattedCode := strings.ToUpper(code)
 	formattedCode = strings.TrimPrefix(formattedCode, "MB-")
@@ -49,10 +38,10 @@ func (sm *DefaultSessionManager) LoginWithCode(code string) error {
 		return errors.NewUserError("Invalid MB-code. MB-code should look like MB-XXXXXX or XXXXXX.", errors.ErrInvalidInput)
 	}
 
-	return sm.login(formattedCode, true)
+	return sm.login(formattedCode)
 }
 
-func (sm *DefaultSessionManager) login(token string, mbcode bool) error {
+func (sm *DefaultSessionManager) login(code string) error {
 	// Check current session
 	if sm.Active() {
 		return errors.NewUserError("There is an active session on your device. Try logout command first if you want to re-login.", nil)
@@ -74,7 +63,7 @@ func (sm *DefaultSessionManager) login(token string, mbcode bool) error {
 	}
 
 	// Activate device
-	m, err := sm.holocron.ActivateDevice(installationToken, token, mbcode)
+	m, err := sm.holocron.ActivateDevice(installationToken, code)
 	if err != nil {
 		sm.cfgProvider.DeleteConfig()
 		log.Errorf("Error activating the device: %v", err)