feat: wallet api v2

radixdlt · Jul 14, 2023 · 27a3c7f · 27a3c7f
1 parent fe5889f
commit 27a3c7f
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 1,424 deletions.
diff --git a/examples/index.ts b/examples/index.ts
@@ -7,7 +7,6 @@ const sdk = WalletSdk({
     'account_tdx_a_1qd5svul20u30qnq408zhj2tw5evqrunq48eg0jsjf9qsx5t8qu',
   logger: createLogger(1),
   networkId: 12,
-  version: 1,
 })
 
 const displayResults = (result: Result<any, any>) => {
@@ -26,8 +25,16 @@ document.getElementById('login-btn')!.onclick = async () => {
   clearResults()
   const result = await sdk.request({
     discriminator: 'authorizedRequest',
-    login: {},
+    auth: { discriminator: 'loginWithoutChallenge' },
+    ongoingPersonaData: {
+      isRequestingName: true,
+      numberOfRequestedEmailAddresses: { quantifier: 'atLeast', quantity: 1 },
+      numberOfRequestedPhoneNumbers: { quantifier: 'exactly', quantity: 1 },
+    },
   })
+  if (result.isErr()) return
+  result.value.discriminator === 'authorizedRequest' &&
+    result.value.ongoingPersonaData?.fullName!.given!
 
   displayResults(result)
 }
@@ -58,7 +65,7 @@ document.getElementById('persona-data-btn')!.onclick = async () => {
 
   const result = await sdk.request({
     discriminator: 'unauthorizedRequest',
-    oneTimePersonaData: { fields: ['givenName'] },
+    oneTimePersonaData: { isRequestingName: true },
   })
 
   displayResults(result)

diff --git a/lib/IO/index.ts b/lib/IO/index.ts
@@ -0,0 +1,2 @@
+export * from './schemas'
+export * as walletInteractionFactoryV2 from './wallet-interaction-factory'
diff --git a/lib/IO/v1/schemas.ts → lib/IO/schemas.ts b/lib/IO/v1/schemas.ts → lib/IO/schemas.ts
@@ -24,33 +24,34 @@ export const AccountProof = object({
 export type Persona = z.infer<typeof Persona>
 export const Persona = object({ identityAddress: string(), label: string() })
 
-export const personaDataField = {
-  givenName: 'givenName',
-  familyName: 'familyName',
-  emailAddress: 'emailAddress',
-  phoneNumber: 'phoneNumber',
+export const personaDataFullNameVariant = {
+  western: 'western',
+  eastern: 'eastern',
 } as const
-export type PersonaDataField = z.infer<typeof PersonaDataField>
-export const PersonaDataField = union([
-  literal('givenName'),
-  literal('familyName'),
-  literal('emailAddress'),
-  literal('phoneNumber'),
+export type PersonaDataNameVariant = z.infer<typeof PersonaDataNameVariant>
+export const PersonaDataNameVariant = union([
+  literal(personaDataFullNameVariant.eastern),
+  literal(personaDataFullNameVariant.western),
 ])
 
-export type PersonaData = z.infer<typeof PersonaData>
-export const PersonaData = object({ field: PersonaDataField, value: string() })
+export type PersonaDataFullName = z.infer<typeof PersonaDataFullName>
+export const PersonaDataFullName = object({
+  variant: PersonaDataNameVariant,
+  familyName: string(),
+  nickname: string(),
+  givenNames: string(),
+})
 
-export type NumberOfAccounts = z.infer<typeof NumberOfAccounts>
-export const NumberOfAccounts = object({
+export type NumberOfValues = z.infer<typeof NumberOfValues>
+export const NumberOfValues = object({
   quantifier: union([literal('exactly'), literal('atLeast')]),
   quantity: number().gte(1),
 })
 
 export type AccountsRequestItem = z.infer<typeof AccountsRequestItem>
 export const AccountsRequestItem = object({
   challenge: string().optional(),
-  numberOfAccounts: NumberOfAccounts,
+  numberOfAccounts: NumberOfValues,
 })
 
 export type AccountsRequestResponseItem = z.infer<
@@ -69,14 +70,18 @@ export const AccountsRequestResponseItem = object({
 
 export type PersonaDataRequestItem = z.infer<typeof PersonaDataRequestItem>
 export const PersonaDataRequestItem = object({
-  fields: array(PersonaDataField),
+  isRequestingName: boolean().optional(),
+  numberOfRequestedEmailAddresses: NumberOfValues.optional(),
+  numberOfRequestedPhoneNumbers: NumberOfValues.optional(),
 })
 
 export type PersonaDataRequestResponseItem = z.infer<
   typeof PersonaDataRequestResponseItem
 >
 export const PersonaDataRequestResponseItem = object({
-  fields: array(PersonaData),
+  fullName: PersonaDataFullName.optional(),
+  emailAddresses: array(string()).optional(),
+  phoneNumbers: array(string()).optional(),
 })
 
 export type ResetRequestItem = z.infer<typeof ResetRequestItem>
@@ -200,7 +205,7 @@ export const WalletInteractionItems = union([
 
 export type Metadata = z.infer<typeof Metadata>
 export const Metadata = object({
-  version: literal(1),
+  version: literal(2),
   networkId: number(),
   dAppDefinitionAddress: string(),
 })
@@ -265,8 +270,8 @@ export const WalletAuthorizedRequestResponseItems = object({
   discriminator: literal('authorizedRequest'),
   auth: AuthRequestResponseItem,
   oneTimeAccounts: AccountsRequestResponseItem.optional(),
-  oneTimePersonaData: PersonaDataRequestResponseItem.optional(),
   ongoingAccounts: AccountsRequestResponseItem.optional(),
+  oneTimePersonaData: PersonaDataRequestResponseItem.optional(),
   ongoingPersonaData: PersonaDataRequestResponseItem.optional(),
 })
 

diff --git a/lib/IO/v2/create-wallet-interaction-factory.ts b/lib/IO/v2/create-wallet-interaction-factory.ts