extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-08-13 23:38:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #80 - Cannot access accounts with proxy header auth

Browse Source
This commit is contained in:
Bubka
2022-05-19 15:50:06 +02:00
parent 9deb821d53
commit abce20419b
6 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
resources/js/views/Error.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="error-message">
<modal v-model="ShowModal">
<modal v-model="ShowModal" :closable="this.showcloseButton">
<div class="error-message" v-if="$route.name == '404'">
<p class="error-404"></p>
<p>{{ $t('errors.resource_not_found') }}</p>
@ -17,9 +17,9 @@
<div v-else>
<p class="error-generic"></p>
<p>{{ $t('errors.error_occured') }} </p>
<p v-if="error" class="has-text-grey-lighter">{{ error.message }}</p>
<p v-if="error.message" class="has-text-grey-lighter">{{ error.message }}</p>
<p v-if="error.originalMessage" class="has-text-grey-lighter">{{ error.originalMessage }}</p>
<p><router-link :to="{ name: 'accounts' }" class="is-text">{{ $t('errors.refresh') }}</router-link></p>
<p><router-link :to="{ name: 'accounts', params: { toRefresh: true } }" class="is-text">{{ $t('errors.refresh') }}</router-link></p>
<p v-if="debugMode == 'development' && error.debug">
<br>
{{ error.debug }}
@ -37,6 +37,7 @@
data(){
return {
ShowModal : true,
showcloseButton: this.closable,
}
},
@ -47,17 +48,21 @@
},
error: function() {
if( this.err == null ) {
if( this.err === null || this.err === undefined ) {
return false
}
else
{
if(this.err.data) {
console.log(this.err.data)
if (this.err.status === 407) {
return {
'message' : this.$t('errors.auth_proxy_failed'),
'originalMessage' : this.$t('errors.auth_proxy_failed_legend')
}
}
else if(this.err.data) {
return this.err.data
}
else
{
else {
return { 'message' : this.err }
}
@ -66,7 +71,13 @@
},
props: ['err'], // on object (error.response) or a string
props: {
err: [String, Object], // on object (error.response) or a string
closable: {
type: Boolean,
default: true
}
},
components: {
Modal
@ -81,14 +92,11 @@
},
beforeRouteEnter (to, from, next) {
next(vm => {
if( !vm.err ) {
next({ name: 'accounts' });
}
});
next();
// return to home if no err is provided to prevent an empty error message
if (to.params.err == undefined) {
next({ name: 'accounts' });
}
else next()
},
}