Browse Source

fix: some code improvement

pull/171/head
Aldino Kemal 2 years ago
parent
commit
7088edd690
  1. 2
      src/pkg/error/app_error.go
  2. 3
      src/services/app.go
  3. 15
      src/validations/app_validation_test.go
  4. 4
      src/views/components/AppLogin.js
  5. 12
      src/views/components/AppLoginWithCode.js

2
src/pkg/error/app_error.go

@ -101,7 +101,7 @@ func (err sessionSavedError) StatusCode() int {
} }
var ( 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") ErrNotConnected = throwAuthError("you are not connect to services server, please reconnect")
ErrNotLoggedIn = throwAuthError("you are not logged in") ErrNotLoggedIn = throwAuthError("you are not logged in")
ErrReconnect = throwReconnectError("reconnect error") ErrReconnect = throwReconnectError("reconnect error")

3
src/services/app.go

@ -99,14 +99,17 @@ func (service serviceApp) LoginWithCode(ctx context.Context, phoneNumber string)
// detect is already logged in // detect is already logged in
if service.WaCli.IsLoggedIn() { if service.WaCli.IsLoggedIn() {
logrus.Warn("User is already logged in")
return loginCode, pkgError.ErrAlreadyLoggedIn return loginCode, pkgError.ErrAlreadyLoggedIn
} }
loginCode, err = service.WaCli.PairPhone(phoneNumber, true, whatsmeow.PairClientChrome, "Chrome (Linux)") loginCode, err = service.WaCli.PairPhone(phoneNumber, true, whatsmeow.PairClientChrome, "Chrome (Linux)")
if err != nil { if err != nil {
logrus.Errorf("Error when pairing phone: %s", err.Error())
return loginCode, err return loginCode, err
} }
logrus.Infof("Successfully paired phone with code: %s", loginCode)
return loginCode, nil return loginCode, nil
} }

15
src/validations/app_validation_test.go

@ -34,6 +34,21 @@ func TestValidateLoginWithCode(t *testing.T) {
args: args{phoneNumber: "+6281234567890a"}, args: args{phoneNumber: "+6281234567890a"},
wantErr: true, 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 { for _, tt := range tests {

4
src/views/components/AppLogin.js

@ -12,7 +12,7 @@ export default {
methods: { methods: {
async openModal() { async openModal() {
try { try {
if (this.connected) throw Error('you already logged in :)');
if (this.connected) throw Error('You are already logged in.');
await this.submitApi(); await this.submitApi();
$('#modalLogin').modal({ $('#modalLogin').modal({
@ -43,7 +43,7 @@ export default {
<div class="content"> <div class="content">
<div class="header">Login</div> <div class="header">Login</div>
<div class="description"> <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> </div>
</div> </div>

12
src/views/components/AppLoginWithCode.js

@ -1,7 +1,10 @@
export default { export default {
name: 'AppLoginWithCode', name: 'AppLoginWithCode',
props: { props: {
connected: null,
connected: {
type: Boolean,
default: false,
}
}, },
watch: { watch: {
connected: function(val) { connected: function(val) {
@ -24,7 +27,7 @@ export default {
methods: { methods: {
async openModal() { async openModal() {
try { try {
if (this.connected) throw Error('you already logged in :)');
if (this.connected) throw Error('You are already logged in.');
$('#modalLoginWithCode').modal({ $('#modalLoginWithCode').modal({
onApprove: function() { onApprove: function() {
@ -47,9 +50,10 @@ export default {
this.pair_code = data.results.pair_code; this.pair_code = data.results.pair_code;
} catch (err) { } catch (err) {
if (err.response) { if (err.response) {
return showErrorInfo(err.response.data.message);
showErrorInfo(err.response.data.message);
}else{
showErrorInfo(err.message);
} }
return showErrorInfo(err.message);
} finally { } finally {
this.submitting = false; this.submitting = false;
} }

Loading…
Cancel
Save