Skip to content

feat: SV-246 Return error context on failure #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aalekseev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: SV-246 Return error context on failure #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions IdentificationManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,38 @@ const request = async (url, data, method = "POST") => {
const response = await fetch(url, { method, headers, body });

const responseText = await response.text();

const result = {
ok: response.ok,
status: response.status,
statusText: response.statusText,
};
try {
const data = JSON.parse(responseText);
data.success = data.status === "success";
data.pending = `${response.status}` === "202";
return {
...result,
data,
ok: response.ok,
};
} catch (err) {
console.log("Failed to parse response as JSON", responseText);
return {};
return {
...result,
data: {
raw: responseText,
},
};
}
} catch (err) {
console.log(err);
return {};
return {
ok: false,
status: 0,
statusText: "fetch_error",
data: {
error: err && err.message ? err.message : String(err),
},
};
}
};

Expand Down
34 changes: 28 additions & 6 deletions LegacyIdentificationManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,39 @@ function postForm(url, data) {
},
body: formData,
}).then(
(response) => {
return response.json().then((data) => {
async (response) => {
const responseText = await response.text();
const result = {
ok: response.ok,
status: response.status,
statusText: response.statusText,
};
try {
const parsed = JSON.parse(responseText);
return {
data,
ok: response.ok,
...result,
data: parsed,
};
});
} catch (err) {
console.log("Failed to parse response as JSON", responseText);
return {
...result,
data: {
raw: responseText,
},
};
}
},
(err) => {
console.log(err);
return {};
return {
ok: false,
status: 0,
statusText: "fetch_error",
data: {
error: err && err.message ? err.message : String(err),
},
};
},
);
}
Expand Down
67 changes: 57 additions & 10 deletions dist/Esteid.main.web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,21 +244,42 @@
try {
const response = await fetch(url, { method, headers, body });
const responseText = await response.text();
const result = {
ok: response.ok,
status: response.status,
statusText: response.statusText
};
const contentType = response.headers.get("content-type");
if (contentType) {
result.contentType = contentType;
}
try {
const data2 = JSON.parse(responseText);
data2.success = data2.status === "success";
data2.pending = `${response.status}` === "202";
return {
data: data2,
ok: response.ok
...result,
data: data2
};
} catch (err) {
console.log("Failed to parse response as JSON", responseText);
return {};
return {
...result,
data: {
raw: responseText
}
};
}
} catch (err) {
console.log(err);
return {};
return {
ok: false,
status: 0,
statusText: "fetch_error",
data: {
error: err && err.message ? err.message : String(err)
}
};
}
};
var IdentificationManager = class {
Expand Down Expand Up @@ -442,17 +463,43 @@
},
body: formData
}).then(
(response) => {
return response.json().then((data2) => {
async (response) => {
const responseText = await response.text();
const result = {
ok: response.ok,
status: response.status,
statusText: response.statusText
};
const contentType = response.headers.get("content-type");
if (contentType) {
result.contentType = contentType;
}
try {
const parsed = JSON.parse(responseText);
return {
data: data2,
ok: response.ok
...result,
data: parsed
};
});
} catch (err) {
console.log("Failed to parse response as JSON", responseText);
return {
...result,
data: {
raw: responseText
}
};
}
},
(err) => {
console.log(err);
return {};
return {
ok: false,
status: 0,
statusText: "fetch_error",
data: {
error: err && err.message ? err.message : String(err)
}
};
}
);
}
Expand Down
Loading