@originals/auth 1.7.0 → 1.8.0

package/src/server/turnkey-client.ts

@@ -1,12 +1,8 @@
 /**
  * Server-side Turnkey client utilities
- * 
- * Uses @turnkey/http for lightweight HTTP-only API access (~23MB)
- * instead of @turnkey/sdk-server which pulls in heavy EVM dependencies (~125MB+)
  */
 
-import { TurnkeyClient } from '@turnkey/http';
-import { ApiKeyStamper } from '@turnkey/api-key-stamper';
+import { Turnkey } from '@turnkey/sdk-server';
 
 export interface TurnkeyClientConfig {
   /** Turnkey API base URL (default: https://api.turnkey.com) */
@@ -20,174 +16,9 @@ export interface TurnkeyClientConfig {
 }
 
 /**
- * Wrapper class that provides the same simplified interface as @turnkey/sdk-server
- * but uses the lightweight @turnkey/http package (~23MB vs ~125MB+)
+ * Create a Turnkey server client
  */
-export class TurnkeyHttpClient {
-  private client: TurnkeyClient;
-  public readonly organizationId: string;
-
-  constructor(client: TurnkeyClient, organizationId: string) {
-    this.client = client;
-    this.organizationId = organizationId;
-  }
-
-  /**
-   * Get the underlying HTTP client for direct API access
-   */
-  apiClient() {
-    const self = this;
-    return {
-      /** Get sub-organization IDs */
-      async getSubOrgIds(params: {
-        organizationId: string;
-        filterType: string;
-        filterValue: string;
-      }) {
-        const result = await self.client.getSubOrgIds({
-          organizationId: params.organizationId,
-          filterType: params.filterType,
-          filterValue: params.filterValue,
-        });
-        return result;
-      },
-
-      /** Get wallets for an organization */
-      async getWallets(params: { organizationId: string }) {
-        const result = await self.client.getWallets({
-          organizationId: params.organizationId,
-        });
-        return result;
-      },
-
-      /** Create a sub-organization with wallet */
-      async createSubOrganization(params: {
-        subOrganizationName: string;
-        rootUsers: Array<{
-          userName: string;
-          userEmail: string;
-          apiKeys: unknown[];
-          authenticators: unknown[];
-          oauthProviders: unknown[];
-        }>;
-        rootQuorumThreshold: number;
-        wallet: {
-          walletName: string;
-          accounts: Array<{
-            curve: string;
-            pathFormat: string;
-            path: string;
-            addressFormat: string;
-          }>;
-        };
-      }) {
-        const result = await self.client.createSubOrganization({
-          type: 'ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V7',
-          timestampMs: Date.now().toString(),
-          organizationId: self.organizationId,
-          parameters: {
-            subOrganizationName: params.subOrganizationName,
-            rootUsers: params.rootUsers.map(user => ({
-              userName: user.userName,
-              userEmail: user.userEmail,
-              apiKeys: user.apiKeys as [],
-              authenticators: user.authenticators as [],
-              oauthProviders: user.oauthProviders as [],
-            })),
-            rootQuorumThreshold: params.rootQuorumThreshold,
-            wallet: {
-              walletName: params.wallet.walletName,
-              accounts: params.wallet.accounts.map(acc => ({
-                curve: acc.curve as 'CURVE_SECP256K1' | 'CURVE_ED25519',
-                pathFormat: acc.pathFormat as 'PATH_FORMAT_BIP32',
-                path: acc.path,
-                addressFormat: acc.addressFormat as 'ADDRESS_FORMAT_ETHEREUM' | 'ADDRESS_FORMAT_SOLANA',
-              })),
-            },
-          },
-        });
-        return result;
-      },
-
-      /** Initialize OTP */
-      async initOtp(params: {
-        otpType: string;
-        contact: string;
-        userIdentifier: string;
-        appName: string;
-        otpLength: number;
-        alphanumeric: boolean;
-      }) {
-        const result = await self.client.initOtp({
-          type: 'ACTIVITY_TYPE_INIT_OTP_V2',
-          timestampMs: Date.now().toString(),
-          organizationId: self.organizationId,
-          parameters: {
-            otpType: params.otpType as 'OTP_TYPE_EMAIL' | 'OTP_TYPE_SMS',
-            contact: params.contact,
-            userIdentifier: params.userIdentifier,
-            appName: params.appName,
-            otpLength: params.otpLength,
-            alphanumeric: params.alphanumeric,
-          },
-        });
-        // Extract otpId from the activity result
-        const activity = result.activity;
-        const initResult = (activity?.result as { initOtpResult?: { otpId?: string } })?.initOtpResult;
-        return { otpId: initResult?.otpId };
-      },
-
-      /** Verify OTP */
-      async verifyOtp(params: {
-        otpId: string;
-        otpCode: string;
-        expirationSeconds: string;
-      }) {
-        const result = await self.client.verifyOtp({
-          type: 'ACTIVITY_TYPE_VERIFY_OTP',
-          timestampMs: Date.now().toString(),
-          organizationId: self.organizationId,
-          parameters: {
-            otpId: params.otpId,
-            otpCode: params.otpCode,
-            expirationSeconds: params.expirationSeconds,
-          },
-        });
-        // Extract verification token from activity result
-        const activity = result.activity;
-        const verifyResult = (activity?.result as { verifyOtpResult?: { verificationToken?: string } })?.verifyOtpResult;
-        return { verificationToken: verifyResult?.verificationToken };
-      },
-
-      /** Sign raw payload */
-      async signRawPayload(params: {
-        organizationId: string;
-        signWith: string;
-        payload: string;
-        encoding: string;
-        hashFunction: string;
-      }) {
-        const result = await self.client.signRawPayload({
-          type: 'ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2',
-          timestampMs: Date.now().toString(),
-          organizationId: params.organizationId,
-          parameters: {
-            signWith: params.signWith,
-            payload: params.payload,
-            encoding: params.encoding as 'PAYLOAD_ENCODING_HEXADECIMAL',
-            hashFunction: params.hashFunction as 'HASH_FUNCTION_NO_OP',
-          },
-        });
-        return result;
-      },
-    };
-  }
-}
-
-/**
- * Create a Turnkey server client using the lightweight HTTP package
- */
-export function createTurnkeyClient(config?: Partial<TurnkeyClientConfig>): TurnkeyHttpClient {
+export function createTurnkeyClient(config?: Partial<TurnkeyClientConfig>): Turnkey {
   const apiPublicKey = config?.apiPublicKey ?? process.env.TURNKEY_API_PUBLIC_KEY;
   const apiPrivateKey = config?.apiPrivateKey ?? process.env.TURNKEY_API_PRIVATE_KEY;
   const organizationId = config?.organizationId ?? process.env.TURNKEY_ORGANIZATION_ID;
@@ -202,19 +33,12 @@ export function createTurnkeyClient(config?: Partial<TurnkeyClientConfig>): Turn
     throw new Error('TURNKEY_ORGANIZATION_ID is required');
   }
 
-  // Create API key stamper for request signing
-  const stamper = new ApiKeyStamper({
+  return new Turnkey({
+    apiBaseUrl: config?.apiBaseUrl ?? 'https://api.turnkey.com',
     apiPublicKey,
     apiPrivateKey,
+    defaultOrganizationId: organizationId,
   });
-
-  // Create HTTP client
-  const client = new TurnkeyClient(
-    { baseUrl: config?.apiBaseUrl ?? 'https://api.turnkey.com' },
-    stamper
-  );
-
-  return new TurnkeyHttpClient(client, organizationId);
 }
 
 /**
@@ -223,7 +47,7 @@ export function createTurnkeyClient(config?: Partial<TurnkeyClientConfig>): Turn
  */
 export async function getOrCreateTurnkeySubOrg(
   email: string,
-  turnkeyClient: TurnkeyHttpClient
+  turnkeyClient: Turnkey
 ): Promise<string> {
   const organizationId = process.env.TURNKEY_ORGANIZATION_ID;
   if (!organizationId) {

package/src/server/turnkey-signer.ts

@@ -5,11 +5,11 @@
  * keys for use with the Originals SDK's DID creation and signing operations.
  */
 
+import { Turnkey } from '@turnkey/sdk-server';
 import { ExternalSigner, ExternalVerifier, multikey, OriginalsSDK } from '@originals/sdk';
 import { sha512 } from '@noble/hashes/sha2.js';
 import { concatBytes, bytesToHex } from '@noble/hashes/utils.js';
 import * as ed25519 from '@noble/ed25519';
-import type { TurnkeyHttpClient } from './turnkey-client';
 
 // Configure @noble/ed25519 with required SHA-512 function
 const sha512Fn = (...msgs: Uint8Array[]): Uint8Array => sha512(concatBytes(...msgs));
@@ -38,14 +38,14 @@ export class TurnkeyWebVHSigner implements ExternalSigner, ExternalVerifier {
   private subOrgId: string;
   private keyId: string;
   private publicKeyMultibase: string;
-  private turnkeyClient: TurnkeyHttpClient;
+  private turnkeyClient: Turnkey;
   private verificationMethodId: string;
 
   constructor(
     subOrgId: string,
     keyId: string,
     publicKeyMultibase: string,
-    turnkeyClient: TurnkeyHttpClient,
+    turnkeyClient: Turnkey,
     verificationMethodId: string
   ) {
     this.subOrgId = subOrgId;
@@ -155,7 +155,7 @@ export class TurnkeyWebVHSigner implements ExternalSigner, ExternalVerifier {
 export function createTurnkeySigner(
   subOrgId: string,
   keyId: string,
-  turnkeyClient: TurnkeyHttpClient,
+  turnkeyClient: Turnkey,
   verificationMethodId: string,
   publicKeyMultibase: string
 ): TurnkeyWebVHSigner {