YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

update Login to be able to force-reload the page

Browse source
This commit is contained in:
axolotle 2021-11-10 19:10:59 +01:00
parent 490092afee
commit 246c001f84
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/store/info.js
View file

@ -103,7 +103,6 @@ export default {
'CONNECT' ({ commit, dispatch }) { 'CONNECT' ({ commit, dispatch }) {
commit('SET_CONNECTED', true) commit('SET_CONNECTED', true)
dispatch('GET_YUNOHOST_INFOS') dispatch('GET_YUNOHOST_INFOS')
router.push(router.currentRoute.query.redirect || { name: 'home' })
}, },
'RESET_CONNECTED' ({ commit }) { 'RESET_CONNECTED' ({ commit }) {

11
app/src/views/Login.vue
View file

@ -33,7 +33,8 @@ export default {
name: 'Login', name: 'Login',
props: { props: {
skipInstallCheck: { type: Boolean, default: false } skipInstallCheck: { type: Boolean, default: false },
forceReload: { type: Boolean, default: false }
}, },
data () { data () {
@ -47,7 +48,13 @@ export default {
methods: { methods: {
login () { login () {
this.$store.dispatch('LOGIN', this.password).catch(err => { this.$store.dispatch('LOGIN', this.password).then(() => {
if (this.forceReload) {
window.location.href = '/yunohost/admin/'
} else {
this.$router.push(this.$router.currentRoute.query.redirect || { name: 'home' })
}
}).catch(err => {
if (err.name !== 'APIUnauthorizedError') throw err if (err.name !== 'APIUnauthorizedError') throw err
this.isValid = false this.isValid = false
}) })