martin/doorman
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

change err to msg

Browse Source
This commit is contained in:
Martin Dimitrov 2025-06-08 19:19:30 -07:00
parent 8f75081e6b
commit 5595a29352
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/doorman-api/src/common/DoormanHandler.ts
View File

@ -12,6 +12,7 @@ import LokiTransport from "winston-loki";
import pTimeout, { TimeoutError } from "promise.timeout";
import { ZodError } from "zod";
import { fromError } from "zod-validation-error";
import { setResponseJson } from "../utils/responseUtils";
export type BaseEvent = { request: { cookies: {}; headers: {}; }; }
@ -248,13 +249,12 @@ export function withMetrics<T extends DoormanLambdaContext, U extends BaseEvent>
} else if (e instanceof ZodError) {
// global catch for validation errors
const response = new Twilio.Response();
response.setStatusCode(400);
response.setHeaders({
"Content-Type": "application/json"
});
// return nice to read error message from ZOD
response.setBody({ err: fromError(e).toString() });
setResponseJson(response, 400, {
msg: fromError(e).toString(),
});
callbackResult = [null, response];
}
}

4
packages/doorman-api/src/functions/api/door/auth.ts
View File

@ -36,7 +36,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, AuthRequestTwil
if (!config) {
getMetricFromRegistry<Counter>(metricsRegistry, AuthMetrics.DOOR_CONFIG_NOT_FOUND).inc({ door }, 1);
setResponseJson(response, 404, {
err: `Door ${door} not found`,
msg: `Door ${door} not found`,
});
return callback(null, response);
@ -57,7 +57,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, AuthRequestTwil
if (!method) {
setResponseJson(response, 401, {
err: "Invalid PIN",
msg: "Invalid PIN",
});
return callback(null, response);
}

6
packages/doorman-api/src/functions/api/door/edit.ts
View File

@ -71,7 +71,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, EditRequestTwil
if (!newConfigRaw) {
setResponseJson(response, 400, {
err: "Missing new config",
msg: "Missing new config",
});
return callback(null, response);
}
@ -82,7 +82,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, EditRequestTwil
if (!config) {
setResponseJson(response, 404, {
err: `Door not found ${door}`,
msg: `Door not found ${door}`,
});
return callback(null, response);
}
@ -95,7 +95,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, EditRequestTwil
// if nothing changed, we should throw since this is a pointless change
if (isDeepSubset(config, newConfig)) {
setResponseJson(response, 400, {
err: "Nothing changed in the new config",
msg: "Nothing changed in the new config",
});
return callback(null, response);

4
packages/doorman-api/src/functions/api/door/info.ts
View File

@ -48,7 +48,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, InfoRequestTwil
.then(async (alias) => {
if (!alias) {
setResponseJson(response, 404, {
err: "This buzzer is not registered",
msg: "This buzzer is not registered",
});
return undefined;
}
@ -61,7 +61,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, InfoRequestTwil
if (!config) {
setResponseJson(response, 404, {
err: "This buzzer is not registered",
msg: "This buzzer is not registered",
});
} else {
if (buzzer) {

4
packages/doorman-api/src/functions/api/door/notify.ts
View File

@ -33,7 +33,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, NotifyRequestTw
if (req.key !== context.NOTIFY_SECRET_KEY) {
getMetricFromRegistry<Counter>(metricsRegistry, NotifyMetrics.UNAUTHENTICATED_CALL).inc(1);
setResponseJson(response, 401, {
err: "Unauthenticated call", event
msg: "Unauthenticated call", event
});
return callback(null, response);
}
@ -63,7 +63,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, NotifyRequestTw
);
} catch (e) {
console.error(e);
setResponseJson(response, 500, { err: e, event });
setResponseJson(response, 500, { msg: e, event });
return callback(null, response);
}

12
packages/doorman-api/src/functions/api/door/onboard.ts
View File

@ -55,7 +55,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, OnboardRequestT
const config = await db.entities.onboardDoorConfig.findById(getOnboardDoorId(discordState.name));
if (!config || config.nonce !== discordState.id) {
setResponseJson(response, 404, { err: "approval not found" });
setResponseJson(response, 404, { msg: "approval not found" });
return callback(null, response);
}
@ -81,7 +81,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, OnboardRequestT
console.log(profileId);
if (!profileId) {
setResponseJson(response, 404, { err: "profile not found" });
setResponseJson(response, 404, { msg: "profile not found" });
return callback(null, response);
}
@ -144,7 +144,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, OnboardRequestT
getMetricFromRegistry<Counter>(metricsRegistry, OnboardMetrics.TRANSACTION_CONFLICT).inc(1);
console.error(e);
setResponseJson(response, 409, { err: "something went wrong during onboarding" });
setResponseJson(response, 409, { msg: "something went wrong during onboarding" });
}
return callback(null, response);
@ -153,7 +153,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, OnboardRequestT
let newConfig = req.newConfig;
if (!newConfig) {
setResponseJson(response, 400, { err: "missing newConfig" });
setResponseJson(response, 400, { msg: "missing newConfig" });
return callback(null, response);
}
@ -166,7 +166,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, OnboardRequestT
if (existingAlias) {
getMetricFromRegistry<Counter>(metricsRegistry, OnboardMetrics.BUZZER_CONFLICT).inc({ buzzer: newConfigObj.buzzer }, 1);
setResponseJson(response, 409, { err: `A buzzer is already registered with the number ${newConfigObj.buzzer}` });
setResponseJson(response, 409, { msg: `A buzzer is already registered with the number ${newConfigObj.buzzer}` });
return callback(null, response);
}
@ -174,7 +174,7 @@ export const handler: ServerlessFunctionSignature<TwilioContext, OnboardRequestT
if (existingConfig) {
getMetricFromRegistry<Counter>(metricsRegistry, OnboardMetrics.NAME_CONFLICT).inc({ name: newConfigObj.name }, 1);
setResponseJson(response, 409, { err: `A buzzer is already registered with the name ${newConfigObj.name}` });
setResponseJson(response, 409, { msg: `A buzzer is already registered with the name ${newConfigObj.name}` });
return callback(null, response);
}

4
packages/doorman-homeassistant/src/index.ts
View File

@ -14,7 +14,7 @@ app.get("/api/door/info", async (c) => {
const door = c.req.query().door;
if (!door) {
return c.json({
err: "Must specify a door",
msg: "Must specify a door",
}, 400);
}
@ -24,7 +24,7 @@ app.get("/api/door/info", async (c) => {
if (!config) {
return c.json({
err: "This buzzer is not registered properly",
msg: "This buzzer is not registered properly",
}, 404);
}

8
packages/doorman-ui/src/pages/DoorPage.tsx
View File

@ -14,17 +14,17 @@ export async function loader({ params, request }: any) {
return {};
}
const response = await fetchUrlEncoded('/api/door/info', {
const res = await fetchUrlEncoded('/api/door/info', {
door,
}).then(res => res.json());
console.log(response);
console.log(res);
if (response.err) {
if (res.msg) {
throw new Error("Not a valid door");
}
return response as DoorResponse;
return res as DoorResponse;
}
export function DoorPage() {

4
packages/doorman-ui/src/pages/EditPage.tsx
View File

@ -116,8 +116,8 @@ export const EditPage = ({ isOnboarding }: EditPageProps) => {
fetchUrlEncoded(apiRoute, body)
.then(res => res.json())
.then(res => {
if (res.err) {
addAlert("error", res.err);
if (res.msg) {
addAlert("error", res.msg);
return;
}
if (!isOnboarding) {

2
packages/doorman-ui/src/pages/RedirectPage.tsx
View File

@ -18,7 +18,7 @@ export const RedirectPage = () => {
fetch(state.apiRedirect + '?' + params.toString())
.then(res => res.json())
.then(res => {
if (res.err) {
if (res.msg) {
console.error(res);
window.location.href = '/';
return;