Skip to content

Commit 76db72d

Browse files
amircheikhamircheikh
committed
Merge pull-request #958 
2 parents 524fabd + 5a96fe8 commit 76db72d

File tree

28 files changed

+1205
-9
lines changed

28 files changed

+1205
-9
lines changed

‎.changeset/plenty-waves-check.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@turnkey/sdk-browser": patch
3+
"@turnkey/sdk-server": patch
4+
"@turnkey/sdk-types": patch
5+
"@turnkey/core": patch
6+
"@turnkey/http": patch
7+
---
8+
9+
- Synced api with mono

‎.changeset/polite-candles-lick.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@turnkey/react-wallet-kit": patch
3+
---
4+
5+
- otpLength and alphanumeric settings now properly apply from dashboard

‎packages/core/src/__generated__/sdk-client-base.ts‎

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/core/src/__inputs__/auth_proxy.swagger.json‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,12 @@
490490
"type": "string",
491491
"description": "OAuth redirect URL to be used for social login flows.",
492492
"title": "OAuth Redirect URL"
493+
},
494+
"otpAlphanumeric": {
495+
"type": "boolean"
496+
},
497+
"otpLength": {
498+
"type": "string"
493499
}
494500
},
495501
"required": [
@@ -582,6 +588,10 @@
582588
"invalidateExisting": {
583589
"type": "boolean",
584590
"description": "Invalidate all other previously generated Login API keys"
591+
},
592+
"organizationId": {
593+
"type": "string",
594+
"description": "Unique identifier for a given Organization. If provided, this organization id will be used directly. If omitted, uses the OIDC token to look up the associated organization id."
585595
}
586596
},
587597
"required": ["oidcToken", "publicKey"]
@@ -628,6 +638,14 @@
628638
"invalidateExisting": {
629639
"type": "boolean",
630640
"description": "Invalidate all other previously generated Login API keys"
641+
},
642+
"organizationId": {
643+
"type": "string",
644+
"description": "Unique identifier for a given Organization. If provided, this organization id will be used directly. If omitted, uses the verification token to look up the verified sub-organization based on the contact and verification type."
645+
},
646+
"clientSignature": {
647+
"type": "string",
648+
"description": "Optional signature associated with the public key passed into the verification step. This must be a hex-encoded ECDSA signature over the verification token. Only required if a public key was provided during the verification step."
631649
}
632650
},
633651
"required": ["verificationToken", "publicKey"]
@@ -703,9 +721,19 @@
703721
"properties": {
704722
"organizationId": {
705723
"type": "string"
724+
},
725+
"wallet": {
726+
"$ref": "#/definitions/v1WalletResult",
727+
"description": "Wallet created for the sub-organization, if provided in the request",
728+
"title": "Wallet"
729+
},
730+
"userId": {
731+
"type": "string",
732+
"description": "Root user ID created for this sub-organization",
733+
"title": "User ID"
706734
}
707735
},
708-
"required": ["organizationId"]
736+
"required": ["organizationId", "userId"]
709737
},
710738
"v1VerifyOtpRequest": {
711739
"type": "object",
@@ -717,6 +745,10 @@
717745
"otpCode": {
718746
"type": "string",
719747
"description": "OTP sent out to a user's contact (email or SMS)"
748+
},
749+
"publicKey": {
750+
"type": "string",
751+
"description": "Client-side public key generated by the user, which will be added to the JWT response and verified in subsequent requests via a client proof signature"
720752
}
721753
},
722754
"required": ["otpId", "otpCode"]
@@ -775,6 +807,22 @@
775807
}
776808
},
777809
"required": ["walletName", "accounts"]
810+
},
811+
"v1WalletResult": {
812+
"type": "object",
813+
"properties": {
814+
"walletId": {
815+
"type": "string"
816+
},
817+
"addresses": {
818+
"type": "array",
819+
"items": {
820+
"type": "string"
821+
},
822+
"description": "A list of account addresses."
823+
}
824+
},
825+
"required": ["walletId", "addresses"]
778826
}
779827
}
780828
}

‎packages/core/src/__inputs__/public_api.swagger.json‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,38 @@
708708
"tags": ["Activities"]
709709
}
710710
},
711+
"/public/v1/query/list_app_proofs": {
712+
"post": {
713+
"summary": "List app proofs for an activity",
714+
"description": "List the app proofs for the given activity.",
715+
"operationId": "PublicApiService_GetAppProofs",
716+
"responses": {
717+
"200": {
718+
"description": "A successful response.",
719+
"schema": {
720+
"$ref": "#/definitions/v1GetAppProofsResponse"
721+
}
722+
},
723+
"default": {
724+
"description": "An unexpected error response.",
725+
"schema": {
726+
"$ref": "#/definitions/rpcStatus"
727+
}
728+
}
729+
},
730+
"parameters": [
731+
{
732+
"name": "body",
733+
"in": "body",
734+
"required": true,
735+
"schema": {
736+
"$ref": "#/definitions/v1GetAppProofsRequest"
737+
}
738+
}
739+
],
740+
"tags": ["App Proof"]
741+
}
742+
},
711743
"/public/v1/query/list_oauth2_credentials": {
712744
"post": {
713745
"summary": "List OAuth 2.0 Credentials",
@@ -3709,6 +3741,14 @@
37093741
},
37103742
"description": "A list of objects representing a particular User's approval or rejection of a Consensus request, including all relevant metadata."
37113743
},
3744+
"appProofs": {
3745+
"type": "array",
3746+
"items": {
3747+
"type": "object",
3748+
"$ref": "#/definitions/v1AppProof"
3749+
},
3750+
"description": "A list of app proofs generated by enclaves during activity execution, providing verifiable attestations of performed operations."
3751+
},
37123752
"fingerprint": {
37133753
"type": "string",
37143754
"description": "An artifact verifying a User's action."
@@ -4007,6 +4047,28 @@
40074047
},
40084048
"required": ["userName", "userTags", "apiKeys"]
40094049
},
4050+
"v1AppProof": {
4051+
"type": "object",
4052+
"properties": {
4053+
"scheme": {
4054+
"$ref": "#/definitions/v1SignatureScheme",
4055+
"description": "Scheme of signing key."
4056+
},
4057+
"publicKey": {
4058+
"type": "string",
4059+
"description": "Ephemeral public key."
4060+
},
4061+
"proofPayload": {
4062+
"type": "string",
4063+
"description": "JSON serialized AppProofPayload."
4064+
},
4065+
"signature": {
4066+
"type": "string",
4067+
"description": "Signature over hashed proof_payload."
4068+
}
4069+
},
4070+
"required": ["scheme", "publicKey", "proofPayload", "signature"]
4071+
},
40104072
"v1ApproveActivityIntent": {
40114073
"type": "object",
40124074
"properties": {
@@ -7023,6 +7085,33 @@
70237085
},
70247086
"required": ["apiKeys"]
70257087
},
7088+
"v1GetAppProofsRequest": {
7089+
"type": "object",
7090+
"properties": {
7091+
"organizationId": {
7092+
"type": "string",
7093+
"description": "Unique identifier for a given Organization."
7094+
},
7095+
"activityId": {
7096+
"type": "string",
7097+
"description": "Unique identifier for a given activity."
7098+
}
7099+
},
7100+
"required": ["organizationId", "activityId"]
7101+
},
7102+
"v1GetAppProofsResponse": {
7103+
"type": "object",
7104+
"properties": {
7105+
"appProofs": {
7106+
"type": "array",
7107+
"items": {
7108+
"type": "object",
7109+
"$ref": "#/definitions/v1AppProof"
7110+
}
7111+
}
7112+
},
7113+
"required": ["appProofs"]
7114+
},
70267115
"v1GetAttestationDocumentRequest": {
70277116
"type": "object",
70287117
"properties": {
@@ -9189,6 +9278,10 @@
91899278
"invalidateExisting": {
91909279
"type": "boolean",
91919280
"description": "Invalidate all other previously generated Login API keys"
9281+
},
9282+
"clientSignature": {
9283+
"type": "string",
9284+
"description": "Optional signature associated with the public key passed into the verification step. This must be a hex-encoded ECDSA signature over the verification token. Only required if a public key was provided during the verification step."
91929285
}
91939286
},
91949287
"required": ["verificationToken", "publicKey"]
@@ -10267,6 +10360,10 @@
1026710360
},
1026810361
"required": ["signedTransaction"]
1026910362
},
10363+
"v1SignatureScheme": {
10364+
"type": "string",
10365+
"enum": ["SIGNATURE_SCHEME_EPHEMERAL_KEY_P256"]
10366+
},
1027010367
"v1SimpleClientExtensionResults": {
1027110368
"type": "object",
1027210369
"properties": {
@@ -11328,6 +11425,10 @@
1132811425
"expirationSeconds": {
1132911426
"type": "string",
1133011427
"description": "Expiration window (in seconds) indicating how long the verification token is valid for. If not provided, a default of 1 hour will be used. Maximum value is 86400 seconds (24 hours)"
11428+
},
11429+
"publicKey": {
11430+
"type": "string",
11431+
"description": "Client-side public key generated by the user, which will be added to the JWT response and verified in subsequent requests via a client proof signature"
1133111432
}
1133211433
},
1133311434
"required": ["otpId", "otpCode"]

0 commit comments

Comments
 (0)