diff --git a/.gitmodules b/.gitmodules index 22790ccc7..70fda6a17 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,6 +31,3 @@ [submodule "login_server/src/proto"] path = login_server/src/proto url = https://github.com/gradido/gradido_protocol.git -[submodule "login_server/dependencies/protobuf"] - path = login_server/dependencies/protobuf - url = https://github.com/protocolbuffers/protobuf.git diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts index b81316b3f..609b7bdc4 100644 --- a/backend/src/apis/loginAPI.ts +++ b/backend/src/apis/loginAPI.ts @@ -2,35 +2,44 @@ import axios from 'axios' // eslint-disable-next-line @typescript-eslint/no-explicit-any export const apiPost = async (url: string, payload: unknown): Promise => { - try { - const result = await axios.post(url, payload) - if (result.status !== 200) { - throw new Error('HTTP Status Error ' + result.status) - } - if (result.data.state === 'warning') { - return { success: true, result: result.data.errors } - } - if (result.data.state !== 'success') { - throw new Error(result.data.msg) - } - return { success: true, result } - } catch (error) { - return { success: false, result: error } - } + return axios + .post(url, payload) + .then((result) => { + if (result.status !== 200) { + throw new Error('HTTP Status Error ' + result.status) + } + if (result.data.state !== 'success') { + throw new Error(result.data.msg) + } + return { success: true, result } + }) + .catch((error) => { + return { success: false, result: error } + }) } // eslint-disable-next-line @typescript-eslint/no-explicit-any export const apiGet = async (url: string): Promise => { - try { - const result = await axios.get(url) - if (result.status !== 200) { - throw new Error('HTTP Status Error ' + result.status) - } - if (!['success', 'warning'].includes(result.data.state)) { - throw new Error(result.data.msg) - } - return { success: true, result } - } catch (error) { - return { success: false, result: error } - } + return axios + .get(url) + .then((result) => { + if (result.status !== 200) { + // eslint-disable-next-line no-console + console.log('IN status: ' + 'HTTP Status Error ' + result.status) + throw new Error('HTTP Status Error ' + result.status) + } + if (!['success', 'warning'].includes(result.data.state)) { + // eslint-disable-next-line no-console + console.log('IN state: ' + result.data.state + ' message: ' + result.data.msg) + throw new Error(result.data.msg) + } + // eslint-disable-next-line no-console + console.log('IN apiGet.THEN: ' + JSON.stringify({ success: true, result: result })) + return { success: true, result: result } + }) + .catch((error) => { + // eslint-disable-next-line no-console + console.log('IN apiGet.ERROR: ' + JSON.stringify({ success: false, result: error })) + return { success: false, result: error } + }) } diff --git a/login_server/dependencies/protobuf b/login_server/dependencies/protobuf deleted file mode 160000 index 0b8d13a1d..000000000 --- a/login_server/dependencies/protobuf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b8d13a1d4cd9be16ed8a2230577aa9c296aa1ca