Merge pull request #46 from saleor/fix-lint-warnings

Fix lint warnings
This commit is contained in:
Krzysztof Wolski 2022-09-05 10:12:03 +02:00 committed by GitHub
commit 59526d83fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 8 deletions

View file

@ -44,6 +44,7 @@ function eventStateReducer(state: AppBridgeState, event: Events) {
/**
* Event comes from API, so always assume it can be something not covered by TS
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
console.warn(`Invalid event received: ${(event as any)?.type}`);
return state;
}

View file

@ -53,4 +53,4 @@ export type PayloadOfEvent<
TEventType extends EventType,
TEvent extends Events = Events
// @ts-ignore TODO - why this is not working with this tsconfig? Fixme
> = TEvent extends Event<TEventType, any> ? TEvent["payload"] : never;
> = TEvent extends Event<TEventType, unknown> ? TEvent["payload"] : never;

View file

@ -5,9 +5,14 @@ import {
SALEOR_SIGNATURE_HEADER,
} from "./const";
export const getSaleorHeaders = (headers: { [name: string]: any }) => ({
domain: headers[SALEOR_DOMAIN_HEADER],
authorizationBearer: headers[SALEOR_AUTHORIZATION_BEARER_HEADER],
signature: headers[SALEOR_SIGNATURE_HEADER],
event: headers[SALEOR_EVENT_HEADER],
const toStringOrUndefined = (value: string | string[] | undefined) =>
value ? value.toString() : undefined;
export const getSaleorHeaders = (headers: {
[name: string]: string | string[] | undefined;
}): Record<string, string | undefined> => ({
domain: toStringOrUndefined(headers[SALEOR_DOMAIN_HEADER]),
authorizationBearer: toStringOrUndefined(headers[SALEOR_AUTHORIZATION_BEARER_HEADER]),
signature: toStringOrUndefined(headers[SALEOR_SIGNATURE_HEADER]),
event: toStringOrUndefined(headers[SALEOR_EVENT_HEADER]),
});

View file

@ -2,7 +2,7 @@ import * as jose from "jose";
import type { Middleware, Request } from "retes";
import { Response } from "retes/response";
import { SALEOR_AUTHORIZATION_BEARER_HEADER } from "../const";
import { SALEOR_AUTHORIZATION_BEARER_HEADER, SALEOR_DOMAIN_HEADER } from "../const";
import { getSaleorHeaders } from "../headers";
import { getJwksUrl } from "../urls";
@ -24,6 +24,13 @@ export const withJWTVerified =
});
}
if (domain === undefined) {
return Response.BadRequest({
success: false,
message: `${ERROR_MESSAGE} Missing ${SALEOR_DOMAIN_HEADER} header.`,
});
}
let tokenClaims: DashboardTokenPayload;
try {
tokenClaims = jose.decodeJwt(token as string) as DashboardTokenPayload;

View file

@ -9,6 +9,12 @@ export const withRegisteredSaleorDomainHeader =
(handler) =>
async (request) => {
const { domain: saleorDomain } = getSaleorHeaders(request.headers);
if (!saleorDomain) {
return Response.BadRequest({
success: false,
message: "Domain header missing.",
});
}
const authData = await apl.get(saleorDomain);
if (!authData) {
return Response.Forbidden({

View file

@ -3,7 +3,7 @@ import * as jose from "jose";
import { Middleware } from "retes";
import { Response } from "retes/response";
import { SALEOR_SIGNATURE_HEADER } from "../const";
import { SALEOR_DOMAIN_HEADER, SALEOR_SIGNATURE_HEADER } from "../const";
import { getSaleorHeaders } from "../headers";
import { getJwksUrl } from "../urls";
@ -29,6 +29,13 @@ export const withWebhookSignatureVerified =
});
}
if (!saleorDomain) {
return Response.BadRequest({
success: false,
message: `${ERROR_MESSAGE} Missing ${SALEOR_DOMAIN_HEADER} header.`,
});
}
if (secretKey !== undefined) {
const calculatedSignature = crypto
.createHmac("sha256", secretKey)