Skip to content

Commit 6acfa86

Browse files
committed
Use full relative imports
1 parent cf376a4 commit 6acfa86

File tree

4 files changed

+25
-22
lines changed

4 files changed

+25
-22
lines changed

src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { IncomingMessage } from "http";
22
import { text } from "micro";
3-
import { verify } from "./verify";
3+
import { verify } from "./verify.js";
44

55
export async function verifySecret(req: IncomingMessage, secret: string): Promise<boolean>;
66
export async function verifySecret(body: string, secret: string, xHubSignature?: string | string[]): Promise<boolean>;

src/verify.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createHmac } from "crypto";
1+
import { createHmac } from "node:crypto";
22

33
export function verify(body: string, secret: string, signature?: string | string[]): boolean {
44
if (!signature) {

test/integration/verify.test.ts

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
import test from "ava";
2-
import type { OutgoingHttpHeaders } from "node:http";
2+
import http from "node:http";
33
import micro from "micro";
44
import listen from "test-listen";
55
import got from "got";
6-
import { verifySecret } from "../../src/index";
6+
import type { Headers } from "got";
7+
import { verifySecret } from "../../src/index.js";
78

89
interface TestVerifySecretOptions {
910
readonly secret: string;
10-
readonly requestBodyJson: object;
11+
readonly requestBodyJson: unknown;
1112
readonly xHubSignatureHeader?: string;
1213
}
1314

1415
const testVerifySecretMacro = test.macro(async (t, options: TestVerifySecretOptions, isValid: boolean) => {
1516
const { secret, requestBodyJson, xHubSignatureHeader } = options;
1617

17-
const server = micro(async (request) => {
18-
const valid = await verifySecret(request, secret);
18+
const server = new http.Server(
19+
micro.serve(async (request) => {
20+
const valid = await verifySecret(request, secret);
1921

20-
t.is(valid, isValid);
22+
t.is(valid, isValid);
2123

22-
return "";
23-
});
24+
return "";
25+
}),
26+
);
2427

2528
try {
2629
const url = await listen(server);
27-
let headers: OutgoingHttpHeaders | undefined;
30+
let headers: Headers | undefined;
2831

2932
if (xHubSignatureHeader !== undefined) {
3033
headers = { "X-Hub-Signature": xHubSignatureHeader };
3134
}
3235

3336
await got.post(url, {
3437
headers,
35-
json: true,
36-
body: requestBodyJson,
38+
json: requestBodyJson,
3739
});
3840
} finally {
3941
server.close();
@@ -70,22 +72,23 @@ test(
7072
);
7173

7274
test("should not hang when verify is called more than once", async (t) => {
73-
const server = micro(async (request) => {
74-
const valid = await verifySecret(request, "my-secret");
75-
await verifySecret(request, "my-secret");
75+
const server = new http.Server(
76+
micro.serve(async (request) => {
77+
const valid = await verifySecret(request, "my-secret");
78+
await verifySecret(request, "my-secret");
7679

77-
t.true(valid);
80+
t.true(valid);
7881

79-
return "";
80-
});
82+
return "";
83+
}),
84+
);
8185

8286
try {
8387
const url = await listen(server);
8488

8589
await got.post(url, {
8690
headers: { "X-Hub-Signature": "sha1=30a233839fe2ddd9233c49fd593e8f1aec68f553" },
87-
json: true,
88-
body: { foo: "bar" },
91+
json: { foo: "bar" },
8992
});
9093
} finally {
9194
server.close();

test/unit/verify.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import test from "ava";
2-
import { verify } from "../../src/verify";
2+
import { verify } from "../../src/verify.js";
33

44
const body = JSON.stringify({
55
foo: "bar",

0 commit comments

Comments
 (0)