Minor: Format code

pull/5206/head
Angel Fernando Quiroz Campos 2 years ago
parent 11d0e13078
commit 69c5f4f4df
  1. 10
      assets/vue/api/security.js
  2. 9
      assets/vue/components/Login.vue
  3. 122
      assets/vue/store/security.js
  4. 9
      var/vue_templates/components/SidebarLogin.vue

@ -1,14 +1,14 @@
import axios from "axios"; import axios from "axios"
export default { export default {
login(login, password, token) { login(login, password, token) {
return axios.post("/login_json", { return axios.post("/login_json", {
username: login, username: login,
password: password, password: password,
csrf_token: token csrf_token: token,
}); })
}, },
logout() { logout() {
return axios.get("/logout"); return axios.get("/logout")
} },
} }

@ -103,20 +103,23 @@ if (securityStore.isAuthenticated) {
} }
async function performLogin() { async function performLogin() {
let payload = { login: login.value, password: password.value } let payload = {
login: login.value,
password: password.value,
}
let redirect = route.query.redirect let redirect = route.query.redirect
await store.dispatch("security/login", payload) await store.dispatch("security/login", payload)
if (!store.getters["security/hasError"]) { if (!store.getters["security/hasError"]) {
securityStore.user = store.state["security/user"] securityStore.user = store.state["security/user"]
const responseData = await store.dispatch("security/login", payload); const responseData = await store.dispatch("security/login", payload)
if (typeof redirect !== "undefined") { if (typeof redirect !== "undefined") {
await router.push({ path: redirect.toString() }) await router.push({ path: redirect.toString() })
} else { } else {
if (responseData.load_terms) { if (responseData.load_terms) {
window.location.href = responseData.redirect; window.location.href = responseData.redirect
} else { } else {
window.location.href = "/home" window.location.href = "/home"
} }

@ -1,10 +1,10 @@
import SecurityAPI from "../api/security"; import SecurityAPI from "../api/security"
const AUTHENTICATING = "AUTHENTICATING", const AUTHENTICATING = "AUTHENTICATING",
AUTHENTICATING_SUCCESS = "AUTHENTICATING_SUCCESS", AUTHENTICATING_SUCCESS = "AUTHENTICATING_SUCCESS",
AUTHENTICATING_ERROR = "AUTHENTICATING_ERROR", AUTHENTICATING_ERROR = "AUTHENTICATING_ERROR",
AUTHENTICATING_LOGOUT = "AUTHENTICATING_LOGOUT", AUTHENTICATING_LOGOUT = "AUTHENTICATING_LOGOUT",
PROVIDING_DATA_ON_REFRESH_SUCCESS = "PROVIDING_DATA_ON_REFRESH_SUCCESS"; PROVIDING_DATA_ON_REFRESH_SUCCESS = "PROVIDING_DATA_ON_REFRESH_SUCCESS"
export default { export default {
namespaced: true, namespaced: true,
@ -12,120 +12,124 @@ export default {
isLoading: false, isLoading: false,
error: null, error: null,
isAuthenticated: false, isAuthenticated: false,
user: null user: null,
}, },
getters: { getters: {
isLoading(state) { isLoading(state) {
return state.isLoading; return state.isLoading
}, },
hasError(state) { hasError(state) {
return state.error !== null; return state.error !== null
}, },
error(state) { error(state) {
return state.error; return state.error
}, },
isAuthenticated(state) { isAuthenticated(state) {
return state.isAuthenticated; return state.isAuthenticated
}, },
isAdmin(state, getters) { isAdmin(state, getters) {
return getters.isAuthenticated && (getters.hasRole('ROLE_SUPER_ADMIN') || getters.hasRole('ROLE_ADMIN')); return getters.isAuthenticated && (getters.hasRole("ROLE_SUPER_ADMIN") || getters.hasRole("ROLE_ADMIN"))
}, },
isCourseAdmin(state, getters) { isCourseAdmin(state, getters) {
if (getters.isAdmin) { if (getters.isAdmin) {
return true return true
} }
return getters.isAuthenticated return (
&& getters.hasRole("ROLE_CURRENT_COURSE_SESSION_TEACHER") getters.isAuthenticated &&
&& getters.hasRole("ROLE_CURRENT_COURSE_TEACHER") getters.hasRole("ROLE_CURRENT_COURSE_SESSION_TEACHER") &&
getters.hasRole("ROLE_CURRENT_COURSE_TEACHER")
)
}, },
isCurrentTeacher(state, getters) { isCurrentTeacher(state, getters) {
if (!getters.isAuthenticated) { if (!getters.isAuthenticated) {
return false; return false
} }
if (getters.hasRole('ROLE_SUPER_ADMIN') || getters.hasRole('ROLE_ADMIN')) { if (getters.hasRole("ROLE_SUPER_ADMIN") || getters.hasRole("ROLE_ADMIN")) {
return true return true
} }
return getters.hasRole('ROLE_CURRENT_COURSE_TEACHER'); return getters.hasRole("ROLE_CURRENT_COURSE_TEACHER")
}, },
isBoss(state, getters) { isBoss(state, getters) {
return getters.hasRole('ROLE_STUDENT_BOSS'); return getters.hasRole("ROLE_STUDENT_BOSS")
}, },
isStudent(state, getters) { isStudent(state, getters) {
return getters.hasRole('ROLE_STUDENT'); return getters.hasRole("ROLE_STUDENT")
}, },
getUser(state) { getUser(state) {
return state.user; return state.user
}, },
hasRole(state) { hasRole(state) {
return role => { return (role) => {
if (state.user.roles) { if (state.user.roles) {
return state.user.roles.indexOf(role) !== -1; return state.user.roles.indexOf(role) !== -1
} }
return false; return false
};
} }
}, },
},
mutations: { mutations: {
[AUTHENTICATING](state) { [AUTHENTICATING](state) {
state.isLoading = true; state.isLoading = true
state.error = null; state.error = null
state.isAuthenticated = false; state.isAuthenticated = false
state.user = null; state.user = null
}, },
[AUTHENTICATING_SUCCESS](state, user) { [AUTHENTICATING_SUCCESS](state, user) {
state.isLoading = true; state.isLoading = true
state.error = null; state.error = null
state.isAuthenticated = true; state.isAuthenticated = true
state.user = user; state.user = user
}, },
[AUTHENTICATING_ERROR](state, error) { [AUTHENTICATING_ERROR](state, error) {
state.isLoading = false; state.isLoading = false
state.error = error; state.error = error
state.isAuthenticated = false; state.isAuthenticated = false
state.user = null; state.user = null
}, },
[AUTHENTICATING_LOGOUT](state, error) { [AUTHENTICATING_LOGOUT](state, error) {
console.log('AUTHENTICATING_LOGOUT'); console.log("AUTHENTICATING_LOGOUT")
state.isLoading = false; state.isLoading = false
state.error = error; state.error = error
state.isAuthenticated = false; state.isAuthenticated = false
state.user = null; state.user = null
}, },
[PROVIDING_DATA_ON_REFRESH_SUCCESS](state, payload) { [PROVIDING_DATA_ON_REFRESH_SUCCESS](state, payload) {
state.isLoading = false; state.isLoading = false
state.error = null; state.error = null
state.isAuthenticated = payload.isAuthenticated; state.isAuthenticated = payload.isAuthenticated
state.user = payload.user; state.user = payload.user
} },
}, },
actions: { actions: {
async login({ commit }, payload) { async login({ commit }, payload) {
commit(AUTHENTICATING); commit(AUTHENTICATING)
try { try {
const response = await SecurityAPI.login(payload.login, payload.password); const response = await SecurityAPI.login(payload.login, payload.password)
commit(AUTHENTICATING_SUCCESS, response.data); commit(AUTHENTICATING_SUCCESS, response.data)
return response.data; return response.data
} catch (error) { } catch (error) {
commit(AUTHENTICATING_ERROR, error); commit(AUTHENTICATING_ERROR, error)
throw error; throw error
} }
}, },
async logout({ commit }) { async logout({ commit }) {
console.log('logout store/security'); console.log("logout store/security")
await SecurityAPI.logout().then(response => { await SecurityAPI.logout()
commit(AUTHENTICATING_LOGOUT); .then((response) => {
return response.data; commit(AUTHENTICATING_LOGOUT)
}).catch(error => { return response.data
commit(AUTHENTICATING_ERROR, error); })
}); .catch((error) => {
commit(AUTHENTICATING_ERROR, error)
})
}, },
onRefresh({ commit }, payload) { onRefresh({ commit }, payload) {
commit(PROVIDING_DATA_ON_REFRESH_SUCCESS, payload); commit(PROVIDING_DATA_ON_REFRESH_SUCCESS, payload)
} },
} },
} }

@ -22,20 +22,23 @@ const remember = ref(false)
const isLoading = computed(() => store.getters["security/isLoading"]) const isLoading = computed(() => store.getters["security/isLoading"])
async function performLogin() { async function performLogin() {
let payload = { login: login.value, password: password.value } let payload = {
login: login.value,
password: password.value,
}
let redirect = route.query.redirect let redirect = route.query.redirect
await store.dispatch("security/login", payload) await store.dispatch("security/login", payload)
if (!store.getters["security/hasError"]) { if (!store.getters["security/hasError"]) {
securityStore.user = store.state["security/user"] securityStore.user = store.state["security/user"]
const responseData = await store.dispatch("security/login", payload); const responseData = await store.dispatch("security/login", payload)
if (typeof redirect !== "undefined") { if (typeof redirect !== "undefined") {
await router.push({ path: redirect.toString() }) await router.push({ path: redirect.toString() })
} else { } else {
if (responseData.load_terms) { if (responseData.load_terms) {
window.location.href = responseData.redirect; window.location.href = responseData.redirect
} else { } else {
window.location.href = "/home" window.location.href = "/home"
} }

Loading…
Cancel
Save