Vue candidature

canapGEST/API/app/Http/Controllers/ApplicantsController.php

@@ -135,12 +135,14 @@ class ApplicantsController extends Controller
     if ($status_restricted) {
       $applicant = DB::table('applicant')->where('applicant_id', $id)
       ->join('position', 'applicant.fk_position', '=', 'position.position_id')
+      ->join('location', 'position.fk_location', '=', 'location.location_id')
       ->join('job', 'position.fk_job', '=', 'job.job_id')
       ->where('fk_status', 'Valide')
       ->first();
     } else {
       $applicant = DB::table('applicant')->where('applicant_id', $id)
       ->join('position', 'applicant.fk_position', '=', 'position.position_id')
+      ->join('location', 'position.fk_location', '=', 'location.location_id')
       ->join('job', 'position.fk_job', '=', 'job.job_id')
       ->first();
     }

canapGEST/API/app/Http/Middleware/JwtMiddleware.php

@@ -12,21 +12,20 @@ class JwtMiddleware
   {
     $token = str_replace('Bearer ', '', $request->headers->get('Authorization'));
 
-    if (!$token) {
+    if ($token == 'null') {
       return response()->json([
-        'error' => 'Token not provided.'
+        'error' => 'Connexion requise'
       ], 401);
     }
     try {
       $content = JWT::decode($token, env('JWT_SECRET'), ['HS256']);
     } catch (ExpiredException $e) {
       return response()->json([
-        'error' => 'Provided token is expired.'
+        'error' => 'Session expirée'
       ], 400);
     } catch (Exception $e) {
-      echo $e;
       return response()->json([
-        'error' => 'An error while decoding token.'
+        'error' => 'Error while decoding token'
       ], 400);
     }
 

canapGEST/Site/src/layouts/MainNavbar.vue

@@ -4,8 +4,6 @@
     <v-toolbar-title>Canap-Gest</v-toolbar-title>
     <v-spacer></v-spacer>
     <v-toolbar-items class="hidden-sm-and-down" v-if="!isLoged">
-      <v-btn flat class="white--text">Link One</v-btn>
-      <v-btn flat class="white--text">Link Two</v-btn>
       <v-btn icon class="white--text">
         <v-icon @click="login">account_circle</v-icon>
       </v-btn>
@@ -38,7 +36,7 @@ export default {
       this.$store.dispatch('moduleUser/login')
     },
     logout() {
-      this.$store.dispatch('moduleUser/logout')
+      this.$store.dispatch('moduleUser/logout', true)
     }
   },
 }

canapGEST/Site/src/plugins/axios.js

@@ -9,10 +9,18 @@ const instance = axios.create({
 instance.interceptors.response.use(function (response) {
   return response;
 }, function (error) {
-  // Affichage des erreurs (snackbar)
-  Object.values(error.response.data).forEach(errMsg => {
-    store.commit('moduleSnackbar/toggle', { open: true, message: errMsg[0], type: 'error' }, { root: true })
-  })
+  if (!error.response) {
+    store.commit('moduleSnackbar/toggle', { open: true, message: 'API non atteignable', type: 'warning' }, { root: true })
+  } else if (error.response.status == 400 || error.response.status == 401) {
+    // Erreur de token
+    store.commit('moduleSnackbar/toggle', { open: true, message: error.response.data.error, type: 'warning' }, { root: true })
+    store.dispatch('moduleUser/logout', false)
+  } else {
+    // Affichage des erreurs (snackbar)
+    Object.values(error.response.data).forEach(errMsg => {
+      store.commit('moduleSnackbar/toggle', { open: true, message: errMsg[0], type: 'error' }, { root: true })
+    })
+  }
   return Promise.reject(error)
 })
 

canapGEST/Site/src/store/modules/applications/actions.js

@@ -11,13 +11,16 @@ export function getApplications(context) {
 }
 
 export function getCurrentApplicationData(context, data) {
-  axios({
-    method: 'get',
-    url: '/applicant/' + data.id
-  })
-    .then(response => {
-      context.commit('setCurrentApplicationData', response.data.personal_data)
+  return new Promise((resolve) => {
+    axios({
+      method: 'get',
+      url: '/applicant/' + data.id
     })
+      .then(response => {
+        context.commit('setCurrentApplicationData', response.data)
+        resolve()
+      })
+  })
 }
 
 export function getCurrentApplicationComments(context, data) {

canapGEST/Site/src/store/modules/user/actions.js

@@ -16,9 +16,11 @@ export function login() {
     })
 }
 
-export function logout() {
+export function logout(context, fullLogout) {
   localStorage.removeItem('stored_token');
-  window.location = 'https://tequila.epfl.ch/logout'
+  if (fullLogout) {
+    window.location = 'https://tequila.epfl.ch/logout'
+  }
 }
 
 export function getUserData(context) {

canapGEST/Site/src/store/modules/user/state.js

 export default {
   userData: {
     tequila: {
-      firstname: String,
-      name: String,
+      firstname: '',
+      name: '',
       group: String,
       user: String,
       sciper: String
     },
-    role: String,
+    role: '',
     permissions: []
   },
   permittedJobs: []