update federated passkeys demo

examples/with-federated-passkeys/README.md

@@ -34,7 +34,7 @@ Now open `.env.local` and add the missing environment variables:
 
 - `API_PUBLIC_KEY`
 - `API_PRIVATE_KEY`
-- `ORGANIZATION_ID`
+- `NEXT_PUBLIC_ORGANIZATION_ID`
 - `NEXT_PUBLIC_BASE_URL` (the `NEXT_PUBLIC` prefix makes the env variable accessible to the frontend app)
 
 ### 3/ Running the app

examples/with-federated-passkeys/src/pages/api/subOrg.ts → examples/with-federated-passkeys/src/pages/api/createSubOrg.ts

@@ -16,6 +16,8 @@ type CreateSubOrgRequest = {
 
 type CreateSubOrgResponse = {
   subOrgId: string;
+  privateKeyId: string;
+  privateKeyAddress: string;
 };
 
 type ErrorMessage = {
@@ -42,7 +44,9 @@ export default async function createUser(
   });
 
   try {
-    const createSubOrgActivity = await activityPoller({
+    const privateKeyName = `Default ETH Key`;
+
+    const completedActivity = await activityPoller({
       type: "ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V3",
       timestampMs: String(Date.now()),
       organizationId: process.env.NEXT_PUBLIC_ORGANIZATION_ID!,
@@ -51,7 +55,7 @@ export default async function createUser(
         rootQuorumThreshold: 1,
         rootUsers: [
           {
-            userName: "My new user",
+            userName: "New user",
             apiKeys: [],
             authenticators: [
               {
@@ -62,16 +66,32 @@ export default async function createUser(
             ],
           },
         ],
-        privateKeys: [],
+        privateKeys: [
+          {
+            privateKeyName,
+            curve: "CURVE_SECP256K1",
+            addressFormats: ["ADDRESS_FORMAT_ETHEREUM"],
+            privateKeyTags: [],
+          },
+        ],
       },
     });
 
     const subOrgId = refineNonNull(
-      createSubOrgActivity.result.createSubOrganizationResult?.subOrganizationId
+      completedActivity.result.createSubOrganizationResultV3?.subOrganizationId
+    );
+    const privateKeys = refineNonNull(
+      completedActivity.result.createSubOrganizationResultV3?.privateKeys
+    );
+    const privateKeyId = refineNonNull(privateKeys?.[0]?.privateKeyId);
+    const privateKeyAddress = refineNonNull(
+      privateKeys?.[0]?.addresses?.[0]?.address
     );
 
     res.status(200).json({
       subOrgId,
+      privateKeyId,
+      privateKeyAddress,
     });
   } catch (e) {
     console.error(e);

examples/with-federated-passkeys/src/pages/api/getActivity.ts

@@ -0,0 +1,51 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import { TurnkeyApiTypes, TurnkeyClient } from "@turnkey/http";
+import { ApiKeyStamper } from "@turnkey/api-key-stamper";
+
+type TActivityResponse = TurnkeyApiTypes["v1ActivityResponse"];
+
+type GetActivityRequest = {
+  organizationId: string;
+  activityId: string;
+};
+
+type ErrorMessage = {
+  message: string;
+};
+
+// this getter can be performed by the parent org
+export default async function getActivity(
+  req: NextApiRequest,
+  res: NextApiResponse<TActivityResponse | ErrorMessage>
+) {
+  const getActivityRequest = req.body as GetActivityRequest;
+
+  const turnkeyClient = new TurnkeyClient(
+    { baseUrl: process.env.NEXT_PUBLIC_BASE_URL! },
+    new ApiKeyStamper({
+      apiPublicKey: process.env.API_PUBLIC_KEY!,
+      apiPrivateKey: process.env.API_PRIVATE_KEY!,
+    })
+  );
+
+  const { organizationId, activityId } = getActivityRequest;
+
+  try {
+    const activityResponse = await turnkeyClient.getActivity({
+      organizationId,
+      activityId,
+    });
+
+    res.status(200).json({
+      activity: activityResponse.activity,
+    });
+  } catch (e) {
+    console.error(e);
+
+    res.status(500).json({
+      message: "Something went wrong.",
+    });
+  }
+
+  res.json;
+}

examples/with-federated-passkeys/src/pages/api/getPrivateKeys.ts

@@ -0,0 +1,72 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import { TurnkeyApiTypes, TurnkeyClient } from "@turnkey/http";
+import { ApiKeyStamper } from "@turnkey/api-key-stamper";
+
+type TPrivateKey = TurnkeyApiTypes["v1PrivateKey"];
+
+type TFormattedPrivateKey = {
+  privateKeyId: string;
+  privateKeyName: string;
+  privateKeyAddress: string;
+};
+
+type GetPrivateKeysRequest = {
+  organizationId: string;
+};
+
+type GetPrivateKeysResponse = {
+  privateKeys: TFormattedPrivateKey[];
+};
+
+type ErrorMessage = {
+  message: string;
+};
+
+// This getter _can_ be performed by the parent org
+export default async function getPrivateKeys(
+  req: NextApiRequest,
+  res: NextApiResponse<GetPrivateKeysResponse | ErrorMessage>
+) {
+  const getPrivateKeysRequest = req.body as GetPrivateKeysRequest;
+
+  const turnkeyClient = new TurnkeyClient(
+    { baseUrl: process.env.NEXT_PUBLIC_BASE_URL! },
+    new ApiKeyStamper({
+      apiPublicKey: process.env.API_PUBLIC_KEY!,
+      apiPrivateKey: process.env.API_PRIVATE_KEY!,
+    })
+  );
+
+  const organizationId = getPrivateKeysRequest.organizationId;
+
+  try {
+    const privateKeysResponse = await turnkeyClient.getPrivateKeys({
+      organizationId,
+    });
+
+    // By default, the API will return private keys in descending order of create date.
+    // We reverse it here, so that visually the most recently created private keys will be
+    // added to the bottom of the list instead of the top.
+    const privateKeys = privateKeysResponse.privateKeys
+      .reverse()
+      .map((pk: TPrivateKey) => {
+        return {
+          privateKeyId: pk.privateKeyId!,
+          privateKeyName: pk.privateKeyName!,
+          privateKeyAddress: pk.addresses[0].address!,
+        };
+      });
+
+    res.status(200).json({
+      privateKeys,
+    });
+  } catch (e) {
+    console.error(e);
+
+    res.status(500).json({
+      message: "Something went wrong.",
+    });
+  }
+
+  res.json;
+}

examples/with-federated-passkeys/src/pages/api/proxyRequest.ts

@@ -4,6 +4,7 @@ import axios from "axios";
 
 type TResponse = {
   message: string;
+  activityId?: string;
 };
 
 export default async function proxyRequest(
@@ -22,6 +23,7 @@ export default async function proxyRequest(
 
     res.status(200).json({
       message: "Request successfully proxied!",
+      activityId: tkRes.data.activityId,
     });
   } catch (e) {
     console.error(e);

examples/with-federated-passkeys/src/pages/index.module.css

@@ -44,6 +44,13 @@
   font-family: "Inter";
 }
 
+.base {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
 .button {
   display: inline-flex;
   align-items: center;
@@ -67,3 +74,24 @@
   align-items: center;
   gap: 10px;
 }
+
+.baseTable {
+  font-family: "Inter";
+  width: 75%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.table {
+  width: 100%;
+}
+
+.td {
+  border-spacing: 1px;
+}
+
+.th {
+  padding-right: 5vw;
+  border-spacing: 1px;
+}