mirror of
https://github.com/wukko/cobalt.git
synced 2024-11-15 12:50:01 +00:00
api: remove deprecated statuses & clean up related code
This commit is contained in:
parent
5948cab4fb
commit
f96c1cd13b
2 changed files with 14 additions and 33 deletions
|
@ -52,16 +52,13 @@ export function runAPI(express, app, __dirname) {
|
|||
legacyHeaders: false,
|
||||
keyGenerator: req => generateHmac(getIP(req), ipSalt),
|
||||
handler: (req, res) => {
|
||||
return res.status(429).json({
|
||||
status: "error",
|
||||
error: {
|
||||
code: "ErrorRateLimit",
|
||||
const { status, body } = createResponse("error", {
|
||||
code: "error.rate_exceeded",
|
||||
context: {
|
||||
limit: env.rateLimitWindow
|
||||
},
|
||||
text: "ErrorRateLimit" // temporary backwards compatibility
|
||||
}
|
||||
});
|
||||
return res.status(status).json(body);
|
||||
}
|
||||
})
|
||||
|
||||
|
@ -104,13 +101,13 @@ export function runAPI(express, app, __dirname) {
|
|||
app.use('/', express.json({ limit: 1024 }));
|
||||
app.use('/', (err, _, res, next) => {
|
||||
if (err) {
|
||||
return res.status(400).json({
|
||||
status: "error",
|
||||
error: {
|
||||
code: "error.body.invalid",
|
||||
},
|
||||
text: "invalid json body", // temporary backwards compatibility
|
||||
const { status, body } = createResponse("error", {
|
||||
code: "error.body_invalid",
|
||||
context: {
|
||||
limit: env.rateLimitWindow
|
||||
}
|
||||
});
|
||||
return res.status(status).json(body);
|
||||
}
|
||||
|
||||
next();
|
||||
|
|
|
@ -24,7 +24,6 @@ const apiRequest = {
|
|||
|
||||
export function createResponse(responseType, responseData) {
|
||||
const internalError = (code) => {
|
||||
let error = code || "Internal Server Error";
|
||||
return {
|
||||
status: 500,
|
||||
body: {
|
||||
|
@ -32,7 +31,6 @@ export function createResponse(responseType, responseData) {
|
|||
error: {
|
||||
code: code || "Internal Server Error",
|
||||
},
|
||||
text: error, // temporary backwards compatibility
|
||||
critical: true
|
||||
}
|
||||
}
|
||||
|
@ -42,14 +40,8 @@ export function createResponse(responseType, responseData) {
|
|||
let status = 200,
|
||||
response = {};
|
||||
|
||||
switch(responseType) {
|
||||
case "error":
|
||||
if (responseType === "error") {
|
||||
status = 400;
|
||||
break;
|
||||
|
||||
case "rate-limit":
|
||||
status = 429;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (responseType) {
|
||||
|
@ -58,17 +50,9 @@ export function createResponse(responseType, responseData) {
|
|||
error: {
|
||||
code: responseData.code,
|
||||
context: responseData?.context,
|
||||
},
|
||||
text: responseData.code, // temporary backwards compatibility
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "success":
|
||||
case "rate-limit":
|
||||
response = {
|
||||
text: responseData.t,
|
||||
}
|
||||
break;
|
||||
|
||||
case "redirect":
|
||||
response = {
|
||||
url: responseData.u,
|
||||
|
|
Loading…
Reference in a new issue