Skip to content
Snippets Groups Projects
Commit af31e116 authored by m431m's avatar m431m :speech_balloon:
Browse files

Merge branch 'redmine-issues/17026' into 'develop' 

REDMINE_ISSUE-17026

See merge request onegeo-suite/sites/onegeo-suite-site-login-vuejs!41
parents 17244b6d c725e72a
No related branches found
No related tags found
No related merge requests found
Pipeline #13381 passed with warnings
Stage: sonarqube
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 4
− 4
View file @ af31e116
......@@ -35,7 +35,7 @@ build_development:
- npm install --unsafe-perm
- echo -e "
NODE_ENV=development\n
DOMAIN=https://dev.pigma.neogeo.fr/fr\n
DOMAIN=https://dev.pigma.neogeo.fr/\n
VUE_APP_DOMAIN=${DOMAIN}\n
BASE_PATH=/\n
VUE_APP_BASE_PATH=${BASE_PATH}\n
......@@ -48,9 +48,9 @@ build_development:
VUE_APP_LOGO=@/assets/logo.png\n
VUE_APP_TITLE=Onegeo-Suite\n
VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png\n
VUE_APP_LOGIN_API_PATH=/fr/login/\n
VUE_APP_ORGANISATION_API_PATH=/fr/organisation/\n
VUE_APP_USERGROUP_API_PATH=/fr/usergroup/\n
VUE_APP_LOGIN_API_PATH=/login/\n
VUE_APP_ORGANISATION_API_PATH=/organisation/\n
VUE_APP_USERGROUP_API_PATH=/usergroup/\n
VUE_APP_EXTERNAL_LOGIN=true\n
VUE_APP_EXTERNAL_LOGIN_URL=http://127.0.0.1:80/oidc/authenticate\n
VUE_APP_EXTERNAL_LOGIN_LABEL=Se connecter avec mon compte FooBar\n
......
README.md
+ 3
− 3
View file @ af31e116
......@@ -35,9 +35,9 @@ VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png
VUE_APP_LOGO=@/assets/logo.png
# API
VUE_APP_LOGIN_API_PATH=/fr/login
VUE_APP_ORGANISATION_API_PATH=/fr/organisation/
VUE_APP_USERGROUP_API_PATH=/fr/usergroup/
VUE_APP_LOGIN_API_PATH=/login
VUE_APP_ORGANISATION_API_PATH=/organisation/
VUE_APP_USERGROUP_API_PATH=/usergroup/
# AUTH
VUE_APP_LOGIN_API_USERNAME=admin
......
src/api/loginAPI.js
+ 13
− 12
View file @ af31e116
import axios from 'axios';
import i18n from '@/i18n';
const DEV_AUTH = process.env.NODE_ENV === 'development' ? true : false;
......@@ -22,7 +23,7 @@ const LOGIN_API_PATH = process.env.VUE_APP_LOGIN_API_PATH;
const loginAPI = {
async signUp(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/signup/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/signup/`), DOMAIN);
const response = await axios.post(url, data);
if (response.status === 201) {
return response.data;
......@@ -33,7 +34,7 @@ const loginAPI = {
},
async signIn(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/signin/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/signin/`), DOMAIN);
const response = await axios.post(url, data);
if (response.status === 200) {
return response.data;
......@@ -44,7 +45,7 @@ const loginAPI = {
},
async signOut(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/signout/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/signout/`), DOMAIN);
const response = await axios.get(url, data);
if (response.status === 200) {
return response.data;
......@@ -55,7 +56,7 @@ const loginAPI = {
},
async validationRegistration(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/signup-confirmation/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/signup-confirmation/`), DOMAIN);
const response = await axios.post(url, data);
if (response.status === 200) {
return true;
......@@ -66,7 +67,7 @@ const loginAPI = {
},
async getOrganisationsList() {
const url = new URL(path.join(LOGIN_API_PATH, `/organisations/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/organisations/`), DOMAIN);
const response = await axios.get(url);
if (response.status === 200) {
return response.data;
......@@ -77,7 +78,7 @@ const loginAPI = {
},
async getUserDetail() {
const url = new URL(path.join(LOGIN_API_PATH, `/user/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/user/`), DOMAIN);
const response = await axios.get(url, { ...DEV_AUTH && { auth: AUTH } });
if (response.status === 200) {
return response.data;
......@@ -88,7 +89,7 @@ const loginAPI = {
},
async updateUserDetail(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/user/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/user/`), DOMAIN);
const response = await axios.put(url, data, { ...DEV_AUTH && { auth: AUTH } });
if (response.status === 200) {
return response.data;
......@@ -99,7 +100,7 @@ const loginAPI = {
},
async forgottenPasswordRequest(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/forgotten-password-request/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/forgotten-password-request/`), DOMAIN);
try {
const response = await axios.post(url, data);
if (response.status === 200) {
......@@ -111,7 +112,7 @@ const loginAPI = {
},
async forgottenPasswordConfirm(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/forgotten-password-confirmation/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/forgotten-password-confirmation/`), DOMAIN);
try {
const response = await axios.post(url, data);
if (response.status === 200) {
......@@ -123,7 +124,7 @@ const loginAPI = {
},
async newEmailConfirm(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/email-update-confirmation/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/email-update-confirmation/`), DOMAIN);
try {
const response = await axios.post(url, data);
if (response.status === 200) {
......@@ -137,7 +138,7 @@ const loginAPI = {
},
async getTermsOfUse() {
const url = new URL(path.join(LOGIN_API_PATH, `/term-of-use/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/term-of-use/`), DOMAIN);
try {
const response = await axios.get(url, { ...DEV_AUTH && { auth: AUTH } });
if (response.status === 200) {
......@@ -149,7 +150,7 @@ const loginAPI = {
},
async postTermsOfUseAgreement(data) {
const url = new URL(path.join(LOGIN_API_PATH, `/term-of-use/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `/term-of-use/`), DOMAIN);
try {
const response = await axios.post(url, data, { ...DEV_AUTH && { auth: AUTH } });
if (response.status === 200) {
......
src/api/organisationsAPI.js
+ 4
− 3
View file @ af31e116
import axios from 'axios';
import i18n from '@/i18n';
const DEV_AUTH = process.env.NODE_ENV === 'development' ? true : false;
......@@ -23,7 +24,7 @@ const USERGROUP_API_PATH = process.env.VUE_APP_USERGROUP_API_PATH;
const organisationsAPI = {
async getOrganisationsTypes() {
const url = new URL(path.join(ORGANISATION_API_PATH, `organisation-types/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${ORGANISATION_API_PATH}`, `organisation-types/`), DOMAIN);
let response;
try {
response = await axios.get(url);
......@@ -37,7 +38,7 @@ const organisationsAPI = {
},
async getOrganisationsRoles() {
const url = new URL(path.join(USERGROUP_API_PATH, `user-group-roles/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${USERGROUP_API_PATH}`, `user-group-roles/`), DOMAIN);
let response;
try {
response = await axios.get(url);
......@@ -51,7 +52,7 @@ const organisationsAPI = {
},
async setOrganisationThumbnail(id, data) {
const url = new URL(path.join(ORGANISATION_API_PATH, `organisations/${id}/thumbnail/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${ORGANISATION_API_PATH}`, `organisations/${id}/thumbnail/`), DOMAIN);
const response = await axios.put(url, data, { ...DEV_AUTH && { auth: AUTH } });
if (response.status === 200) {
return response.data;
......
src/api/usergroupsAPI.js
+ 3
− 2
View file @ af31e116
import axios from 'axios';
import i18n from '@/i18n';
const DEV_AUTH = process.env.NODE_ENV === 'development' ? true : false;
......@@ -24,7 +25,7 @@ if (!DEV_AUTH) {
const usergroupsAPI = {
async getFilteredUsergroupsList(type = 'group-of-organisation', page = 1) {
const url = new URL(path.join(LOGIN_API_PATH, `user-groups/?page=${page}&usergroup_types=${type}`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${LOGIN_API_PATH}`, `user-groups/?page=${page}&usergroup_types=${type}`), DOMAIN);
const response = await axios.get(url, { ...DEV_AUTH && { auth: AUTH } });
if (response.status === 200) {
return response.data;
......@@ -33,7 +34,7 @@ const usergroupsAPI = {
},
async updateUsergroup(id, data) {
const url = new URL(path.join(USERGROUP_API_PATH, `user-groups/${id}/`), DOMAIN);
const url = new URL(path.join(`${i18n.locale}${USERGROUP_API_PATH}`, `user-groups/${id}/`), DOMAIN);
const response = await axios.put(url, data, { ...DEV_AUTH && { auth: AUTH } });
if (response.status === 200) {
return response.data;
......
src/api/usersAPI.js
+ 5
− 3
View file @ af31e116
import axios from 'axios';
import i18n from '@/i18n';
const DEV_AUTH = process.env.NODE_ENV === 'development' ? true : false;
......@@ -15,12 +16,13 @@ if (!DEV_AUTH) {
})('csrftoken');
}
const USERGROUP_API_URL = process.env.VUE_APP_USERGROUP_API;
const path = require('path');
const DOMAIN = process.env.VUE_APP_DOMAIN;
const USERGROUP_API_URL = process.env.VUE_APP_USERGROUP_API_PATH;
const usersAPI = {
async findUsername(username, page = 1) {
const url = `${USERGROUP_API_URL}users/?page=${page}&username=${username}`;
const url = new URL(path.join(`${i18n.locale}${USERGROUP_API_URL}`, `users/?page=${page}&username=${username}`), DOMAIN);
const response = await axios.get(
url,
{ ...DEV_AUTH && { auth: AUTH } }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment