videon/videon-frontend
videon/videon-frontend
3
0
Fork 0
Code Pull Requests Releases Activity

Fixed auth
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Pünkösd Marcell 2020-12-06 02:13:13 +01:00
parent 633f2af5eb
commit 5a727a6872
5 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Login.vue
View File

@ -41,7 +41,7 @@ export default {
}, },
methods: { methods: {
performLogin() { performLogin() {
this.$store.dispatch("performLogin", this.creds).then(() => { this.$store.dispatch("auth/performLogin", this.creds).then(() => {
this.$router.push({name: 'Dashboard'}); this.$router.push({name: 'Dashboard'});
}).catch(() => { }).catch(() => {
this.invalidLogin = true; this.invalidLogin = true;
@ -52,14 +52,14 @@ export default {
} }
}, },
computed: { computed: {
...mapGetters(['authInProgress']) ...mapGetters('auth', ['authInProgress'])
} }
} }
</script> </script>
<style scoped> <style scoped>
.text-alert { .text-alert {
color: red; color: red !important;
font-weight: bold; font-weight: bold;
} }

7
src/components/Register.vue
View File

@ -23,7 +23,8 @@
<md-card-actions> <md-card-actions>
<md-progress-spinner :md-diameter="30" :md-stroke="3" md-mode="indeterminate" v-if="authInProgress" <md-progress-spinner :md-diameter="30" :md-stroke="3" md-mode="indeterminate" v-if="authInProgress"
class="md-accent"></md-progress-spinner> class="md-accent"></md-progress-spinner>
<md-button type="submit" class="md-primary" :disabled="authInProgress && passwordGood">Register</md-button> <md-button type="submit" class="md-primary" :disabled="authInProgress || !passwordGood">Register
</md-button>
</md-card-actions> </md-card-actions>
</form> </form>
</div> </div>
@ -46,13 +47,13 @@ export default {
methods: { methods: {
performRegister() { performRegister() {
const creds = {name: this.form.name, password: this.form.password}; const creds = {name: this.form.name, password: this.form.password};
this.$store.dispatch("performRegister", creds).then(() => { this.$store.dispatch("auth/performRegister", creds).then(() => {
this.$router.push({name: 'Dashboard'}); this.$router.push({name: 'Dashboard'});
}) })
} }
}, },
computed: { computed: {
...mapGetters(['authInProgress']), ...mapGetters('auth', ['authInProgress']),
passwordGood() { passwordGood() {
return this.form.password !== "" && this.form.password === this.form.passwordConfirm; return this.form.password !== "" && this.form.password === this.form.passwordConfirm;
} }

11
src/components/WorkspaceDrawerContent.vue
View File

@ -8,8 +8,8 @@
<md-list> <md-list>
<md-list-item> <md-list-item>
<md-avatar class="md-avatar-icon">J</md-avatar> <md-avatar class="md-avatar-icon">{{ avatarText }}</md-avatar>
<span class="md-list-item-text">Joska</span> <span class="md-list-item-text">{{ $store.state.auth.name }}</span>
</md-list-item> </md-list-item>
<md-list-item> <md-list-item>
@ -26,10 +26,15 @@ export default {
name: "WorkspaceDrawerContent", name: "WorkspaceDrawerContent",
methods: { methods: {
performLogout() { performLogout() {
this.$store.dispatch("performLogout").then(() => { this.$store.dispatch("auth/performLogout").then(() => {
this.$router.push({name: "Welcome"}) this.$router.push({name: "Welcome"})
}) })
} }
},
computed: {
avatarText() {
return this.$store.state.auth.name.slice(0,2);
}
} }
} }
</script> </script>

2
src/router/index.js
View File

@ -52,7 +52,7 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
const loggedin = store.getters.isLoggedIn; const loggedin = store.getters["auth/isLoggedIn"];
const visitAllowed = to.matched.some(record => record.meta.allowVisit(loggedin)) const visitAllowed = to.matched.some(record => record.meta.allowVisit(loggedin))

40
src/store/auth.js
View File

@ -8,32 +8,31 @@ const baseURL = process.env.VUE_APP_API_LOCATION;
Vue.use(Vuex) Vue.use(Vuex)
export default { export default {
namespaced: true,
state() { state() {
return { return {
auth: { processing: false,
processing: false, token: localStorage.getItem(JWT_KEY_NAME) || '',
token: localStorage.getItem(JWT_KEY_NAME) || '', name: ''
name: ''
}
} }
}, },
mutations: { mutations: {
auth_started(state) { auth_started(state) {
state.auth.processing = true; state.processing = true;
}, },
auth_success(state, token, name) { auth_success(state, {token, name}) {
state.auth.processing = false; state.processing = false;
state.auth.token = token; state.token = token;
state.auth.name = name; state.name = name;
}, },
auth_fail(state) { auth_fail(state) {
state.auth.processing = false; state.processing = false;
state.auth.token = ''; state.token = '';
state.auth.name = ''; state.name = '';
}, },
logout(state) { logout(state) {
state.auth.token = ''; state.token = '';
state.auth.name = ''; state.name = '';
} }
}, },
actions: { actions: {
@ -47,9 +46,8 @@ export default {
return reject(); return reject();
} }
const user = creds.name;
localStorage.setItem(JWT_KEY_NAME, token) localStorage.setItem(JWT_KEY_NAME, token)
commit('auth_success', token, user) commit('auth_success', {token, name: creds.name})
return resolve(resp); return resolve(resp);
}).catch(err => { }).catch(err => {
commit('auth_fail') commit('auth_fail')
@ -68,9 +66,9 @@ export default {
return reject(); return reject();
} }
const user = creds.name;
localStorage.setItem(JWT_KEY_NAME, token) localStorage.setItem(JWT_KEY_NAME, token)
commit('auth_success', token, user) commit('auth_success', {token, name: creds.name})
resolve(resp) resolve(resp)
}).catch(err => { }).catch(err => {
commit('auth_fail') commit('auth_fail')
@ -90,10 +88,10 @@ export default {
modules: {}, modules: {},
getters: { getters: {
isLoggedIn(state) { isLoggedIn(state) {
return !!state.auth.token; return !!state.token;
}, },
authInProgress(state) { authInProgress(state) {
return state.auth.processing; return state.processing;
} }
} }
} }