From 5f62862f4ff0a434ca1997536fc0aa6e5031d755 Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:38:26 +0100
Subject: [PATCH 01/11] Rename data in store

---
 src/stores/UserStore.js             | 10 +++----
 tests/unit/stores/UserStore.spec.js | 41 ++++++++++++++---------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 069187dd2..92e27e751 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -2,12 +2,12 @@ import { defineStore } from 'pinia';
 
 export const useUserStore = defineStore('user', {
   state: () => ({
-    id: '',
-    username: '',
-    firstname: '',
-    roles: [],
+    name: '',
+    login: '',
+    email: '',
+    permissions: [],
   }),
   getters: {
-    isEmpty: (state) => state.username.length === 0 && state.firstname.length === 0,
+    isEmpty: (state) => state.login.length === 0,
   },
 });
diff --git a/tests/unit/stores/UserStore.spec.js b/tests/unit/stores/UserStore.spec.js
index 7ac5fa6d3..94ec8b1e4 100644
--- a/tests/unit/stores/UserStore.spec.js
+++ b/tests/unit/stores/UserStore.spec.js
@@ -11,62 +11,61 @@ describe('User Store', () => {
     store = useUserStore();
   });
 
-  describe('Test store variable: username', () => {
+  describe('Test store variable: name', () => {
     it('should be initialized to an empty string', () => {
-      expect(store.username).toEqual('');
+      expect(store.name).toEqual('');
     });
 
     it('should return the new value after being set', () => {
-      store.username = 'username';
+      store.name = 'name';
 
-      expect(store.username).toEqual('username');
+      expect(store.name).toEqual('name');
     });
   });
 
-  describe('Test store variable: firstname', () => {
+  describe('Test store variable: login', () => {
     it('should be initialized to an empty string', () => {
-      expect(store.firstname).toEqual('');
+      expect(store.login).toEqual('');
     });
 
     it('should return the new value after being set', () => {
-      store.firstname = 'firstname';
+      store.login = 'login';
 
-      expect(store.firstname).toEqual('firstname');
+      expect(store.login).toEqual('login');
     });
   });
 
-  describe('Test store variable: id', () => {
+  describe('Test store variable: email', () => {
     it('should be initialized to an empty string', () => {
-      expect(store.id).toEqual('');
+      expect(store.email).toEqual('');
     });
 
     it('should return the new value after being set', () => {
-      store.id = 'id';
+      store.email = 'email';
 
-      expect(store.id).toEqual('id');
+      expect(store.email).toEqual('email');
     });
   });
 
-  describe('Test store variable: roles', () => {
-    it('should be initialized to an empty string', () => {
-      expect(store.roles).toEqual([]);
+  describe('Test store variable: permissions', () => {
+    it('should be initialized to an empty array', () => {
+      expect(store.permissions).toEqual([]);
     });
 
     it('should return the new value after being set', () => {
-      store.roles = ['admin'];
+      store.permissions = ['admin'];
 
-      expect(store.roles).toEqual(['admin']);
+      expect(store.permissions).toEqual(['admin']);
     });
   });
 
   describe('Test store actions: isEmpty', () => {
-    it('should return true if username and firstname are empty', () => {
+    it('should return true if login is empty', () => {
       expect(store.isEmpty).toBeTruthy();
     });
 
-    it('should return false if username and firstname are not empty', () => {
-      store.username = 'username';
-      store.firstname = 'firstname';
+    it('should return false if login is not empty', () => {
+      store.login = 'login';
       expect(store.isEmpty).toBeFalsy();
     });
   });

From 469762e0dc78bb062c0dbaa286093171b933d8ed Mon Sep 17 00:00:00 2001
From: Justine Hell <hell.justine@gmail.com>
Date: Mon, 12 Feb 2024 12:09:51 +0100
Subject: [PATCH 02/11] Update ModelizerSettingsMenu with userStore data

---
 src/components/menu/ModelizerSettingsMenu.vue | 27 +++++++++-----
 .../menu/ModelizerSettingsMenu.spec.js        | 37 +++++++++++++------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/components/menu/ModelizerSettingsMenu.vue b/src/components/menu/ModelizerSettingsMenu.vue
index a7599caab..5304bebe6 100644
--- a/src/components/menu/ModelizerSettingsMenu.vue
+++ b/src/components/menu/ModelizerSettingsMenu.vue
@@ -14,9 +14,9 @@
         text-color="white"
         size="md"
         font-size="12px"
-        :title="`${userStore.firstname} ${userStore.username}`"
+        :title="userStore.login"
       >
-        {{ userInitials }}
+        {{ userStore.name?.at(0) }}
       </q-avatar>
       <q-avatar
         v-else
@@ -29,19 +29,31 @@
       />
     </template>
     <q-list>
-      <q-item>
+      <q-item
+        v-if="!(userStore?.isEmpty)"
+      >
         <q-item-section>
           <q-item-label overline>
-            {{ userStore.firstname }}
+            {{ userStore.name }}
           </q-item-label>
           <q-item-label caption>
-            {{ userStore.username }}
+            {{ userStore.login }}
           </q-item-label>
-          <q-item-label caption>
+          <q-item-label
+            v-if="userStore.email"
+            caption
+          >
             {{ userStore.email }}
           </q-item-label>
         </q-item-section>
       </q-item>
+      <q-item v-else>
+        <q-item-section>
+          <q-item-label overline>
+            {{ $t('page.modelizer.settings.user.unknown') }}
+          </q-item-label>
+        </q-item-section>
+      </q-item>
       <template
         v-for="menuItem in menuItems"
         :key="menuItem.key"
@@ -122,9 +134,6 @@ const menuItems = computed(() => [
     visible: !!props.projectName,
   },
 ]);
-const userInitials = computed(
-  () => userStore.value.firstname?.at(0).toUpperCase(),
-);
 
 /**
  * Send event to open the dialog corresponding to the key.
diff --git a/tests/unit/components/menu/ModelizerSettingsMenu.spec.js b/tests/unit/components/menu/ModelizerSettingsMenu.spec.js
index 7db392815..1193f8e67 100644
--- a/tests/unit/components/menu/ModelizerSettingsMenu.spec.js
+++ b/tests/unit/components/menu/ModelizerSettingsMenu.spec.js
@@ -1,9 +1,11 @@
 import { installQuasarPlugin } from '@quasar/quasar-app-extension-testing-unit-jest';
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
 import ModelizerSettingsMenu from 'src/components/menu/ModelizerSettingsMenu.vue';
 import DialogEvent from 'src/composables/events/DialogEvent';
 import GitEvent from 'src/composables/events/GitEvent';
 import { setActivePinia, createPinia } from 'pinia';
+import { createI18n } from 'vue-i18n';
+import i18nConfiguration from 'src/i18n';
 
 installQuasarPlugin();
 
@@ -17,6 +19,23 @@ jest.mock('src/composables/events/GitEvent', () => ({
   },
 }));
 
+const vCanMock = {
+  inserted(el, binding) {
+    el.setAttribute('data-v-can-mock', binding.value);
+  },
+};
+const global = {
+  directives: {
+    can: vCanMock,
+  },
+  plugins: [
+    createI18n({
+      locale: 'en-US',
+      messages: i18nConfiguration,
+    }),
+  ],
+};
+
 jest.mock('src/composables/Project', () => ({
   getProjectById: jest.fn((id) => {
     if (id === 'noGit') {
@@ -33,10 +52,6 @@ jest.mock('src/composables/Project', () => ({
   }),
 }));
 
-jest.mock('src/composables/UserAuthentication', () => ({
-  getUser: jest.fn(() => Promise.resolve({})),
-}));
-
 describe('Test component: ModelizerSettingsMenu', () => {
   let wrapper;
   let subscribe;
@@ -57,13 +72,11 @@ describe('Test component: ModelizerSettingsMenu', () => {
       return { unsubscribe };
     });
 
-    wrapper = shallowMount(ModelizerSettingsMenu, {
+    wrapper = mount(ModelizerSettingsMenu, {
       props: {
         projectName: 'test',
       },
-      mocks: {
-        DialogEvent,
-      },
+      global,
     });
   });
 
@@ -84,10 +97,11 @@ describe('Test component: ModelizerSettingsMenu', () => {
 
     describe('Test computed: hasRepository', () => {
       it('should be false when no git repository is defined', () => {
-        wrapper = shallowMount(ModelizerSettingsMenu, {
+        wrapper = mount(ModelizerSettingsMenu, {
           props: {
             projectName: 'noGit',
           },
+          global,
         });
         expect(wrapper.vm.hasRepository).toEqual(false);
       });
@@ -99,10 +113,11 @@ describe('Test component: ModelizerSettingsMenu', () => {
 
     describe('Test computed: menuItems', () => {
       it('should display "GitAddRemote" menu when no git repository is defined', () => {
-        wrapper = shallowMount(ModelizerSettingsMenu, {
+        wrapper = mount(ModelizerSettingsMenu, {
           props: {
             projectName: 'noGit',
           },
+          global,
         });
         expect(wrapper.vm.menuItems).toEqual([
           {

From 7f8a14c9ce1df9446008ca56d941e8321a1beb79 Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:40:31 +0100
Subject: [PATCH 03/11] Add api in boot/axios

---
 src/boot/axios.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 8c98171c7..e9205f6ad 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -5,9 +5,24 @@ const templateLibraryApiClient = axios.create({
   timeout: 15000,
 });
 
+const api = axios.create({
+  baseURL: '/api',
+  timeout: 15000,
+});
+
 templateLibraryApiClient.interceptors.response.use(
   (response) => Promise.resolve(response),
   (error) => Promise.reject(error),
 );
 
-export { axios, templateLibraryApiClient };
+api.interceptors.response.use(
+  ({ data }) => Promise.resolve(data),
+  (error) => {
+    if (error.response.status === 401) {
+      window.location.href = `${process.env.BACKEND_URL}/api/login`;
+    }
+    return Promise.reject(error);
+  },
+);
+
+export { api, templateLibraryApiClient };

From ec92dab3525756ed420159ea2196da547f2192a5 Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:41:25 +0100
Subject: [PATCH 04/11] Create UserService and regroup all methods from
 LetoModelizerApi and UserAuthentication

---
 src/composables/LetoModelizerApi.js           |  79 ----------
 src/composables/UserAuthentication.js         |  78 ----------
 src/services/UserService.js                   |  47 ++++++
 .../unit/composables/LetoModelizerApi.spec.js | 124 ---------------
 .../composables/UserAuthentication.spec.js    | 147 ------------------
 tests/unit/services/UserService.spec.js       |  98 ++++++++++++
 6 files changed, 145 insertions(+), 428 deletions(-)
 delete mode 100644 src/composables/LetoModelizerApi.js
 delete mode 100644 src/composables/UserAuthentication.js
 create mode 100644 src/services/UserService.js
 delete mode 100644 tests/unit/composables/LetoModelizerApi.spec.js
 delete mode 100644 tests/unit/composables/UserAuthentication.spec.js
 create mode 100644 tests/unit/services/UserService.spec.js

diff --git a/src/composables/LetoModelizerApi.js b/src/composables/LetoModelizerApi.js
deleted file mode 100644
index 6cda8f8d9..000000000
--- a/src/composables/LetoModelizerApi.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import axios from 'axios';
-
-/**
- * Get the url to authenticate the user through its github provider.
- * @returns {Promise<object>} Promise with the url on success otherwise an error.
- */
-export async function getAuthenticationUrl() {
-  return axios.get('backend/authenticationUrl');
-}
-
-/**
- * Log the user through the Parse-Server backend using the temporary code
- * obtained from the github provider (from the url given by the backend).
- * @param {string} temporaryCode - The temporary code obtained from the github provider.
- * @returns {Promise<object>} Promise with the logged-in user information on success
- * otherwise an error.
- */
-export async function login(temporaryCode) {
-  const headers = {
-    headers: {
-      Accept: 'application/json',
-      'X-Parse-Application-Id': process.env.BACKEND_APP_ID,
-    },
-  };
-  const params = {
-    code: temporaryCode,
-  };
-
-  return axios.post('/backend/api/functions/GitHubAuth', params, headers)
-    .then((response) => {
-      const requestParams = {
-        authData: response.data.result.authData,
-        firstname: response.data.result.firstname,
-        username: response.data.result.username,
-      };
-
-      // This call is to link the user to its provider (github).
-      // In Parse-Server this call must be done using the previous received result.
-      return axios.post('/backend/api/users/', requestParams, headers);
-    });
-}
-
-/**
- * Retrieve (GET request) information about the current user.
- * @param {string} sessionToken - The current user's session token.
- * @returns {Promise<object>} Promise with the logged-in user information on success
- * otherwise an error.
- */
-export async function getUserInformation(sessionToken) {
-  const headers = {
-    headers: {
-      Accept: 'application/json',
-      'X-Parse-Application-Id': process.env.BACKEND_APP_ID,
-      'X-Parse-Session-Token': sessionToken,
-    },
-  };
-
-  return axios.get('/backend/api/users/me', headers);
-}
-
-/**
- * Get all roles of a user.
- * @param {string} userId - User id.
- * @param {string} sessionToken - The current user's session token.
- * @returns {Promise<object[]>} Return an array of roles. Role is a parseObject server, so see
- * documentation on api to have more information.
- */
-export async function getUserRoles(userId, sessionToken) {
-  const headers = {
-    headers: {
-      Accept: 'application/json',
-      'X-Parse-Application-Id': process.env.BACKEND_APP_ID,
-      'X-Parse-Session-Token': sessionToken,
-    },
-  };
-  const queryParameters = `where={"users":{"__type":"Pointer","className":"_User","objectId":"${userId}"}}`;
-
-  return axios.get(`/backend/api/roles?${queryParameters}`, headers);
-}
diff --git a/src/composables/UserAuthentication.js b/src/composables/UserAuthentication.js
deleted file mode 100644
index 372433f3c..000000000
--- a/src/composables/UserAuthentication.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import * as api from 'src/composables/LetoModelizerApi';
-import { useUserStore } from 'src/stores/UserStore';
-
-/**
- * Set the current user's session token in the local storage.
- * @param {string} sessionToken - The session token to store.
- */
-export function setUserSessionToken(sessionToken) {
-  localStorage.setItem('sessionToken', sessionToken);
-}
-
-/**
- * Get the current user's session token from the local storage.
- * @returns {string|null} The user's session token from the local storage.
- */
-export function getUserSessionToken() {
-  return localStorage.getItem('sessionToken');
-}
-
-/**
- * Remove the current user's session token from the local storage.
- */
-export function removeUserSessionToken() {
-  localStorage.removeItem('sessionToken');
-}
-
-/**
- * Log in the user using its temporaryCode. Once the user is logged, it saves
- * the user information in the dedicated store.
- * @param {string} temporaryCode - The temporary code obtained from the github provider.
- * @returns {Promise<string>} Promise with the user's token on success
- * otherwise an error.
- */
-export async function login(temporaryCode) {
-  return api.login(temporaryCode)
-    .then((response) => {
-      const userStore = useUserStore();
-
-      setUserSessionToken(response.data.sessionToken);
-
-      userStore.id = response.data.objectId;
-      userStore.username = response.data.username;
-      userStore.firstname = response.data.firstname;
-
-      return response.data.sessionToken;
-    });
-}
-
-/**
- * Initialize (GET request) information about the current user and store it in the dedicated store.
- * @param {string} sessionToken - The current user's session token.
- * @returns {Promise<object>} Promise with the logged-in user information on success
- * otherwise an error.
- */
-export async function initUserInformation(sessionToken) {
-  return api.getUserInformation(sessionToken)
-    .then((response) => {
-      const userStore = useUserStore();
-
-      userStore.id = response.data.objectId;
-      userStore.username = response.data.username;
-      userStore.firstname = response.data.firstname;
-    });
-}
-
-/**
- * Retrieve all roles of user and store them in the dedicated store.
- * @param {string} userId - User id.
- * @param {string} sessionToken - The current user's session token.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function initUserRoles(userId, sessionToken) {
-  return api.getUserRoles(userId, sessionToken).then((response) => {
-    const userStore = useUserStore();
-
-    userStore.roles = response.data.results.map(({ name }) => name);
-  });
-}
diff --git a/src/services/UserService.js b/src/services/UserService.js
new file mode 100644
index 000000000..6a82bf328
--- /dev/null
+++ b/src/services/UserService.js
@@ -0,0 +1,47 @@
+import { api } from 'boot/axios';
+import { useUserStore } from 'src/stores/UserStore';
+
+/**
+ * Retrieve (GET request) information about the current user.
+ * @returns {Promise<object>} Promise with the logged-in user information on success
+ * otherwise an error.
+ */
+export async function getCurrent() {
+  return api.get('/users/me');
+}
+
+/**
+ * Retrieve (GET request) all permissions of a user.
+ * @returns {Promise<object[]>} Return an array of permissions.
+ */
+export async function getUserPermissions() {
+  return api.get('/users/me/permissions');
+}
+
+/**
+ * Initialize (GET request) information about the current user and store it in the dedicated store.
+ * @returns {Promise<object>} Promise with the logged-in user information on success
+ * otherwise an error.
+ */
+export async function initUserInformation() {
+  return getCurrent()
+    .then((data) => {
+      const userStore = useUserStore();
+
+      userStore.login = data.login;
+      userStore.name = data.name;
+      userStore.email = data.email;
+    });
+}
+
+/**
+ * Retrieve (GET request) all permissions of user and store them in the dedicated store.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function initUserPermissions() {
+  return getUserPermissions().then((data) => {
+    const userStore = useUserStore();
+
+    userStore.permissions = data;
+  });
+}
diff --git a/tests/unit/composables/LetoModelizerApi.spec.js b/tests/unit/composables/LetoModelizerApi.spec.js
deleted file mode 100644
index c5c29ccf0..000000000
--- a/tests/unit/composables/LetoModelizerApi.spec.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import axios from 'axios';
-import {
-  login,
-  getUserInformation,
-  getAuthenticationUrl,
-  getUserRoles,
-} from 'src/composables/LetoModelizerApi';
-
-jest.mock('axios');
-
-describe('User Authentication', () => {
-  describe('Test function: getAuthenticationUrl', () => {
-    it('should return the authentication url', async () => {
-      const resp = { url: 'http://test:9090' };
-      axios.get.mockResolvedValueOnce(resp);
-
-      const res = await getAuthenticationUrl();
-
-      expect(res.url).toEqual('http://test:9090');
-    });
-  });
-
-  describe('Test function: login', () => {
-    it('should return the information about the authentication', async () => {
-      const resultPostGithubAuth = {
-        data: {
-          result: {
-            createdAt: '2023-10-25T12:19:09.068Z',
-            updatedAt: '2023-10-25T12:19:09.068Z',
-            username: 'MySuperUsername',
-            authData: {
-              github: {
-                id: 99999,
-                access_token: 'gho_MySuperAccessToken',
-              },
-            },
-            firstname: 'Pradeep',
-            ACL: {
-              Ylof2OIHfi: {
-                read: true,
-                write: true,
-              },
-            },
-            authDataResponse: {},
-            objectId: 'Ylof2OIHfi',
-            __type: 'Object',
-            className: '_User',
-          },
-        },
-      };
-      const resultPostUser = {
-        objectId: 'Ylof2OIHfi',
-        createdAt: '2023-10-25T12:19:09.068Z',
-        updatedAt: '2023-10-25T12:19:09.068Z',
-        username: 'MySuperUsername',
-        authData: {
-          github: {
-            id: 99999,
-            access_token: 'gho_MySuperAccessToken',
-          },
-        },
-        firstname: 'Pradeep',
-        ACL: {
-          Ylof2OIHfi: {
-            read: true,
-            write: true,
-          },
-        },
-        sessionToken: 'r:dead779dcda4970cc7f96c09a328d771',
-      };
-      axios.post.mockResolvedValueOnce(resultPostGithubAuth).mockResolvedValueOnce(resultPostUser);
-
-      const res = await login('tempCode');
-      expect(res.sessionToken).toEqual('r:dead779dcda4970cc7f96c09a328d771');
-      expect(res.username).toEqual('MySuperUsername');
-      expect(res.firstname).toEqual('Pradeep');
-    });
-  });
-
-  describe('Test function: getUserInformation', () => {
-    it('should return the current user information', async () => {
-      const resultPostUser = {
-        objectId: 'Ylof2OIHfi',
-        createdAt: '2023-10-25T12:19:09.068Z',
-        updatedAt: '2023-10-25T12:19:09.068Z',
-        username: 'MySuperUsername',
-        authData: {
-          github: {
-            id: 99999,
-            access_token: 'gho_MySuperAccessToken',
-          },
-        },
-        firstname: 'Pradeep',
-        ACL: {
-          Ylof2OIHfi: {
-            read: true,
-            write: true,
-          },
-        },
-        sessionToken: 'r:dead779dcda4970cc7f96c09a328d771',
-      };
-      axios.get.mockResolvedValueOnce(resultPostUser);
-
-      const res = await getUserInformation('r:dead779dcda4970cc7f96c09a328d771');
-      expect(res.sessionToken).toEqual('r:dead779dcda4970cc7f96c09a328d771');
-      expect(res.username).toEqual('MySuperUsername');
-      expect(res.firstname).toEqual('Pradeep');
-    });
-  });
-
-  describe('Test function: getUserRoles', () => {
-    it('should return the current user roles', async () => {
-      const resultPostUserRoles = {
-        results: [{
-          name: 'admin',
-        }],
-      };
-      axios.get.mockResolvedValueOnce(resultPostUserRoles);
-
-      const res = await getUserRoles('r:dead779dcda4970cc7f96c09a328d771');
-      expect(res.results).toEqual([{ name: 'admin' }]);
-    });
-  });
-});
diff --git a/tests/unit/composables/UserAuthentication.spec.js b/tests/unit/composables/UserAuthentication.spec.js
deleted file mode 100644
index f2eed8733..000000000
--- a/tests/unit/composables/UserAuthentication.spec.js
+++ /dev/null
@@ -1,147 +0,0 @@
-import {
-  setUserSessionToken,
-  getUserSessionToken,
-  removeUserSessionToken,
-  login,
-  initUserInformation, initUserRoles,
-} from 'src/composables/UserAuthentication';
-import { setActivePinia, createPinia } from 'pinia';
-import { useUserStore } from 'src/stores/UserStore';
-
-jest.mock('src/composables/LetoModelizerApi', () => ({
-  login(tempCode) {
-    if (tempCode === 'error') {
-      return Promise.reject();
-    }
-
-    return Promise.resolve({
-      data: {
-        objectId: 'Ylof2OIHfi',
-        createdAt: '2023-10-25T12:19:09.068Z',
-        updatedAt: '2023-10-25T12:19:09.068Z',
-        username: 'MySuperUsername',
-        authData: {
-          github: {
-            id: 99999,
-            access_token: 'gho_MySuperAccessToken',
-          },
-        },
-        firstname: 'Pradeep',
-        ACL: {
-          Ylof2OIHfi: {
-            read: true,
-            write: true,
-          },
-        },
-        sessionToken: 'r:dead779dcda4970cc7f96c09a328d771',
-      },
-    });
-  },
-  getUserInformation(sessionToken) {
-    if (sessionToken === 'error') {
-      return Promise.reject();
-    }
-
-    return Promise.resolve({
-      data: {
-        objectId: 'Ylof2OIHfi',
-        createdAt: '2023-10-25T12:19:09.068Z',
-        updatedAt: '2023-10-25T12:19:09.068Z',
-        username: 'MySuperUsername',
-        authData: {
-          github: {
-            id: 99999,
-            access_token: 'gho_MySuperAccessToken',
-          },
-        },
-        firstname: 'Pradeep',
-        ACL: {
-          Ylof2OIHfi: {
-            read: true,
-            write: true,
-          },
-        },
-        sessionToken: 'r:dead779dcda4970cc7f96c09a328d771',
-      },
-    });
-  },
-  getUserRoles() {
-    return Promise.resolve({
-      data: {
-        results: [{
-          name: 'admin',
-        }],
-      },
-    });
-  },
-}));
-
-describe('User Authentication', () => {
-  describe('Test function: setUserSessionToken', () => {
-    it('should set the session token in the local storage', () => {
-      const setItem = jest.spyOn(Storage.prototype, 'setItem');
-
-      setUserSessionToken('MySessionToken');
-
-      expect(setItem).toHaveBeenCalledWith('sessionToken', 'MySessionToken');
-    });
-  });
-
-  describe('Test function: getUserSessionToken', () => {
-    it('should get the session token from the local storage', () => {
-      const getItem = jest.spyOn(Storage.prototype, 'getItem');
-
-      getUserSessionToken();
-
-      expect(getItem).toHaveBeenCalledWith('sessionToken');
-    });
-  });
-
-  describe('Test function: removeUserSessionToken', () => {
-    it('should remove the session token from the local storage', () => {
-      const removeItem = jest.spyOn(Storage.prototype, 'removeItem');
-
-      removeUserSessionToken();
-
-      expect(removeItem).toHaveBeenCalled();
-    });
-  });
-
-  describe('Test function: login', () => {
-    it('should login using the api and store the user info in pinia', async () => {
-      setActivePinia(createPinia());
-      const store = useUserStore();
-
-      jest.spyOn(Storage.prototype, 'setItem');
-
-      const token = await login('tempCode');
-
-      expect(store.firstname).toEqual('Pradeep');
-      expect(token).toEqual('r:dead779dcda4970cc7f96c09a328d771');
-    });
-  });
-
-  describe('Test function: initUserInformation', () => {
-    it('should retrieve user info for storing its data', async () => {
-      setActivePinia(createPinia());
-      const store = useUserStore();
-
-      jest.spyOn(Storage.prototype, 'setItem');
-
-      await initUserInformation('tempCode');
-
-      expect(store.firstname).toEqual('Pradeep');
-    });
-  });
-
-  describe('Test function: initUserRoles', () => {
-    it('should retrieve user roles for storing its data', async () => {
-      setActivePinia(createPinia());
-      const store = useUserStore();
-
-      await initUserRoles('userId', 'tempCode');
-
-      expect(store.roles).toEqual(['admin']);
-    });
-  });
-});
diff --git a/tests/unit/services/UserService.spec.js b/tests/unit/services/UserService.spec.js
new file mode 100644
index 000000000..c60005f43
--- /dev/null
+++ b/tests/unit/services/UserService.spec.js
@@ -0,0 +1,98 @@
+import { api } from 'src/boot/axios';
+import * as UserService from 'src/services/UserService';
+import { setActivePinia, createPinia } from 'pinia';
+import { useUserStore } from 'src/stores/UserStore';
+
+jest.mock('src/boot/axios', () => ({
+  api: {
+    get: jest.fn(),
+  },
+}));
+
+describe('User Authentication', () => {
+  describe('Test function: getCurrent', () => {
+    it('should return the current user information', async () => {
+      const resultGetUser = { email: null, login: 'PowerRangerGreen', name: 'Seb' };
+      api.get.mockImplementation(() => Promise.resolve(resultGetUser));
+
+      const res = await UserService.getCurrent();
+
+      expect(res.email).toEqual(null);
+      expect(res.login).toEqual('PowerRangerGreen');
+      expect(res.name).toEqual('Seb');
+    });
+  });
+
+  describe('Test function: getUserPermissions', () => {
+    it('should return the current user permissions', async () => {
+      const resultGetUserPerm = {
+        data: [
+          {
+            entity: 'COMPONENT_TEMPLATE',
+            action: 'CREATE',
+          },
+          {
+            entity: 'PROJECT_TEMPLATE',
+            action: 'CREATE',
+          },
+        ],
+      };
+      api.get.mockImplementation(() => Promise.resolve(resultGetUserPerm));
+
+      const res = await UserService.getUserPermissions();
+
+      expect(res.data[0]).toEqual({
+        entity: 'COMPONENT_TEMPLATE',
+        action: 'CREATE',
+      });
+    });
+  });
+
+  describe('Test function: initUserInformation', () => {
+    it('should initialize user information in the user store', async () => {
+      setActivePinia(createPinia());
+      const store = useUserStore();
+
+      const resultGetUser = { login: 'PowerRangerGreen', name: 'Seb', email: 'seb@example.com' };
+      api.get.mockImplementation(() => Promise.resolve(resultGetUser));
+
+      await UserService.initUserInformation();
+
+      expect(store.login).toEqual('PowerRangerGreen');
+      expect(store.name).toEqual('Seb');
+      expect(store.email).toEqual('seb@example.com');
+    });
+  });
+
+  describe('Test function: initUserPermissions', () => {
+    it('should initialize user permissions in the user store', async () => {
+      setActivePinia(createPinia());
+      const store = useUserStore();
+
+      const resultGetUserPerm = [
+        {
+          entity: 'COMPONENT_TEMPLATE',
+          action: 'CREATE',
+        },
+        {
+          entity: 'PROJECT_TEMPLATE',
+          action: 'CREATE',
+        },
+      ];
+      api.get.mockImplementation(() => Promise.resolve(resultGetUserPerm));
+
+      await UserService.initUserPermissions();
+
+      expect(store.permissions).toEqual([
+        {
+          entity: 'COMPONENT_TEMPLATE',
+          action: 'CREATE',
+        },
+        {
+          entity: 'PROJECT_TEMPLATE',
+          action: 'CREATE',
+        },
+      ]);
+    });
+  });
+});

From 6592e25c902018817fb12086b6459cf2960223fb Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:47:51 +0100
Subject: [PATCH 05/11] Update Splash to use the new way of auth with the new
 api

---
 src/i18n/en-US/index.js             |  4 +-
 src/pages/SplashPage.vue            | 61 +++++---------------
 tests/unit/pages/SplashPage.spec.js | 87 ++++++-----------------------
 3 files changed, 33 insertions(+), 119 deletions(-)

diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index ced775104..f17a9e256 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -227,8 +227,8 @@ export default {
       },
     },
     authentication: {
-      login: 'An error occured while login. Please check your leto-modelizer-api.',
-      fetchingData: 'An error occured while fetching data',
+      fetchingUserInformation: 'An error occured while fetching user data information',
+      fetchingUserPermissions: 'An error occured while fetching user data permissions',
     },
   },
   error404: {
diff --git a/src/pages/SplashPage.vue b/src/pages/SplashPage.vue
index 4abaac845..43b4fa983 100644
--- a/src/pages/SplashPage.vue
+++ b/src/pages/SplashPage.vue
@@ -32,74 +32,39 @@ import { useRoute, useRouter } from 'vue-router';
 import { onMounted } from 'vue';
 import { initPlugins } from 'src/composables/PluginManager';
 import PluginEvent from 'src/composables/events/PluginEvent';
-import {
-  getUserSessionToken,
-  removeUserSessionToken,
-  login,
-  initUserInformation,
-  initUserRoles,
-} from 'src/composables/UserAuthentication';
-import { useUserStore } from 'src/stores/UserStore';
+import * as UserService from 'src/services/UserService';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-const userStore = useUserStore();
 
 /**
- * Initialize the user for the appplication, if needed.
- * If the backend is activated in the configuration, it will check
- * that the session token is present or not. If not, it will try to login the user.
- * If already connected, it will just retrieve the user info.
+ * Initialize the user by fetching user information and permissions.
+ * @returns {Promise<void>} A promise that resolves when the user is initialized.
  */
 async function initUser() {
   if (!process.env.HAS_BACKEND) {
     return;
   }
 
-  let token = getUserSessionToken();
-
-  if (!token) {
-    await login(route.query.authCode)
-      .then((data) => {
-        token = data;
-        router.replace(route.fullPath.replaceAll(/(authC|c)ode=[^&]+[&]{0,1}/g, ''));
+  await Promise.allSettled([
+    UserService.initUserInformation()
+      .catch(() => {
         Notify.create({
-          type: 'positive',
-          message: t('page.splash.login.success'),
+          type: 'negative',
+          message: t('errors.authentication.fetchingUserInformation'),
           html: true,
         });
-      })
+      }),
+    UserService.initUserPermissions()
       .catch(() => {
         Notify.create({
           type: 'negative',
-          message: t('errors.authentication.login'),
+          message: t('errors.authentication.fetchingUserPermissions'),
           html: true,
         });
-      });
-  } else if (token && useUserStore().isEmpty) {
-    // if the user refresh the page, the token is still valid and user is
-    // still connected but the store has been cleaned. So we need to
-    // get back its information.
-    await initUserInformation(token)
-      .catch((error) => {
-        const errorData = error.response?.data;
-
-        // Code 209 == Token Expired
-        if (errorData?.code === 209) {
-          removeUserSessionToken();
-          router.push({ name: 'Splash', query: { from: route.query.from } });
-        } else {
-          Notify.create({
-            type: 'negative',
-            message: t('errors.authentication.fetchingData'),
-            html: true,
-          });
-        }
-      });
-  }
-
-  await initUserRoles(userStore.id, token);
+      }),
+  ]);
 }
 
 onMounted(async () => {
diff --git a/tests/unit/pages/SplashPage.spec.js b/tests/unit/pages/SplashPage.spec.js
index 71b695182..6ee65b535 100644
--- a/tests/unit/pages/SplashPage.spec.js
+++ b/tests/unit/pages/SplashPage.spec.js
@@ -3,12 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import SplashPage from 'src/pages/SplashPage.vue';
 import PluginEvent from 'src/composables/events/PluginEvent';
 import PluginManager from 'src/composables/PluginManager';
-import {
-  removeUserSessionToken,
-  getUserSessionToken,
-  login,
-  initUserInformation, initUserRoles,
-} from 'src/composables/UserAuthentication';
+import { initUserInformation, initUserPermissions } from 'src/services/UserService';
 import { setActivePinia, createPinia } from 'pinia';
 import { Notify } from 'quasar';
 
@@ -45,12 +40,9 @@ jest.mock('vue-router', () => ({
   }),
 }));
 
-jest.mock('src/composables/UserAuthentication', () => ({
-  login: jest.fn(),
-  getUserSessionToken: jest.fn(),
-  removeUserSessionToken: jest.fn(),
+jest.mock('src/services/UserService', () => ({
   initUserInformation: jest.fn(),
-  initUserRoles: jest.fn(),
+  initUserPermissions: jest.fn(),
 }));
 
 jest.useFakeTimers();
@@ -92,67 +84,44 @@ describe('Test component: SplashPage', () => {
 
   describe('Test function: initUser', () => {
     beforeEach(() => {
-      login.mockClear();
-      getUserSessionToken.mockClear();
       initUserInformation.mockClear();
-      initUserRoles.mockClear();
+      initUserPermissions.mockClear();
 
       process.env.HAS_BACKEND = true;
     });
 
-    it('should call backend when it is activated and session token is not in storage', async () => {
-      getUserSessionToken.mockImplementation(() => false);
-      login.mockImplementation(() => Promise.resolve({}));
-      Notify.create = jest.fn();
-
+    it('should call backend when it is activated', async () => {
+      initUserInformation.mockImplementation(() => Promise.resolve({}));
+      initUserPermissions.mockImplementation(() => Promise.resolve({}));
       await wrapper.vm.initUser();
 
-      expect(getUserSessionToken).toHaveBeenCalledTimes(1);
-      expect(login).toHaveBeenCalledTimes(1);
-      expect(initUserRoles).toHaveBeenCalledTimes(1);
-      expect(Notify.create).toHaveBeenCalledWith(expect.objectContaining({ type: 'positive' }));
+      expect(initUserInformation).toHaveBeenCalledTimes(1);
+      expect(initUserPermissions).toHaveBeenCalledTimes(1);
     });
 
-    it('should call backend when it is activated but login failed', async () => {
-      getUserSessionToken.mockImplementation(() => false);
-      login.mockImplementation(() => Promise.reject({}));
+    it('should call backend when it is activated but initUserInformation failed', async () => {
+      initUserInformation.mockImplementation(() => Promise.reject({}));
       Notify.create = jest.fn();
 
       await wrapper.vm.initUser();
 
-      expect(getUserSessionToken).toHaveBeenCalledTimes(1);
-      expect(login).toHaveBeenCalledTimes(1);
-      expect(initUserRoles).toHaveBeenCalledTimes(1);
-      expect(Notify.create).toHaveBeenCalledWith(expect.objectContaining({ type: 'negative' }));
-    });
-
-    it('should call backend when it is activated and session token is already in storage', async () => {
-      getUserSessionToken.mockImplementation(() => true);
-      initUserInformation.mockImplementation(() => Promise.resolve({}));
-      setActivePinia(createPinia());
-
-      await wrapper.vm.initUser();
-
-      expect(getUserSessionToken).toHaveBeenCalledTimes(1);
       expect(initUserInformation).toHaveBeenCalledTimes(1);
-      expect(initUserRoles).toHaveBeenCalledTimes(1);
+      expect(initUserPermissions).toHaveBeenCalledTimes(1);
+      expect(Notify.create).toHaveBeenCalledWith(expect.objectContaining({ type: 'negative' }));
     });
 
-    it('should call backend when it is activated and session token is already in storage but initUserInformation fails', async () => {
-      getUserSessionToken.mockImplementation(() => true);
-      initUserInformation.mockImplementation(() => Promise.reject({}));
-      setActivePinia(createPinia());
+    it('should call backend when it is activated but initUserPermissions failed', async () => {
+      initUserPermissions.mockImplementation(() => Promise.reject({}));
       Notify.create = jest.fn();
 
       await wrapper.vm.initUser();
 
-      expect(getUserSessionToken).toHaveBeenCalledTimes(1);
       expect(initUserInformation).toHaveBeenCalledTimes(1);
-      expect(initUserRoles).toHaveBeenCalledTimes(1);
+      expect(initUserPermissions).toHaveBeenCalledTimes(1);
       expect(Notify.create).toHaveBeenCalledWith(expect.objectContaining({ type: 'negative' }));
     });
 
-    it('should call not backend when it is not activated and session token is already in storage but initUserInformation fails', async () => {
+    it('should not call backend when it is not activated', async () => {
       // env variables are automatically converted to strings when set in unit tests.
       // So use `delete` to mock `process.env.HAS_BACKEND = false`.
       delete process.env.HAS_BACKEND;
@@ -160,28 +129,8 @@ describe('Test component: SplashPage', () => {
 
       await wrapper.vm.initUser();
 
-      expect(getUserSessionToken).toHaveBeenCalledTimes(0);
       expect(initUserInformation).toHaveBeenCalledTimes(0);
-      expect(initUserRoles).toHaveBeenCalledTimes(0);
-      expect(Notify.create).not.toHaveBeenCalledWith(expect.objectContaining({ type: 'negative' }));
-    });
-
-    it('should redo login if session token is expired', async () => {
-      getUserSessionToken.mockImplementation(() => true);
-      initUserInformation.mockImplementation(() => Promise.reject(
-        {
-          response: {
-            data: { code: 209 },
-          },
-        },
-      ));
-      setActivePinia(createPinia());
-      Notify.create = jest.fn();
-
-      await wrapper.vm.initUser();
-
-      expect(getUserSessionToken).toHaveBeenCalledTimes(1);
-      expect(removeUserSessionToken).toHaveBeenCalledTimes(1);
+      expect(initUserPermissions).toHaveBeenCalledTimes(0);
     });
   });
 });

From 95954ee8e29264625ea26fc934553d9b716f612d Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:48:21 +0100
Subject: [PATCH 06/11] Update acl according to the new api

---
 src/boot/vue-simple-acl.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/boot/vue-simple-acl.js b/src/boot/vue-simple-acl.js
index 725bd7106..16b4023c7 100644
--- a/src/boot/vue-simple-acl.js
+++ b/src/boot/vue-simple-acl.js
@@ -4,21 +4,26 @@ import { computed } from 'vue';
 import { useUserStore } from 'stores/UserStore';
 
 const userStore = useUserStore();
-const userRoles = computed(() => ({ roles: userStore.roles }));
+const userPermissions = computed(() => ({ permissions: userStore.permissions }));
+
+const findPermission = (user, action, entity) => user.permissions.find(
+  ({ action: userAction, entity: userEntity }) => userAction === action && userEntity === entity,
+);
+
 const rules = () => defineAclRules((setRule) => {
-  setRule('admin', (user) => process.env.HAS_BACKEND && process.env.ADMIN_URL && user.roles.includes('admin'));
-  setRule('create-diagram', (user) => !process.env.HAS_BACKEND || user.roles.includes('CF_createDiagram'));
-  setRule('create-diagram-from-template', (user) => !process.env.HAS_BACKEND || user.roles.includes('CF_createDiagramFromTemplate'));
-  setRule('create-component', (user) => !process.env.HAS_BACKEND || user.roles.includes('CF_createComponent'));
-  setRule('create-component-from-template', (user) => !process.env.HAS_BACKEND || user.roles.includes('CF_createComponentFromTemplate'));
-  setRule('create-project', (user) => !process.env.HAS_BACKEND || user.roles.includes('CF_createProject'));
-  setRule('create-project-from-template', (user) => !process.env.HAS_BACKEND || user.roles.includes('CF_createProjectFromTemplate'));
-  setRule('delete-diagram', (user) => !process.env.HAS_BACKEND || user.roles.includes('CF_deleteDiagram'));
+  setRule('admin', (user) => process.env.HAS_BACKEND && findPermission(user, 'ACCESS', 'ADMIN'));
+  setRule('create-diagram', (user) => !process.env.HAS_BACKEND || findPermission(user, 'CREATE', 'DIAGRAM'));
+  setRule('create-diagram-from-template', (user) => !process.env.HAS_BACKEND || findPermission(user, 'CREATE', 'DIAGRAM_TEMPLATE'));
+  setRule('create-component', (user) => !process.env.HAS_BACKEND || findPermission(user, 'CREATE', 'COMPONENT'));
+  setRule('create-component-from-template', (user) => !process.env.HAS_BACKEND || findPermission(user, 'CREATE', 'COMPONENT_TEMPLATE'));
+  setRule('create-project', (user) => !process.env.HAS_BACKEND || findPermission(user, 'CREATE', 'COMPONENT'));
+  setRule('create-project-from-template', (user) => !process.env.HAS_BACKEND || findPermission(user, 'CREATE', 'COMPONENT_TEMPLATE'));
+  setRule('delete-diagram', (user) => !process.env.HAS_BACKEND || findPermission(user, 'DELETE', 'DIAGRAM'));
 });
 
 export default boot(({ app }) => {
   app.use(createAcl({
-    user: userRoles,
+    user: userPermissions,
     rules,
     disabledAttrTitle: 'Custom Disabled Title',
   }));

From 0146cd12bc613558e6ee5d79a9561621eb9d8f82 Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:48:56 +0100
Subject: [PATCH 07/11] Update routing

---
 src/router/index.js  | 30 +++---------------------------
 src/router/routes.js |  4 ----
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index c0f76db47..5894f6471 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,9 +5,7 @@ import {
   createWebHistory,
 } from 'vue-router';
 import routes from 'src/router/routes';
-import { getUserSessionToken, removeUserSessionToken } from 'src/composables/UserAuthentication';
 import PluginEvent from 'src/composables/events/PluginEvent';
-import { getAuthenticationUrl } from 'src/composables/LetoModelizerApi';
 import { useAcl } from 'vue-simple-acl';
 
 let applicationReady = false;
@@ -42,36 +40,14 @@ export default route(async () => {
 
   // No need to do this call each time, so doing it outside the beforeEach.
   const acl = useAcl();
-  let backendUrl;
-  if (process.env.HAS_BACKEND) {
-    backendUrl = await getAuthenticationUrl();
-  }
 
   Router.beforeEach(async (to, from, next) => {
-    const isComingFromGithub = window.location.href.search(/\?code=([^&]*)/) !== -1;
-    const isUserReady = getUserSessionToken() || isComingFromGithub || !process.env.HAS_BACKEND;
-    let temporaryCode;
-
-    if (to.name === 'ClearToken') {
-      removeUserSessionToken();
-      next('/');
-      return;
-    }
-
-    if (isComingFromGithub) {
-      temporaryCode = /\?code=([^&]*)/.exec(window.location.href)[1].substring(0, 20);
-    }
-
-    if (!isUserReady && process.env.HAS_BACKEND) {
-      window.location.href = backendUrl.data;
-    } else if (isUserReady
-      && !applicationReady
-      && to.name !== 'Splash') {
-      next({ name: 'Splash', query: { from: to.fullPath, authCode: temporaryCode } });
+    if (!applicationReady && to.name !== 'Splash') {
+      next({ name: 'Splash', query: { from: to.fullPath } });
     } else if (to.name === 'Admin' && !acl.role('admin')) {
       next('/');
     } else if (to.name === 'Admin') {
-      window.location.href = `${process.env.ADMIN_URL}?token=${getUserSessionToken()}`;
+      window.location.href = `${process.env.BACKEND_URL}/api/redirect?app=admin`;
     } else {
       next();
     }
diff --git a/src/router/routes.js b/src/router/routes.js
index 0d1e3d4fc..082e5a833 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -13,10 +13,6 @@ const routes = [
     name: 'Home',
     component: HomeLayout,
   },
-  {
-    path: '/token/clear',
-    name: 'ClearToken',
-  },
   {
     path: '/projects/:projectName',
     beforeEnter: (to, _from, next) => {

From dd2f7f40db4f51c722252e489ec242369d0c929b Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:50:07 +0100
Subject: [PATCH 08/11] Update quasar.config by replacing old api variable by
 the new ones

---
 quasar.config.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/quasar.config.js b/quasar.config.js
index a2443c1ca..b31520c92 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -109,12 +109,8 @@ module.exports = configure((ctx) => ({
     env: {
       TEMPLATE_LIBRARY_BASE_URL: process.env.TEMPLATE_LIBRARY_BASE_URL || configuration?.templateLibrary || '',
       VERSION: version,
-      HAS_BACKEND: configuration?.backend
-        ? Object.prototype.hasOwnProperty.call(configuration?.backend, 'url')
-          && Object.prototype.hasOwnProperty.call(configuration?.backend, 'appId')
-        : false,
-      ADMIN_URL: configuration?.backend?.adminUrl || null,
-      BACKEND_APP_ID: configuration?.backend?.appId,
+      HAS_BACKEND: Object.prototype.hasOwnProperty.call(configuration, 'backendUrl'),
+      BACKEND_URL: configuration?.backendUrl || null,
     },
     // extractCSS: false,
 
@@ -161,9 +157,9 @@ module.exports = configure((ctx) => ({
         secure: true,
         changeOrigin: true,
       },
-      '/backend': {
-        pathRewrite: { '^/backend': '' },
-        target: configuration?.backend?.url,
+      '/api': {
+        target: configuration.backendUrl,
+        secure: false,
         changeOrigin: true,
       },
     },

From f01a864ca5dc81df45c616ede801477f17a7b58b Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:52:26 +0100
Subject: [PATCH 09/11] Remove download.html from cypress

---
 .gitignore                       |   1 +
 cypress/downloads/downloads.html | Bin 5085 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 cypress/downloads/downloads.html

diff --git a/.gitignore b/.gitignore
index 6bd62716a..848c314b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ test-report.xml
 # Cypress
 /cypress/screenshots
 /cypress/videos
+/cypress/downloads
diff --git a/cypress/downloads/downloads.html b/cypress/downloads/downloads.html
deleted file mode 100644
index 17eb7cfe8f98284210f9082bffb282a90266eb1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5085
zcmZ{ncQhN``^RH%L6s`yqqSR`*sE4+*QQn}V#HR&h*fG<Ypd0&5!4>7t*uofp(uiA
zZJHWMLj?J?zwd9K^Ly^O_dfUiocBHV`RAVV(hic5qW}N^x|9F_TRkm(6{S=>`AsP%
zYC5r`dr2ouWMpJi0E&2WAmEQqPaaQB26(T0UFNq<kEm$P+RT0GiG6uzE0OyOe$d(Y
zgP$@FF_|jtMfVapN2)9`KQGouPFx)MxeD5a7l7c7UU=m1>e<k;HLRJA-nkcrk%8fk
z2H)8wyYK11G=a~&;)E=!D&u>pH?W3Jn`y?IpGHuauOoPjifi&=_sw<sH2nx7Jyy+E
zR3cj~%hw^Nl`>0ir#u(&fM39ULv3&QR69kwTkvrK{x0dpN}l2A!?(V7aK+6p*5edN
zn{+r9>Ihf{yMTg0{8fD+OUtrFn-g(0Z_nU|r&EVQt(ua^R&RlnWX8?gGpzFwK2g3-
z8ApZ?Q3pE;u5cVC+Em-t1C64~!)eI}b1Q7HC|;TLPpc%>8=-hb0v;w&mO8mtjK;r9
z{JdUPt083D$D|x{=ac9rR{KV+-<L*w#Xay@LTVmKb(YQK8<mtqV#Wj^%>NOH`M8+@
zE-Vz0Hi)U74Y@a*LljfcyngZMEaWw|6M4F$M}BJez-oth_N$x`tD4b%<M-4Bgr7>n
zDejiXgs|RCmcFa`JiZ~6HA)IrvL1wi8#cz2<5g8$jz(d9XP-q2IK#7Gd!ogY_agqW
zAH5jzU47IiY7iq#iiq>yH?bJHg}eje)Y(+BGPa@K_El#Jc+_m8zmbvb#5Hbor+)12
z)+`zPW<Z}^0^R5LvDvD>OUi)c6l4H0wphxX+S|I9IdRX2D^4en>-BUw=5qx$OOPM3
z_V?6yH=+`lYg;V^t%AXaJq9S5cDz>!O~o-rcXc;>rXfOJx{_wg$*i&yPGEV_`(iDq
zhDXhEDZQ}ER5bOxaIuhgqkU8v^aDB3rl^0x9jKU2lY!azL{r|nx|-!e@^oq}7i2z3
zr*^R1i-6nqB-~~Xy%Al{`=V`Qw3zIfXx?_s>-%J3!I9xpPYRU=v5V_hcmuVR@h?pA
z6lLKx^$%pm{xSZ%F7YhEkF}|>Jv+!c4iU8PWv6^g?R)M((5C`Dq2WW?XP&mS0^o;Z
zpPA@f!-=%tJ*S#}+%HHKDvCTGTo|I_=l{gKbRbq&q}Tp}(N658y-ad{+<qeH4z64J
z%HplpU@oJE!uqKuv$5M?f8p*8aEdL`v_#40m+EI3r)<jTGiCR@paYuV0)oLit-1if
z)JFw@o!O*M)T+W(G@^X!<H;>)d%MF6v3+&AJtsL^#%$a^U0-XU$Gm#MN$TaRhhyol
zQbeLRxq+B&#x>!a;R-IuDo()-peg&rZ>5iSuTAVck)Lbh`gWixg4rm1{Zx@+Yk_~t
zpki!;L9zM#(uBssIkpS1^);Jub<`f^0!LW!u#_U{v_x0m8}OJ-{G85UkPW_Kd6$W4
z^2Pm9!eOTN(euZ=@UZShj`>RWSE=zwlx*}YQsKHZ${L&rGkIc+)m&$^W`-1$>;PI?
zT0o$tjLn~)<-daIPX_US?CvY><>%oq5#YMM#;*9}$#;5?pq@|#Jl#Q5FqaAr-6arq
zmEb8<g+tIW!iO`K1}Cit9(Jxll}-`f=33ql{5%2!J!1Zd-Uc2)bXivQHXb#crA6$3
zd<M-?!dCU$t<$PJfhvJK0s7sbBPki_)~1%`;DDe&EUlD*R86Vcx?8p2$MFHAi}06$
z0T;>ffi;)LTCR2fgFyhm%#eome6))%`_Ee||IGit8^-_aMk2(+*DJ)m{T0M0$A)7>
z(ttI`e#w03i@i6z#C}s(3$E)#$u52~Z8p?#Un&o7q%zSo0bU%w*22%kcP}4Ub(G*W
zIxP3r3-ngnaRxW!YxIfcTT{b+*TW?%L(z6?h@rTy3m#S)$-AX4sU6BAOpwN^E-P)r
z5FbudPa+CK_;pr>Yv<rMwcn=6y%00kk--b5hDUKM2-C&C4CnXO^yp)0eHt}M9s%ec
zauH##-9iB4TOe~PV&0wptJauh`v*4mPWCqR-D5=<opV^-Ovl)IaL3ORDm7!jZL%=K
zf%TIV$O0OuFRaP8L#0;E%|qr`PSF-;jbyy8#Uw(>oMmu#@G7ku&?Md|fITGkpBfsg
za=_zwb}0_w&r|`tjIl8R<hVE|Bt_RCE0RiClN(GmS<X6}P*P598P8@02#Te694nVa
z&K3u73-4yu8~AH7;~Ahs(m=I<JJkA`oI3zW`PH8r@2yEZ^wW__{?3{)=7*)P-6gcf
zwaH1QU?t$TQ0B>3l8yW3mggqzkr3(@_XoQV5pAZh&{F!RT?3B-D0!$>)~@Z49mF~X
z@ZjQr19SmwxC9FqKrz+!;6LvHNdvU+$r}<LNKp&Lo~qztb+Q=EHO1~x?EXXXn4HFz
zEJ%}A1n_h~L4v4#;n<;G2VNbT_@N<2gyM~&Sr&eOd!rD}_uc8N`eSDf=1p!U5N*+c
zR?4zIPib-NbwiJA=U|FkU!^AJVr0S`kC@zvy*><SSNxJXHO^-*j>z335knb6<2jhQ
zsjeULUqI$OOEtbHk{Z@++KW|$vo|ejPw_N4kn}e{zA>Wi_5{lEWV7@$moh(H(p1?2
zl$0~@Q0osoKr&^<@g6e2f4&tpx3!cm(+><*-SHcp8Mdq4a=#4u{aRYF?8E{idhcTt
z^{N0IKDK!@tzbRl5Ld&Cqzz)L9KBR3;4J6eh?Qpi5rd@Ki=#+iNgz;m#d0bRTuU#b
z(vRcZh}DrwJUb%Wq1^n(y`x@G%|WB)iK55Y8gqc!0+Y<3U1{~?EHHC7UOL@^Ye@iV
z`W5=z!N|qv)+KwkX9Tk!8TTj5_8#Vd$}U@m6RPsEiOVwH<`Y`f@Vl+KBZ4~%qtF`d
zO|*WGQSHU3njs*!7x6*?8j2Z5Srefy5~#(`c-aB-toy<AiUUDS@wj*g{^y+gaOYY4
zwii03%fCfov=7dddr04uID*bR4CB~G-@mCw%0k0kdM!`D6TKXM{Z7yMn69EN6=R?o
zch+Mjx3BeUu>RWTnYSK>7-~r`3`Fx;F9`*pnCdH^p%5jEogb1>ImeN7Lk0v`Pm6P>
z76~P-zEai>g^B1%noOUv9tGCl&g^e}<S-vi-|N?XnEo@26;&0b0a(4!iAc^zHF`Qf
zU9%~E{ymTw6@m?;UmTGw2G)A+76YM(wWyjA0X0cP0MC5kvAK%-<hZh*A=Z~Eyl6cX
z{G}+r+Rj3~lZ4HYm!vxH<2Z->k=j$4&d_rK{quVlMQSUJN=5!^8a@lu(I+#;J~7lJ
zQDPZFeJd!&Tlgn7JIcBP;Z|1nw7!IWMEi9U-flTYzQ2(?Qn>yythLwbyhH#G6N)F9
z_?3-cdU-V!Tx3Ig8xWheaQmQBwO6j-3im{aCpL`DZoKq<q_`L9C8pJu;f64;hxlB!
zH8FQNMi5o@39pgr(w~cJbRn9?>H3l+LHNk`7Z$!6aTv+MmQGkHO45^PO0P6Bc6lyZ
zckwy6<s#dc#M=QAiN7HCJNV;@ed>$$bnAbC(ip_AFJ5l5{^a|PA78j!cOgS*K-~Jv
zP#RNs&(@1KS-lt1er012J_=y-MSa#>-#WVG!p#@Pfr81#Uz9Azh@xOQBz?SdXES;b
z!*}(&^hNBvKu=X+b-mZb<r#s<_49z0ACa=LT-exd0kJ)XImM7z@sbPueVO;Rq5}=0
zM3d!Az;|ZCtCe(vi?@VtFw_o+ur1IT42Zn^$|N=zN_j~uLg~pmYhp$YWo-&U#%UUr
z%hJSA6vsD-1<=zR{#`PIkjdn^6q&Eh-X>HOy!Bd>60*1n9xCS>9H^(bxTZ-}PLpCn
z0ipdu8*fRGS<$*%&XktTO8J%^_d_$AY>Bn$0gqIV3rk!LW%Q1V810+Zgq;wj9bEv=
z+93}Yi{v{l)^a0cic7{#aQ7g9+*Z-Bl!jw?3@a-+(u(h2I#MuE^RH6O3s@E{!>yi_
znLQis`nDe2ZQsJZ(vb9Xiz6&y`{_R>krbyt(fdpLN6>iQFikEC++}G7@Jrx_F@5DF
zC67basG)<X!F_tlVkeTiY1Z<!^E-suz2y0Vr>T72C}s^q&qHi&_Yjb;G=Jq0@iRX+
zu}$cm>>^+MMd%~q@#Nx$e?X+?LiiA7@!K;jgQp8Dd-{NhyT7e(1#;ZYjR7scaIQui
zEbj+WrC$OW?JxX)NWVSfOC&9!@XqU@RL;0gIjhq(^tv{OgBC1J%evu#=|@j%wYDuk
zsSIJs5Sw8G#FH<nfjzwqJEJaQiW054@6AxsV0daSM?V7Ni~G7MK51I~X7_@@+@k1B
z$`+S#Sa6@RM%tsk4ux)e@?XlZ4=7Hl$ya-6kBp&xUu-R8JNb=w%aZT*r{$KGqq&d*
zkDRfWE_ky1Fb%QnhTR!mpJGr`mGxIeWoF0jgFFe0hM%E0ab2*k&m1nPHK&i+zvQG>
zgLUGphzVEw(Fe!$ZYF3R`sdMabjG$>aI<J}H72>f;y68<)`ucT&=Urqo>V)F3Q;Fa
z!7Y?)W#gOn#Z4cP6FDlzqX^=gcD<`~K9fdT-OlKaJmX)Q0kE{lt(RWN)?Y8JfF+#Y
zUJXMPaK5Q8c*P3$3NCkEwmZ!<7aqGc<TJNLgY=YfL0%2HpPcPSCS+ATCL;E_*}GK>
z4J!Ff8<`*aY%06^?Y6hDtw-CW<8(xFzZPx5+%vv@trrDf*Wm1XR+WS<lIXRpb=!k*
zL#WJORhsbfq*i63i$Ik|*N+Kf--eYxSaUg#U4u<^zttDdhSpDI*t)eR{Vwo%jL1Lk
zv%S+MDmcUP>g%WZq8!9;&AFEfJQ;a1jUyO_c|wAOzj0bWT<KbYm+^=F+jSgW5?1~*
zLFD#guCFU6t|GUmaLU9Md5t<H4JM%*xz4&4e2@?w#h6|>*9;m*8-}6~M$M5am6`8;
zUdNO>t6qtBxZLFSed-z<UP*sdWSf+Z(Q~vPwiF+4u*D8_a<<#Q+v7?o-FB_hFR|8h
z%zr2SrDM!d*p+}n&09iU%5tt+w?&j8&_5bNsa9kgwA5Rsb-$@hHh<CSz9Bt-6;3@D
z<2KheBV-+&U%|BvDgw2?kJ3V!afLW`Ot*g&vX)2d$ToP)UJZ1((d9aa%Q3D`>Pzu}
zxK_ZIuauiUnKlm<Kb^1j`Cwene3#_!`tJ738CvgaHmJzFFC$l|^8g5nGnc>W*zO&)
z09K|p4wasJe9fHN*wa^TT0SyZP4fM9W3{q*_U5~Ad%Q!dx1C4D=EfYjVROMNg(rU;
zWY60<Z5}LM)IQyo_iS#oN#cXw+}#uD37?mPKGXI0ecN;jEG$6EJD1N04)4e?-fzB1
zYtKm!Z~i{0hvqG9fZ3rP!+NHlm(CAQti_)%fxU>orrH*)3ay01{TIPwO<a;=;7&nm
z`<pjVh;xBZ<b_cDFZsCy{6U3Me*e?`Sp%M(-X{|~FgoIM5`WPVVf<TE;uwi58wSP4
zO~FvGXC92_9|<{LjL6`q+Jlg({%aXq;bG(348!NI<nC+{km}bf+8q)rQa_mdysoep
zUf}lP+$}xx0&lfk{yjK5NtY+BfzK_3nFa1$<f?@@f-BD`a(F4YwrzF3Gpll|yZ`BK
zDW|^w@^rJ@53m#t_HieYjA%mK&D;x0WOczsk8Ke7@zJN%D)tX`Cwd-1<h^huU-~SD
zU16#+Wnq4Wa!v^q+w3)Tj*-9ONx6?m{ox2D)Z8B3=s}v5#jyG`mLX&kObaS|h7|7V
z-pg^NSe$IgE0^`O-#!s4Icc4Oo{MUVqhe5jEgBxPUG4kvi^q)}_0y%dEu*p6>#a3<
zJS3%}>#RqmnxK!}&J2yRQCP$0gFgIjM!SnD??~&--Ir4*6fNUfYvo91hPG`dN{!!w
z&cSU2_+B9bdN$&g4@}_o{ME*L2Kn@n7K&3{x!u{mZ`|##7mUVmH1_%oO~O~MBX4!w
zdE9F=h`@aIOg-#PeGr4UcGRL1+*apS!7i92xmL6MPQ%|$t%mgYxVcH70z^PdE(u%k
zQ28tK+RfF@d3Q=L-BXaIPiNg4&+fVMMWjA|O-C@=G^*ohCvE3MlnH%AoYjIDkV*6Y
zvJH3HUyWDSgSHENpO_ew$i5S?EJ^nD6)Ny`ik%e1gL2msTl89+?<2xDML<}jM<C@Z
z2U0agoXHL|9c;394V>IdV-;yYS=|UjEfhjpg1rqg1@|A=+74HGCubVpW><lq8<nlF
zT4nS*UC~Jlgr7Z=^@32Ha7XRDU_e#dtMG65hwq%I2q&Jem~>|Ke^U~9jHw9DXX8I;
zb*HyW78$lWY`*7h*Oq-iV;;tR_n1K0Q~I3q$o}CB_T}=4dE~uPnjh_zw*?wKfBbfk
zfku>N_3yt~-9w~JkEpjr+Qq~W1k@GA5XKbzgbAQiE)Lc3?if4I8a0()hHX9v9`zU-
z%$Gi3w+D`n=zV~#lgR!eqq^8m7~v1!J_h|oMly1CivLF7|A~`-5%^z01`r_ooBb~!
p{=e4$dF@}`{8#+7PW?&$-TEK&X=X@8{kKZ~XN3OQ$$)=P{{}pjz|8;v


From c6af2d1962771669f28b9df71e3714d21cae5369 Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:51:55 +0100
Subject: [PATCH 10/11] Update changelog

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index afc049971..db58bcb69 100644
--- a/changelog.md
+++ b/changelog.md
@@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Merge add/create diagram buttons into a drop down button, see [this issue](https://github.com/ditrit/leto-modelizer/issues/471).
 * Improve Authentication by re-doing login process if the token is expired, see [this issue](https://github.com/ditrit/leto-modelizer/issues/478).
 * Handle external id.
+* Replaced old authentication (Parse) by the new LetoModelizeApi (Java/Spring).
 
 ### Fixed
 

From 445bd1e678a8f47ce5c83b6fc04b8310d8f0cd50 Mon Sep 17 00:00:00 2001
From: Aboubakar <deathmaskk1234@gmail.com>
Date: Tue, 6 Feb 2024 19:57:33 +0100
Subject: [PATCH 11/11] Update Readme

---
 README.md | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 0d08d6765..d006c86fc 100644
--- a/README.md
+++ b/README.md
@@ -167,24 +167,14 @@ We have administration view [Leto-Modelizer-Admin](https://github.com/ditrit/let
 
 ```json
 {
-    "backend": {
-        "url": "http://localhost:1337",
-        "appId": "leto-modelizer-api-dev",
-        "adminUrl": "http://localhost:9000"
-    }
+  "backendUrl": "https://localhost:8443"
 }
 ```
 
-To get authentication setup, `backend.url` and `backend.appId` are mandatory.
-To get administration view, all the fields inside `backend` are mandatory.
-
-Here's a description of each key in the provided configuration:
-- `url`: the url of the backend.
-- `appId`: the application ID of the backend.
-- `adminUrl`: the url of the administration application.
+To get the authentication setup, `backendUrl`is mandatory.
 
-**_NOTE:_**: If the previous configuration is not present in the configuration file, Leto-Modelizer will be launched with the backend mode deactivated.
-**_NOTE:_**: For now, there is no UI associated to the backend, but the UI for the admin is coming soon !
+**_NOTE_**: If the previous configuration is not present in the configuration file, Leto-Modelizer will be launched with the backend mode deactivated.
+**_NOTE_**: For now, there is no UI associated to the backend, but the UI for the admin is coming soon !
 
 ## How to build this app
 
@@ -254,15 +244,12 @@ http {
 }
 ```
 
-**_NOTE:_**  You can use the global configuration file `global.config.json` to define environment variables like so :
+**_NOTE:_** You can use the global configuration file `global.config.json` to define environment variables like so :
 
 ```json
 {
   "templateLibrary": "YOUR_TEMPLATE_LIBRARY_BASE_URL",
-  "backend": {
-    "url": "YOUR_URL",
-    "appId": "YOUR_APP_ID",
-  }
+  "backendUrl": "YOUR_URL"
 }
 ```