Changed the apiGet and apiPost methods so that we use lambda and not plain old try catch & if else block.

This commit is contained in:
Hannes Heine 2021-07-29 07:27:08 +02:00
parent 9e15575855
commit 9c2b6c5c9e
3 changed files with 36 additions and 31 deletions

3
.gitmodules vendored
View File

@ -31,6 +31,3 @@
[submodule "login_server/src/proto"] [submodule "login_server/src/proto"]
path = login_server/src/proto path = login_server/src/proto
url = https://github.com/gradido/gradido_protocol.git 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

View File

@ -2,35 +2,44 @@ import axios from 'axios'
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
export const apiPost = async (url: string, payload: unknown): Promise<any> => { export const apiPost = async (url: string, payload: unknown): Promise<any> => {
try { return axios
const result = await axios.post(url, payload) .post(url, payload)
if (result.status !== 200) { .then((result) => {
throw new Error('HTTP Status Error ' + result.status) 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)
if (result.data.state !== 'success') { }
throw new Error(result.data.msg) return { success: true, result }
} })
return { success: true, result } .catch((error) => {
} catch (error) { return { success: false, result: error }
return { success: false, result: error } })
}
} }
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
export const apiGet = async (url: string): Promise<any> => { export const apiGet = async (url: string): Promise<any> => {
try { return axios
const result = await axios.get(url) .get(url)
if (result.status !== 200) { .then((result) => {
throw new Error('HTTP Status Error ' + result.status) if (result.status !== 200) {
} // eslint-disable-next-line no-console
if (!['success', 'warning'].includes(result.data.state)) { console.log('IN status: ' + 'HTTP Status Error ' + result.status)
throw new Error(result.data.msg) throw new Error('HTTP Status Error ' + result.status)
} }
return { success: true, result } if (!['success', 'warning'].includes(result.data.state)) {
} catch (error) { // eslint-disable-next-line no-console
return { success: false, result: error } 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 }
})
} }

@ -1 +0,0 @@
Subproject commit 0b8d13a1d4cd9be16ed8a2230577aa9c296aa1ca