Repair register new user command

Signed-off-by: keliramu <[email protected]>

ci/generate_protobuf.sh

@@ -13,9 +13,7 @@ protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf
 protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/logout.proto -I protobuf/daemon
 protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/login_with_token.proto -I protobuf/daemon
 protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/ping.proto -I protobuf/daemon
-protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/plans.proto -I protobuf/daemon
 protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/rate.proto -I protobuf/daemon
-protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/register.proto -I protobuf/daemon
 protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/set.proto -I protobuf/daemon
 protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/settings.proto -I protobuf/daemon
 protoc --go_opt=module=github.com/NordSecurity/nordvpn-linux --go_out=. protobuf/daemon/status.proto -I protobuf/daemon

cli/cli_click.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/NordSecurity/nordvpn-linux/daemon/pb"
@@ -54,8 +55,9 @@ func (c *cmd) Click(ctx *cli.Context) (err error) {
 			return formatError(err)
 		}
 
-		if url.Scheme == "nordvpn" {
-			if url.Host == "claim-online-purchase" {
+		if strings.ToLower(url.Scheme) == "nordvpn" {
+			switch strings.ToLower(url.Host) {
+			case "claim-online-purchase":
 				resp, err := c.client.ClaimOnlinePurchase(context.Background(), &pb.Empty{})
 				if err != nil {
 					return formatError(err)
@@ -67,17 +69,26 @@ func (c *cmd) Click(ctx *cli.Context) (err error) {
 
 				color.Green(ClaimOnlinePurchaseSuccess)
 				return nil
-			}
 
-			// if arg is given
-			// run the same as: login --callback %arg
-			if err := c.oauth2(ctx); err != nil {
-				return formatError(err)
+			case "login":
+				// login can be regular, or after new account setup & vpn service purchase (signup)
+				regularLogin := true
+				if strings.ToLower(url.Query().Get("action")) == "signup" {
+					regularLogin = false
+				}
+
+				// if arg is given
+				// run the same as: login --callback %arg
+				if err := c.oauth2(ctx, regularLogin); err != nil {
+					return formatError(err)
+				}
+				return nil
 			}
 		}
-	} else {
-		cli.ShowAppHelp(ctx)
 	}
 
+	// for all unhandled cases
+	cli.ShowAppHelp(ctx)
+
 	return nil
 }

cli/cli_login.go

@@ -30,7 +30,7 @@ func (c *cmd) Login(ctx *cli.Context) error {
 	}
 
 	if ctx.IsSet(flagLoginCallback) {
-		return c.oauth2(ctx)
+		return c.oauth2(ctx, true)
 	}
 
 	if ctx.IsSet(flagToken) {
@@ -44,7 +44,9 @@ func (c *cmd) Login(ctx *cli.Context) error {
 
 	cl, err := c.client.LoginOAuth2(
 		context.Background(),
-		&pb.Empty{},
+		&pb.LoginOAuth2Request{
+			Type: pb.LoginType_LoginType_LOGIN,
+		},
 	)
 	if err != nil {
 		return formatError(err)
@@ -102,7 +104,7 @@ func LoginRespHandler(ctx *cli.Context, resp *pb.LoginResponse) error {
 }
 
 // oauth2 is called by the browser during login via OAuth2.
-func (c *cmd) oauth2(ctx *cli.Context) error {
+func (c *cmd) oauth2(ctx *cli.Context, regularLogin bool) error {
 	if ctx.NArg() != 1 {
 		return formatError(errors.New("expected a url"))
 	}
@@ -116,8 +118,14 @@ func (c *cmd) oauth2(ctx *cli.Context) error {
 		return formatError(errors.New("expected a url with nordvpn scheme"))
 	}
 
-	_, err = c.client.LoginOAuth2Callback(context.Background(), &pb.String{
-		Data: url.Query().Get("exchange_token"),
+	loginType := pb.LoginType_LoginType_LOGIN
+	if !regularLogin {
+		loginType = pb.LoginType_LoginType_SIGNUP
+	}
+
+	_, err = c.client.LoginOAuth2Callback(context.Background(), &pb.LoginOAuth2CallbackRequest{
+		Token: url.Query().Get("exchange_token"),
+		Type:  loginType,
 	})
 	if err != nil {
 		return formatError(err)

cli/cli_register.go

@@ -2,13 +2,9 @@ package cli
 
 import (
 	"context"
-	"errors"
-	"fmt"
-	"sort"
+	"io"
 
-	"github.com/NordSecurity/nordvpn-linux/client"
 	"github.com/NordSecurity/nordvpn-linux/daemon/pb"
-	"github.com/NordSecurity/nordvpn-linux/internal"
 
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
@@ -18,57 +14,28 @@ import (
 const RegisterUsageText = "Registers a new user account"
 
 func (c *cmd) Register(ctx *cli.Context) error {
-	email, password, err := ReadCredentialsFromTerminal()
+	cl, err := c.client.LoginOAuth2(
+		context.Background(),
+		&pb.LoginOAuth2Request{
+			Type: pb.LoginType_LoginType_SIGNUP,
+		},
+	)
 	if err != nil {
 		return formatError(err)
 	}
 
-	resp, err := c.client.Register(context.Background(), &pb.RegisterRequest{
-		Email:    email,
-		Password: password,
-	})
-	if err != nil {
-		return formatError(err)
-	}
-
-	switch resp.Type {
-	case internal.CodeSuccess:
-		color.Green(AccountCreationSuccess)
-	case internal.CodeBadRequest:
-		err = errors.New(AccountInvalidData)
-	case internal.CodeConflict:
-		err = errors.New(AccountEmailTaken)
-	case internal.CodeInternalError:
-		err = errors.New(AccountInternalError)
-	case internal.CodeFailure:
-		err = internal.ErrUnhandled
-	}
-
-	if err != nil {
-		return formatError(err)
-	}
-
-	planResp, err := c.client.Plans(context.Background(), &pb.Empty{})
-	if err != nil {
-		color.Red("Failed to retrieve subscription plans. Please finish the registration in NordVPN website.")
-		return browse(client.SubscriptionURL)
-	}
-
-	plans := planResp.GetPlans()
-	// sort plans by cost in ascending order
-	sort.Slice(plans, func(i, j int) bool {
-		costI := plans[i].GetCost()
-		costJ := plans[j].GetCost()
-		// this is done to avoid string -> int conversions
-		if len(costI) == len(costJ) {
-			return costI < costJ
+	for {
+		resp, err := cl.Recv()
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return formatError(err)
+		}
+		if url := resp.GetData(); url != "" {
+			color.Green("Continue in the browser: %s", url)
 		}
-		return len(costI) < len(costJ)
-	})
-	for i, plan := range plans {
-		description := fmt.Sprintf("%s for %s %s", plan.GetTitle(), plan.GetCost(), plan.GetCurrency())
-		fmt.Printf("%d) %s\n", i+1, description)
 	}
 
-	return browse(client.SubscriptionURL)
+	return nil
 }

core/authentication.go

@@ -13,7 +13,7 @@ import (
 
 // Authentication is responsible for verifying user's identity.
 type Authentication interface {
-	Login() (string, error)
+	Login(bool) (string, error)
 	Token(string) (*LoginResponse, error)
 }
 
@@ -36,7 +36,7 @@ func NewOAuth2(client *http.Client, baseURL string) *OAuth2 {
 	}
 }
 
-func (o *OAuth2) Login() (string, error) {
+func (o *OAuth2) Login(regularLogin bool) (string, error) {
 	o.Lock()
 	defer o.Unlock()
 
@@ -52,7 +52,11 @@ func (o *OAuth2) Login() (string, error) {
 
 	query := url.Values{}
 	query.Add("challenge", o.challenge)
-	query.Add("preferred_flow", "login")
+	if regularLogin {
+		query.Add("preferred_flow", "login")
+	} else {
+		query.Add("preferred_flow", "registration")
+	}
 	query.Add("redirect_flow", "default")
 	path.RawQuery = query.Encode()
 	log.Println("oauth2 login url", path.String())

core/authentication_test.go

@@ -3,6 +3,7 @@ package core
 import (
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"os"
 	"strings"
 	"testing"
@@ -16,15 +17,19 @@ func TestOAuth2_Login(t *testing.T) {
 	category.Set(t, category.Unit)
 
 	tests := []struct {
-		name        string
-		handler     http.HandlerFunc
-		expectedURL string
-		hasError    bool
+		name         string
+		handler      http.HandlerFunc
+		regularLogin bool
+		expectedURL  string
+		hasError     bool
 	}{
 		{
 			name: http.StatusText(http.StatusOK),
 			handler: func(rw http.ResponseWriter, r *http.Request) {
-				assert.True(t, strings.HasPrefix(r.URL.String(), urlOAuth2Login))
+				url, err := url.Parse(r.URL.String())
+				assert.NoError(t, err)
+				assert.Equal(t, url.Path, urlOAuth2Login)
+				assert.True(t, url.Query().Get("preferred_flow") == "login")
 				data, err := os.ReadFile("testdata/login_200.json")
 				if err != nil {
 					rw.WriteHeader(http.StatusInternalServerError)
@@ -33,12 +38,16 @@ func TestOAuth2_Login(t *testing.T) {
 				rw.WriteHeader(http.StatusOK)
 				rw.Write(data)
 			},
-			expectedURL: "https://api.nordvpn.com/v1/users/oauth/login-redirect?attempt=bfeb71e5-6c9b-459b-bc50-40d0d0186bc4",
+			regularLogin: true,
+			expectedURL:  "https://api.nordvpn.com/v1/users/oauth/login-redirect?attempt=bfeb71e5-6c9b-459b-bc50-40d0d0186bc4",
 		},
 		{
 			name: http.StatusText(http.StatusBadRequest),
 			handler: func(rw http.ResponseWriter, r *http.Request) {
-				assert.True(t, strings.HasPrefix(r.URL.String(), urlOAuth2Login))
+				url, err := url.Parse(r.URL.String())
+				assert.NoError(t, err)
+				assert.Equal(t, url.Path, urlOAuth2Login)
+				assert.True(t, url.Query().Get("preferred_flow") == "login")
 				data, err := os.ReadFile("testdata/login_400.json")
 				if err != nil {
 					rw.WriteHeader(http.StatusInternalServerError)
@@ -47,7 +56,27 @@ func TestOAuth2_Login(t *testing.T) {
 				rw.WriteHeader(http.StatusBadRequest)
 				rw.Write(data)
 			},
-			hasError: true,
+			regularLogin: true,
+			hasError:     true,
+		},
+		{
+			name: http.StatusText(http.StatusOK),
+			handler: func(rw http.ResponseWriter, r *http.Request) {
+				url, err := url.Parse(r.URL.String())
+				assert.NoError(t, err)
+				assert.Equal(t, url.Path, urlOAuth2Login)
+				assert.True(t, url.Query().Get("preferred_flow") == "registration")
+				data, err := os.ReadFile("testdata/login_200.json")
+				if err != nil {
+					rw.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+				rw.WriteHeader(http.StatusOK)
+				rw.Write(data)
+			},
+			regularLogin: false,
+			expectedURL:  "https://api.nordvpn.com/v1/users/oauth/login-redirect?attempt=bfeb71e5-6c9b-459b-bc50-40d0d0186bc4",
+			hasError:     false,
 		},
 	}
 
@@ -57,7 +86,7 @@ func TestOAuth2_Login(t *testing.T) {
 			defer server.Close()
 
 			api := NewOAuth2(http.DefaultClient, server.URL)
-			url, err := api.Login()
+			url, err := api.Login(test.regularLogin)
 			assert.Equal(t, test.hasError, err != nil)
 			if test.hasError {
 				assert.True(t, strings.Contains(err.Error(), test.name))