Merge pull-request #22

Author: moeodeh3

Examples/swift-demo-wallet/example-server/index.ts

@@ -3,10 +3,10 @@ import cors from "cors";
 import dotenv from "dotenv";
 import bodyParser from "body-parser";
 import {
-  getSubOrgId,
   sendOtp,
   verifyOtp,
   createSubOrg,
+  oAuth,
 } from "./src/handler.js";
 
 dotenv.config();
@@ -32,16 +32,16 @@ async function handleRequest<T>(
   }
 }
 
-app.post("/auth/getSubOrgId", (req, res) =>
-  handleRequest(req, res, getSubOrgId),
+app.post("/auth/createSubOrg", (req, res) =>
+  handleRequest(req, res, createSubOrg),
 );
+
 app.post("/auth/sendOtp", (req, res) =>
   handleRequest(req, res, sendOtp),
 );
 app.post("/auth/verifyOtp", (req, res) => handleRequest(req, res, verifyOtp));
-app.post("/auth/createSubOrg", (req, res) =>
-  handleRequest(req, res, createSubOrg),
-);
+
+app.post("/auth/oAuth", (req, res) => handleRequest(req, res, oAuth));
 
 app.listen(PORT, () =>
   console.log(`✅ Server running on http://localhost:${PORT}`),

Examples/swift-demo-wallet/example-server/src/handler.ts

@@ -3,8 +3,6 @@ import dotenv from "dotenv";
 import { DEFAULT_ETHEREUM_ACCOUNTS, Turnkey } from "@turnkey/sdk-server";
 import { decodeJwt } from "./util.js";
 import {
-  GetSubOrgIdParams,
-  GetSubOrgIdResponse,
   CreateSubOrgParams,
   CreateSubOrgResponse,
   SendOtpParams,
@@ -13,6 +11,8 @@ import {
   VerifyOtpResponse,
   VerifyOtpParams,
   SendOtpResponse,
+  OAuthParams,
+  OAuthResponse,
 } from "./types.js";
 
 dotenv.config();
@@ -26,20 +26,6 @@ export const turnkeyConfig = {
 
 const turnkey = new Turnkey(turnkeyConfig).apiClient();
 
-export async function getSubOrgId(
-  req: Request<{}, {}, GetSubOrgIdParams>
-): Promise<GetSubOrgIdResponse> {
-  const { filterType, filterValue } = req.body;
-  const { organizationIds } = await turnkey.getSubOrgIds({
-    filterType,
-    filterValue,
-  });
-
-  return {
-    organizationId: organizationIds[0] || turnkeyConfig.defaultOrganizationId,
-  };
-}
-
 export async function sendOtp(
   req: Request<{}, {}, SendOtpParams>
 ): Promise<SendOtpResponse> {
@@ -103,7 +89,7 @@ export async function verifyOtp(
 export async function createSubOrg(
   req: Request<{}, {}, CreateSubOrgParams>
 ): Promise<CreateSubOrgResponse> {
-  const { email, phone, passkey, apiKeys } = req.body;
+  const { email, phone, passkey, oauth, apiKeys } = req.body;
 
   const authenticators = passkey
     ? [
@@ -115,8 +101,17 @@ export async function createSubOrg(
       ]
     : [];
 
-    let userEmail = email;
-    const userPhoneNumber = phone;
+  const oauthProviders = oauth
+    ? [
+        {
+          providerName: oauth.providerName,
+          oidcToken: oauth.oidcToken,
+        },
+      ]
+    : [];
+
+  let userEmail = email;
+  const userPhoneNumber = phone;
 
   const subOrganizationName = `Sub Org - ${new Date().toISOString()}`;
 
@@ -129,8 +124,8 @@ export async function createSubOrg(
         userEmail,
         userPhoneNumber,
         authenticators,
+        oauthProviders: oauthProviders,
         apiKeys: apiKeys ?? [],
-        oauthProviders: [],
       },
     ],
     rootQuorumThreshold: 1,
@@ -142,3 +137,41 @@ export async function createSubOrg(
 
   return { subOrganizationId: result.subOrganizationId };
 }
+
+export async function oAuth(
+  req: Request<{}, {}, OAuthParams>
+): Promise<OAuthResponse> {
+  const { publicKey, providerName, oidcToken, expirationSeconds } = req.body;
+
+  let organizationId = turnkeyConfig.defaultOrganizationId;
+
+  const { organizationIds } = await turnkey.getSubOrgIds({
+    filterType: "OIDC_TOKEN",
+    filterValue: oidcToken,
+  });
+
+  if (organizationIds.length > 0) {
+    organizationId = organizationIds[0];
+  } else {
+    const createSubOrgParams = {
+      oauth: {
+        providerName,
+        oidcToken,
+      },
+    };
+
+    const subOrgResponse = await createSubOrg({
+      body: createSubOrgParams,
+    } as Request);
+    organizationId = subOrgResponse.subOrganizationId;
+  }
+
+  const sessionResponse = await turnkey.oauthLogin({
+    publicKey,
+    organizationId,
+    oidcToken,
+    expirationSeconds,
+  });
+
+  return { token: sessionResponse.session };
+}

Examples/swift-demo-wallet/example-server/src/types.ts

@@ -10,22 +10,6 @@ export enum FilterType {
   PhoneNumber = "PHONE_NUMBER",
 }
 
-export type GetSubOrgIdParams = {
-  filterType:
-    | "NAME"
-    | "USERNAME"
-    | "EMAIL"
-    | "PHONE_NUMBER"
-    | "CREDENTIAL_ID"
-    | "PUBLIC_KEY"
-    | "OIDC_TOKEN";
-  filterValue: string;
-};
-
-export type GetSubOrgIdResponse = {
-  organizationId: string;
-};
-
 export type SendOtpParams = {
   otpType: "OTP_TYPE_EMAIL" | "OTP_TYPE_SMS";
   contact: string;
@@ -44,6 +28,10 @@ export type CreateSubOrgParams = {
     challenge: string;
     attestation: Attestation;
   };
+  oauth?: {
+    providerName: string;
+    oidcToken: string;
+  };
   apiKeys?: {
     apiKeyName: string;
     publicKey: string;
@@ -69,5 +57,16 @@ export type VerifyOtpResponse = {
   token?: string;
 };
 
+export type OAuthParams = {
+  publicKey: string;
+  providerName: string;
+  oidcToken: string;
+  expirationSeconds: string;
+};
+
+export type OAuthResponse = {
+  token: string;
+}
+
 export type Attestation = TurnkeyApiTypes["v1Attestation"];
 export type ApiKeyCurveType = TurnkeyApiTypes["v1ApiKeyCurve"];

Examples/swift-demo-wallet/swift-demo-wallet/Assets.xcassets/google-icon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "google-icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}