Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions src/helpers/citadelUtils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { BUILD_ENV_TYPE, CITADEL_SERVER_MAP } from "@toruslabs/constants";
import { get } from "@toruslabs/http-helpers";

import { LoginStatus } from "../interfaces";

export interface CitadelAllowParams {
buildEnv: BUILD_ENV_TYPE;
verifier: string;
verifierId: string;
network: string;
clientId: string;
source?: string;
loginStatus?: LoginStatus;
}

export function buildAllowUrl(params: CitadelAllowParams): string {
const url = new URL(`${CITADEL_SERVER_MAP[params.buildEnv]}/v1/signer/allow`);
url.searchParams.set("verifier", params.verifier);
url.searchParams.set("verifierid", params.verifierId);
url.searchParams.set("network", params.network);
url.searchParams.set("clientid", params.clientId);
if (params.source) {
url.searchParams.set("source", params.source);
}
if (params.loginStatus) {
url.searchParams.set("loginstatus", params.loginStatus);
}
return url.toString();
}

export async function callAllowApi(params: CitadelAllowParams): Promise<void> {
try {
await get<void>(buildAllowUrl(params));
} catch {
return;
}
}
1 change: 1 addition & 0 deletions src/helpers/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from "./citadelUtils";
export * from "./common";
export * from "./errorUtils";
export * from "./keyUtils";
Expand Down
16 changes: 5 additions & 11 deletions src/helpers/nodeUtils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BUILD_ENV_TYPE, CITADEL_SERVER_MAP, INodePub, KEY_TYPE, TORUS_NETWORK_TYPE } from "@toruslabs/constants";
import { BUILD_ENV_TYPE, INodePub, KEY_TYPE, TORUS_NETWORK_TYPE } from "@toruslabs/constants";
import { generatePrivate, getPublic } from "@toruslabs/eccrypto";
import { generateJsonRPCObject, get, post } from "@toruslabs/http-helpers";
import { generateJsonRPCObject, post } from "@toruslabs/http-helpers";
import { lagrangeInterpolation } from "@toruslabs/metadata-helpers";

import { config } from "../config";
Expand All @@ -16,6 +16,7 @@ import {
JRPCResponse,
KeyLookupResult,
KeyType,
LoginStatus,
SessionToken,
ShareRequestResult,
TorusKey,
Expand All @@ -27,6 +28,7 @@ import {
import log from "../loglevel";
import { Some } from "../some";
import { TorusUtilsExtraParams } from "../TorusUtilsExtraParams";
import { callAllowApi } from "./citadelUtils";
import {
base64ToBytes,
bigintToHex,
Expand Down Expand Up @@ -387,15 +389,7 @@ export async function retrieveOrImportShare(params: {
checkCommitment = true,
source,
} = params;
const url = new URL(`${CITADEL_SERVER_MAP[buildEnv]}/v1/signer/allow`);
url.searchParams.set("verifier", verifier);
url.searchParams.set("verifierid", verifierParams.verifier_id);
url.searchParams.set("network", network);
url.searchParams.set("clientid", clientId);
if (source) {
url.searchParams.set("source", source);
}
await get<void>(url.toString());
callAllowApi({ buildEnv, verifier, verifierId: verifierParams.verifier_id, network, clientId, source, loginStatus: LoginStatus.INITIATED });
Comment thread
hieu-w marked this conversation as resolved.
Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be awaited ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated


// generate temporary private and public key that is used to secure receive shares
const sessionAuthKey = generatePrivate();
Expand Down
6 changes: 6 additions & 0 deletions src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ export type v1NonceResultType = { typeOfUser: "v1"; nonce?: string; seed?: strin
export type GetOrSetNonceResult = v2NonceResultType | v1NonceResultType;
export type KeyType = "secp256k1" | "ed25519";

export enum LoginStatus {
INITIATED = "initiated",
SUCCESS = "success",
FAILED = "failed",
}

export interface SetNonceData {
operation: string;
data: string;
Expand Down
58 changes: 39 additions & 19 deletions src/torus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { config } from "./config";
import {
bigintToHex,
bytesToHex,
callAllowApi,
Curve,
encodeEd25519Point,
generateAddressFromPubKey,
Expand All @@ -27,6 +28,7 @@ import {
ImportKeyParams,
KeyType,
LegacyVerifierLookupResponse,
LoginStatus,
RetrieveSharesParams,
TorusCtorOptions,
TorusKey,
Expand Down Expand Up @@ -147,28 +149,46 @@ class Torus {
extraParams.session_token_exp_second = Torus.sessionTime;
}

return retrieveOrImportShare({
legacyMetadataHost: this.legacyMetadataHost,
serverTimeOffset: this.serverTimeOffset,
enableOneKey: this.enableOneKey,
ecCurve: this.ec,
keyType: this.keyType,
network: this.network,
clientId: this.clientId,
const allowParams = {
buildEnv: this.buildEnv,
endpoints,
indexes,
verifier,
verifierParams,
idToken,
useDkg: shouldUseDkg,
newImportedShares: [],
overrideExistingKey: false,
nodePubkeys,
extraParams,
checkCommitment,
verifierId: verifierParams.verifier_id,
network: this.network,
clientId: this.clientId,
source: this.source,
});
};

let result: TorusKey;
try {
result = await retrieveOrImportShare({
legacyMetadataHost: this.legacyMetadataHost,
serverTimeOffset: this.serverTimeOffset,
enableOneKey: this.enableOneKey,
ecCurve: this.ec,
keyType: this.keyType,
network: this.network,
clientId: this.clientId,
buildEnv: this.buildEnv,
endpoints,
indexes,
verifier,
verifierParams,
idToken,
useDkg: shouldUseDkg,
newImportedShares: [],
overrideExistingKey: false,
nodePubkeys,
extraParams,
checkCommitment,
source: this.source,
});
} catch (error) {
callAllowApi({ ...allowParams, loginStatus: LoginStatus.FAILED });
throw error;
}

callAllowApi({ ...allowParams, loginStatus: LoginStatus.SUCCESS });
return result;
}

async getPublicAddress(
Expand Down
Loading