Skip to content

Commit 2674243

Browse files
committed
fix requests timeout
1 parent 1e4e107 commit 2674243

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

packages/registrar_client/src/modules/accounts.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ export class Accounts {
1414
}
1515

1616
async createAccount(request: Partial<CreateAccountRequest>): Promise<Account | null> {
17-
const timestamp = Math.floor(Date.now() / 1000);
18-
1917
const privateKey = this.client.privateKey;
2018
const keyPair = tweetnacl.sign.keyPair.fromSecretKey(base64.toByteArray(privateKey));
2119

2220
const publicKey = base64.fromByteArray(keyPair.publicKey);
23-
const signature = createSignatureWithPublicKey(timestamp, publicKey, privateKey);
21+
const { signature, timestamp } = createSignatureWithPublicKey(publicKey, privateKey);
2422

2523
request.public_key = publicKey;
2624
request.signature = signature;

packages/registrar_client/src/utils.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ function createSignatureForChallenge(challenge: string, privateKey: string): str
88
return base64.fromByteArray(signature);
99
}
1010

11-
export function createSignatureWithPublicKey(timestamp: number, publicKey: string, privateKey: string): string {
11+
export function createSignatureWithPublicKey(publicKey: string, privateKey: string): { signature: string; timestamp: number } {
1212
if (publicKey === "") {
1313
throw new Error("Public key is required");
1414
}
15+
const timestamp = Math.floor(Date.now() / 1000);
1516
const challenge = `${timestamp}:${publicKey}`;
16-
return createSignatureForChallenge(challenge, privateKey);
17+
const signature = createSignatureForChallenge(challenge, privateKey);
18+
return { signature, timestamp };
1719
}
1820

1921
export function createAuthHeader(twinID: number, privateKey: string): AxiosRequestConfig["headers"] {

packages/registrar_client/tests/unit_tests/utils.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ describe("Util Functions", () => {
1919
});
2020

2121
test("createSignatureWithPublicKey generates a valid signature", () => {
22-
const timestamp = 1700000000;
23-
const signature = createSignatureWithPublicKey(timestamp, publicKey, privateKey);
22+
const { signature, timestamp } = createSignatureWithPublicKey(publicKey,
23+
privateKey);
2424

2525
expect(tweetnacl.sign.detached).toHaveBeenCalledWith(
2626
Buffer.from(`${timestamp}:${publicKey}`, "utf-8"),
@@ -45,12 +45,12 @@ describe("Util Functions", () => {
4545

4646
test("createSignatureWithPublicKey handles invalid base64 privateKey", () => {
4747
const invalidPrivateKey = "invalid_base64_string";
48-
expect(() => createSignatureWithPublicKey(1700000000, publicKey, invalidPrivateKey)).toThrow();
48+
expect(() => createSignatureWithPublicKey(publicKey, invalidPrivateKey)).toThrow();
4949
});
5050

5151
test("createSignatureWithPublicKey handles empty publicKey", () => {
5252
const emptyPublicKey = "";
53-
expect(() => createSignatureWithPublicKey(1700000000, emptyPublicKey, privateKey)).toThrow();
53+
expect(() => createSignatureWithPublicKey(emptyPublicKey, privateKey)).toThrow();
5454
});
5555

5656
test("createAuthHeader handles invalid base64 privateKey", () => {

0 commit comments

Comments
 (0)