extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-06-25 06:24:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better errors handling for user controller

Browse Source
This commit is contained in:
Bubka 2020-01-14 11:49:35 +01:00
parent d46e3d5ce6
commit 9632641702
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/UserController.php
View File

@ -36,10 +36,10 @@ class UserController extends Controller
$success['token'] = Auth::user()->createToken('MyApp')->accessToken; $success['token'] = Auth::user()->createToken('MyApp')->accessToken;
$success['name'] = Auth::user()->name; $success['name'] = Auth::user()->name;
return response()->json(['success' => $success], 200); return response()->json(['message' => $success], 200);
} }
return response()->json(['error' => 'Unauthorised'], 401); return response()->json(['message' => 'unauthorised'], 401);
} }
@ -53,7 +53,7 @@ class UserController extends Controller
$accessToken = Auth::user()->token(); $accessToken = Auth::user()->token();
$accessToken->revoke(); $accessToken->revoke();
return response()->json(['success' => 'signed out']); return response()->json(['message' => 'signed out']);
} }
@ -83,7 +83,7 @@ class UserController extends Controller
$count = DB::table('users')->count(); $count = DB::table('users')->count();
if( $count > 0 ) { if( $count > 0 ) {
return response()->json(['error' => __('already_one_user_registered')], 400); return response()->json(['message' => __('errors.already_one_user_registered')], 400);
} }
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
@ -103,7 +103,7 @@ class UserController extends Controller
$success['token'] = $user->createToken('MyApp')->accessToken; $success['token'] = $user->createToken('MyApp')->accessToken;
$success['name'] = $user->name; $success['name'] = $user->name;
return response()->json(['success' => $success]); return response()->json(['message' => $success]);
} }

16
resources/js/views/Login.vue
View File

@ -9,14 +9,14 @@
<div class="control"> <div class="control">
<input id="email" type="email" class="input" v-model="email" required autofocus /> <input id="email" type="email" class="input" v-model="email" required autofocus />
</div> </div>
<p class="help is-danger" v-if="errors.email">{{ errors.email.toString() }}</p> <p class="help is-danger" v-if="validationErrors.email">{{ validationErrors.email.toString() }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="label">{{ $t('auth.forms.password') }}</label> <label class="label">{{ $t('auth.forms.password') }}</label>
<div class="control"> <div class="control">
<input id="password" type="password" class="input" v-model="password" required /> <input id="password" type="password" class="input" v-model="password" required />
</div> </div>
<p class="help is-danger" v-if="errors.password">{{ errors.password.toString() }}</p> <p class="help is-danger" v-if="validationErrors.password">{{ validationErrors.password.toString() }}</p>
</div> </div>
<div class="field"> <div class="field">
<div class="control"> <div class="control">
@ -42,7 +42,7 @@
return { return {
email : '', email : '',
password : '', password : '',
errors: {} validationErrors: {}
} }
}, },
methods : { methods : {
@ -54,20 +54,20 @@
password: this.password password: this.password
}) })
.then(response => { .then(response => {
localStorage.setItem('user',response.data.success.name) localStorage.setItem('user',response.data.message.name)
localStorage.setItem('jwt',response.data.success.token) localStorage.setItem('jwt',response.data.message.token)
if (localStorage.getItem('jwt') != null){ if (localStorage.getItem('jwt') != null){
this.$router.go('/'); this.$router.go('/');
} }
}) })
.catch(error => { .catch(error => {
console.log(error.response);
if( error.response.status === 401 ) { if( error.response.status === 401 ) {
this.errors['password'] = [ this.$t('auth.forms.password_do_not_match') ] this.validationErrors['email'] = ''
this.validationErrors['password'] = [ this.$t('auth.forms.password_do_not_match') ]
} }
else if( error.response.data.validation ) { else if( error.response.data.validation ) {
this.errors = error.response.data.validation this.validationErrors = error.response.data.validation
} }
else { else {
this.$router.push({ name: 'genericError', params: { err: error.response.data.message } }); this.$router.push({ name: 'genericError', params: { err: error.response.data.message } });

23
resources/js/views/Register.vue
View File

@ -9,28 +9,28 @@
<div class="control"> <div class="control">
<input id="name" type="text" class="input" v-model="name" required autofocus /> <input id="name" type="text" class="input" v-model="name" required autofocus />
</div> </div>
<p class="help is-danger" v-if="errors.name">{{ errors.name.toString() }}</p> <p class="help is-danger" v-if="validationErrors.name">{{ validationErrors.name.toString() }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="label">{{ $t('auth.forms.email') }}</label> <label class="label">{{ $t('auth.forms.email') }}</label>
<div class="control"> <div class="control">
<input id="email" type="email" class="input" v-model="email" required /> <input id="email" type="email" class="input" v-model="email" required />
</div> </div>
<p class="help is-danger" v-if="errors.email">{{ errors.email.toString() }}</p> <p class="help is-danger" v-if="validationErrors.email">{{ validationErrors.email.toString() }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="label">{{ $t('auth.forms.password') }}</label> <label class="label">{{ $t('auth.forms.password') }}</label>
<div class="control"> <div class="control">
<input id="password" type="password" class="input" v-model="password" required /> <input id="password" type="password" class="input" v-model="password" required />
</div> </div>
<p class="help is-danger" v-if="errors.password">{{ errors.password.toString() }}</p> <p class="help is-danger" v-if="validationErrors.password">{{ validationErrors.password.toString() }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="label">{{ $t('auth.forms.confirm_password') }}</label> <label class="label">{{ $t('auth.forms.confirm_password') }}</label>
<div class="control"> <div class="control">
<input id="password_confirmation" type="password" class="input" v-model="password_confirmation" required /> <input id="password_confirmation" type="password" class="input" v-model="password_confirmation" required />
</div> </div>
<p class="help is-danger" v-if="errors.passwordConfirmation">{{ errors.passwordConfirmation.toString() }}</p> <p class="help is-danger" v-if="validationErrors.passwordConfirmation">{{ validationErrors.passwordConfirmation.toString() }}</p>
</div> </div>
<div class="field"> <div class="field">
<div class="control"> <div class="control">
@ -62,7 +62,7 @@
email : '', email : '',
password : '', password : '',
password_confirmation : '', password_confirmation : '',
errors: {}, validationErrors: {},
errorMessage: '' errorMessage: ''
} }
}, },
@ -73,7 +73,7 @@
.then(response => { .then(response => {
if( response.data.userCount > 0) { if( response.data.userCount > 0) {
this.errorMessage = this.$t('errors.already_one_user_registered') + ' ' + this.$t('errors.cannot_register_more_user') this.errorMessage = this.$t('errors.already_one_user_registered') + ' ' + this.$t('errors.cannot_register_more_user')
this.$router.push({ name: 'flooded' }); //this.$router.push({ name: 'flooded' });
} }
}) })
.catch(error => { .catch(error => {
@ -92,15 +92,20 @@
password_confirmation : this.password_confirmation password_confirmation : this.password_confirmation
}) })
.then(response => { .then(response => {
localStorage.setItem('user',response.data.success.name) localStorage.setItem('user',response.data.message.name)
localStorage.setItem('jwt',response.data.success.token) localStorage.setItem('jwt',response.data.message.token)
if (localStorage.getItem('jwt') != null){ if (localStorage.getItem('jwt') != null){
this.$router.go('/'); this.$router.go('/');
} }
}) })
.catch(error => { .catch(error => {
this.errors = error.response.data.validation if( error.response.data.validation ) {
this.validationErrors = error.response.data.validation
}
else {
this.$router.push({ name: 'genericError', params: { err: error.response.data.message } });
}
}); });
} }
}, },