fix: support for login request without challenge

radixdlt · Jan 18, 2023 · 63890b3 · 63890b3
1 parent f65c6db
commit 63890b3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 17 deletions.
diff --git a/examples/index.ts b/examples/index.ts
@@ -81,7 +81,7 @@ document.getElementById('account-address-btn')!.onclick = async () => {
 document.getElementById('persona-data-btn')!.onclick = async () => {
   clearResults()
 
-  const result = await sdk.request(requestBuilder(login()))
+  const result = await sdk.request(requestBuilder(login.withoutChallenge()))
 
   displayResults(result)
 }
@@ -100,7 +100,7 @@ document.getElementById('send-tx-btn')!.onclick = async () => {
 sdk
   .request(
     requestBuilder(
-      requestItem.login(),
+      requestItem.login.withoutChallenge(),
       requestItem.ongoingAccounts.withoutProofOfOwnership()
     )
   )

diff --git a/lib/IO/request-items/login.ts b/lib/IO/request-items/login.ts
@@ -34,13 +34,22 @@ export type Login = {
 }
 
 type NotAllowedKeys = Partial<{
-  usePersona: any
-  login: any
+  persona: any
+  loginWithoutChallenge: any
+  loginWithChallenge: any
 }>
 
-export const login =
-  (challenge?: string) =>
-  <I>(input: I extends NotAllowedKeys ? never : I) => ({
-    ...input,
-    login: { challenge },
-  })
+export const login = {
+  withoutChallenge:
+    () =>
+    <I>(input: I extends NotAllowedKeys ? never : I) => ({
+      ...input,
+      loginWithoutChallenge: {},
+    }),
+  withChallenge:
+    (challenge: string) =>
+    <I>(input: I extends NotAllowedKeys ? never : I) => ({
+      ...input,
+      loginWithChallenge: { challenge },
+    }),
+}
diff --git a/lib/IO/request-items/ongoing-accounts.ts b/lib/IO/request-items/ongoing-accounts.ts
@@ -28,7 +28,10 @@ export type OngoingAccounts = {
   }
 }
 
-type RequiredKeys = { usePersona: any } | { login: any }
+type RequiredKeys =
+  | { usePersona: any }
+  | { loginWithoutChallenge: any }
+  | { loginWithChallenge: any }
 
 type NotAllowedKeys = Partial<{
   ongoingAccounts: any

diff --git a/lib/IO/transform-method-input.ts b/lib/IO/transform-method-input.ts
@@ -20,7 +20,14 @@ const requestTypeMapper = new Map<string, string>()
     requestMethodRequestType.ongoingAccountsWithoutProofOfOwnership,
     RequestTypeSchema.ongoingAccountsRead.value
   )
-  .set(requestMethodRequestType.login, RequestTypeSchema.loginRead.value)
+  .set(
+    requestMethodRequestType.loginWithChallenge,
+    RequestTypeSchema.loginRead.value
+  )
+  .set(
+    requestMethodRequestType.loginWithoutChallenge,
+    RequestTypeSchema.loginRead.value
+  )
   .set(
     requestMethodRequestType.usePersona,
     RequestTypeSchema.usePersonaRead.value

diff --git a/lib/__tests__/transform-method-input.spec.ts b/lib/__tests__/transform-method-input.spec.ts
@@ -91,14 +91,14 @@ describe('transformMethodInput', () => {
     it('should return correct transformed value', () => {
       ;[
         {
-          actual: requestItem.login('abc'),
+          actual: requestItem.login.withChallenge('abc'),
           expected: {
             requestType: RequestTypeSchema.loginRead.value,
             challenge: 'abc',
           },
         },
         {
-          actual: requestItem.login(),
+          actual: requestItem.login.withoutChallenge(),
           expected: {
             requestType: RequestTypeSchema.loginRead.value,
           },

diff --git a/lib/methods/request.ts b/lib/methods/request.ts
@@ -10,8 +10,8 @@ export const requestMethodRequestType = {
     'ongoingAccountsWithoutProofOfOwnership',
   ongoingAccountsWithProofOfOwnership: 'ongoingAccountsWithProofOfOwnership',
   usePersona: 'usePersona',
-  login: 'login',
-  // loginWithChallenge: 'loginWithChallenge',
+  loginWithoutChallenge: 'loginWithoutChallenge',
+  loginWithChallenge: 'loginWithChallenge',
   oneTimePersonaData: 'oneTimePersonaData',
   ongoingPersonaData: 'ongoingPersonaData',
 } as const
@@ -22,7 +22,7 @@ type RequestItems = {
   [requestMethodRequestType.ongoingAccountsWithoutProofOfOwnership]: OngoingAccounts['WithoutProofOfOwnership']
   // [requestMethodRequestType.ongoingAccountsWithProofOfOwnership]: OngoingAccounts['WithProofOfOwnership']
   // [requestMethodRequestType.usePersona]: UsePersona
-  [requestMethodRequestType.login]: Login['WithoutChallenge']
+  [requestMethodRequestType.loginWithoutChallenge]: Login['WithoutChallenge']
   // [requestMethodRequestType.loginWithChallenge]: Login['WithChallenge']
   // [requestMethodRequestType.oneTimePersonaData]: OneTimePersonaData
   // [requestMethodRequestType.ongoingPersonaData]: OngoingPersonaData