From 7088edd69035bd2a87acc969db5ce2ffeba836a1 Mon Sep 17 00:00:00 2001
From: Aldino Kemal <aldinokemal2104@gmail.com>
Date: Mon, 29 Jul 2024 21:47:11 +0700
Subject: [PATCH] fix: some code improvement

---
 src/pkg/error/app_error.go               |  2 +-
 src/services/app.go                      |  3 +++
 src/validations/app_validation_test.go   | 15 +++++++++++++++
 src/views/components/AppLogin.js         |  4 ++--
 src/views/components/AppLoginWithCode.js | 12 ++++++++----
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/pkg/error/app_error.go b/src/pkg/error/app_error.go
index 79b9f93..5d4c26d 100644
--- a/src/pkg/error/app_error.go
+++ b/src/pkg/error/app_error.go
@@ -101,7 +101,7 @@ func (err sessionSavedError) StatusCode() int {
 }
 
 var (
-	ErrAlreadyLoggedIn = LoginError("you already logged in :)")
+	ErrAlreadyLoggedIn = LoginError("you are already logged in.")
 	ErrNotConnected    = throwAuthError("you are not connect to services server, please reconnect")
 	ErrNotLoggedIn     = throwAuthError("you are not logged in")
 	ErrReconnect       = throwReconnectError("reconnect error")
diff --git a/src/services/app.go b/src/services/app.go
index 7530032..8aca9b9 100644
--- a/src/services/app.go
+++ b/src/services/app.go
@@ -99,14 +99,17 @@ func (service serviceApp) LoginWithCode(ctx context.Context, phoneNumber string)
 
 	// detect is already logged in
 	if service.WaCli.IsLoggedIn() {
+		logrus.Warn("User is already logged in")
 		return loginCode, pkgError.ErrAlreadyLoggedIn
 	}
 
 	loginCode, err = service.WaCli.PairPhone(phoneNumber, true, whatsmeow.PairClientChrome, "Chrome (Linux)")
 	if err != nil {
+		logrus.Errorf("Error when pairing phone: %s", err.Error())
 		return loginCode, err
 	}
 
+	logrus.Infof("Successfully paired phone with code: %s", loginCode)
 	return loginCode, nil
 }
 
diff --git a/src/validations/app_validation_test.go b/src/validations/app_validation_test.go
index 5d6a6ec..5757b32 100644
--- a/src/validations/app_validation_test.go
+++ b/src/validations/app_validation_test.go
@@ -34,6 +34,21 @@ func TestValidateLoginWithCode(t *testing.T) {
 			args:    args{phoneNumber: "+6281234567890a"},
 			wantErr: true,
 		},
+		{
+			name:    "Empty phone number",
+			args:    args{phoneNumber: ""},
+			wantErr: true,
+		},
+		{
+			name:    "Phone with special characters",
+			args:    args{phoneNumber: "+6281234567890!@#"},
+			wantErr: true,
+		},
+		{
+			name:    "Extremely long phone number",
+			args:    args{phoneNumber: "+62812345678901234567890"},
+			wantErr: true,
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/src/views/components/AppLogin.js b/src/views/components/AppLogin.js
index 88848d5..20cd062 100644
--- a/src/views/components/AppLogin.js
+++ b/src/views/components/AppLogin.js
@@ -12,7 +12,7 @@ export default {
     methods: {
         async openModal() {
             try {
-                if (this.connected) throw Error('you already logged in :)');
+                if (this.connected) throw Error('You are already logged in.');
 
                 await this.submitApi();
                 $('#modalLogin').modal({
@@ -43,7 +43,7 @@ export default {
         <div class="content">
             <div class="header">Login</div>
             <div class="description">
-                Scan your QR code to access all this API capability.
+                Scan your QR code to access all API capabilities.
             </div>
         </div>
     </div>
diff --git a/src/views/components/AppLoginWithCode.js b/src/views/components/AppLoginWithCode.js
index de1cadf..8421e02 100644
--- a/src/views/components/AppLoginWithCode.js
+++ b/src/views/components/AppLoginWithCode.js
@@ -1,7 +1,10 @@
 export default {
     name: 'AppLoginWithCode',
     props: {
-        connected: null,
+        connected: {
+            type: Boolean,
+            default: false,
+        }
     },
     watch: {
         connected: function(val) {
@@ -24,7 +27,7 @@ export default {
     methods: {
         async openModal() {
             try {
-                if (this.connected) throw Error('you already logged in :)');
+                if (this.connected) throw Error('You are already logged in.');
 
                 $('#modalLoginWithCode').modal({
                     onApprove: function() {
@@ -47,9 +50,10 @@ export default {
                 this.pair_code = data.results.pair_code;
             } catch (err) {
                 if (err.response) {
-                    return showErrorInfo(err.response.data.message);
+                    showErrorInfo(err.response.data.message);
+                }else{
+                    showErrorInfo(err.message);
                 }
-                return showErrorInfo(err.message);
             } finally {
                 this.submitting = false;
             }