Skip to content

Commit 32a85c7

Browse files
committed
update
1 parent 112adcb commit 32a85c7

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

CustomAuthDemo/CustomAuthDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CustomAuthDemo/CustomAuthDemo/ContentView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ struct ContentView: View {
160160
})
161161

162162
Button(action: {
163-
let subVerifierDetailsArray = SingleLoginParams(typeOfLogin: .email_passwordless, verifier: "w3a-a0-email-passwordless", clientId: "QiEf8qZ9IoasbZsbHvjKZku4LdnRC1Ct", redirectURL: "https://scripts.toruswallet.io/redirect.html", jwtParams: Auth0ClientOptions(domain: "web3auth.au.auth0.com", verifierIdField: "email"))
163+
let subVerifierDetailsArray = SingleLoginParams(typeOfLogin: .email_passwordless, verifier: "w3a-a0-email-passwordless", clientId: "QiEf8qZ9IoasbZsbHvjKZku4LdnRC1Ct", redirectURL: "https://scripts.toruswallet.io/redirect.html", jwtParams: OAuthClientOptions(domain: "web3auth.au.auth0.com", verifierIdField: "email"))
164164
let aggregateLoginParams = AggregateLoginParams(aggregateVerifierType: AggregateVerifierType.single_id_verifier, verifierIdentifier: "aggregate-sapphire", subVerifierDetailsArray: [subVerifierDetailsArray])
165165

166166
let customAuthArgs = CustomAuthArgs(urlScheme: "tdsdk://tdsdk/oauthCallback", network: .sapphire(.SAPPHIRE_MAINNET), enableOneKey: true, web3AuthClientId: "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ")

Sources/CustomAuth/Common/LoginParams/Auth0ClientOptions.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,5 @@ public class Auth0ClientOptions: BaseLoginOptions {
5959
try container.encodeIfPresent(self.login_hint, forKey: .login_hint)
6060
}
6161
}
62+
63+
public typealias OAuthClientOptions = Auth0ClientOptions

Sources/CustomAuth/CustomAuth.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public class CustomAuth {
127127
let loginParams = loginParamsArray[i]
128128
let userInfo = userInfoArray[i]
129129

130-
aggregateVerifierParams.append(VerifyParams(verifier_id: userInfo.verifierId, idtoken: loginParams.idToken!))
130+
aggregateVerifierParams.append(VerifyParams(verifier_id: userInfo.verifierId, idtoken: loginParams.idToken ?? loginParams.accessToken!))
131131
aggregateIdTokenSeeds.append(loginParams.idToken ?? loginParams.accessToken!)
132132
subVerifierIds.append(userInfo.verifier)
133133
aggregateVerifierId = userInfo.verifierId
@@ -137,7 +137,7 @@ public class CustomAuth {
137137
let aggregateIdToken = try keccak256(data: joined)
138138
let aggregateParams: VerifierParams = VerifierParams(verifier_id: aggregateVerifierId, extended_verifier_id: nil, sub_verifier_ids: subVerifierIds, verify_params: aggregateVerifierParams)
139139

140-
let aggregateTorusKey = try await getTorusKey(verifier: aggregateVerifierId, verifierParams: aggregateParams, idToken: String(data: aggregateIdToken, encoding: .utf8)!)
140+
let aggregateTorusKey = try await getTorusKey(verifier: aggregateVerifierId, verifierParams: aggregateParams, idToken: aggregateIdToken.hexString)
141141

142142
var aggregateVerifierResponses: [TorusAggregateVerifierResponse] = []
143143
for i in 0 ..< userInfoArray.count {

0 commit comments

Comments
 (0)