diff --git a/docker-compose.yml b/docker-compose.yml index 2acee2817..a423b22da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -121,13 +121,13 @@ services: ######################################################### ## GRADIDO NODE test ################################### ######################################################### - gradido-node-test: - build: - context: . - dockerfile: ./gn/docker/deprecated-hedera-node/Dockerfile - container_name: gn-test - working_dir: /opt/gn/build - command: ["./unit_tests"] + # gradido-node-test: + # build: + # context: . + # dockerfile: ./gn/docker/deprecated-hedera-node/Dockerfile + # container_name: gn-test + # working_dir: /opt/gn/build + # command: ["./unit_tests"] networks: external-net: diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js index 430600732..77856862a 100644 --- a/frontend/src/apis/communityAPI.js +++ b/frontend/src/apis/communityAPI.js @@ -1,9 +1,14 @@ import axios from 'axios'; import CONFIG from '../config' -// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt. +// axios.defaults.withCredentials = true ist eine Anweisung an Axios, alle Anfragen mit Anmeldeinformationen zu senden, +// wie z. Autorisierungsheader, TLS-Client-Zertifikate oder Cookies (wie in unserem Fall). axios.defaults.withCredentials = true +//Wir setzen unsere axios.defaults.baseURL für unsere Axios-Anfrage auf unsere. +// Auf APIdiese Weise wird diese Basis-URL verwendet, wenn wir über Axios senden. Damit können wir nur unsere Endpunkte wie /registerund /loginzu unseren Aktionen hinzufügen, ohne jedes Mal die vollständige URL anzugeben. +axios.defaults.baseURL = CONFIG.COMMUNITY_API_STATE_BALANCE_URL + const apiGet = async (url) => { try { const result = await axios.get(url); diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js index 7857ccad1..8756a6840 100644 --- a/frontend/src/apis/loginAPI.js +++ b/frontend/src/apis/loginAPI.js @@ -7,9 +7,6 @@ const EMAIL_TYPE = { ADMIN: 5, // if user was registered by an admin } -// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt. -axios.defaults.withCredentials = true - const apiPost = async (url, payload) => { try { const result = await axios.post(url, payload); diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 88a6e0c6b..d8930ac26 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -5,9 +5,8 @@ import router from '../routes/router.js' import loginAPI from '../apis/loginAPI' import communityAPI from '../apis/communityAPI' import axios from 'axios' +// import CONFIG from '../config' -// axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt. -axios.defaults.withCredentials = true export const store = new Vuex.Store({ state: { @@ -27,7 +26,14 @@ export const store = new Vuex.Store({ auto_sign: true }, transactions: [], - modals: false + modals: false, + optionAxios: { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'Access-Control-Allow-Origin': '*', + 'Access-Control-Allow-Credentials': 'true' + } + } }, // Retrieve a state variable getters: { @@ -62,19 +68,21 @@ export const store = new Vuex.Store({ actions: { login: async ({ dispatch, commit }, data) => { console.log('action: login') + console.log('action: data', data.email) + const result = await loginAPI.login(data.email,data.password) console.log('result',result) console.log('result.success',result.success) - if( result.success ){ - commit('session_id', result.result.data.session_id) - commit('email', data.email) - $cookies.set('gdd_session_id', result.result.data.session_id); - $cookies.set('gdd_u', data.email); - router.push('/overview') - } else { - // Register failed, we perform a logout - dispatch('logout') - } + // if( result.success ){ + // commit('session_id', result.result.data.session_id) + // commit('email', data.email) + // $cookies.set('gdd_session_id', result.result.data.session_id); + // $cookies.set('gdd_u', data.email); + // router.push('/overview') + // } else { + // // Register failed, we perform a logout + // dispatch('logout') + // } }, passwordReset: async (data) => { console.log("<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>", data.email)