Skip to content

Commit 2ff7565

Browse files
fix build issues
1 parent 5fcbe85 commit 2ff7565

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

Auth0.xcodeproj/project.pbxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@
155155
5C505FAE2E216677005D0757 /* DPoPError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C505FAB2E216672005D0757 /* DPoPError.swift */; };
156156
5C505FAF2E216677005D0757 /* DPoPError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C505FAB2E216672005D0757 /* DPoPError.swift */; };
157157
5C505FB02E216677005D0757 /* DPoPError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C505FAB2E216672005D0757 /* DPoPError.swift */; };
158+
AA000001000000000000AAA1 /* DPoPCredentialValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA000001000000000000AAA0 /* DPoPCredentialValidator.swift */; };
159+
AA000001000000000000AAA2 /* DPoPCredentialValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA000001000000000000AAA0 /* DPoPCredentialValidator.swift */; };
160+
AA000001000000000000AAA3 /* DPoPCredentialValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA000001000000000000AAA0 /* DPoPCredentialValidator.swift */; };
161+
AA000001000000000000AAA4 /* DPoPCredentialValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA000001000000000000AAA0 /* DPoPCredentialValidator.swift */; };
162+
AA000001000000000000AAA5 /* DPoPCredentialValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA000001000000000000AAA0 /* DPoPCredentialValidator.swift */; };
158163
5C505FB22E21669F005D0757 /* SenderConstraining.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C505FB12E216699005D0757 /* SenderConstraining.swift */; };
159164
5C505FB32E21669F005D0757 /* SenderConstraining.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C505FB12E216699005D0757 /* SenderConstraining.swift */; };
160165
5C505FB42E21669F005D0757 /* SenderConstraining.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C505FB12E216699005D0757 /* SenderConstraining.swift */; };
@@ -960,6 +965,7 @@
960965
5C4F553423C9124200C89615 /* JWKSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JWKSpec.swift; sourceTree = "<group>"; };
961966
5C4F553923C9125600C89615 /* JWTAlgorithmSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JWTAlgorithmSpec.swift; sourceTree = "<group>"; };
962967
5C505FAB2E216672005D0757 /* DPoPError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DPoPError.swift; sourceTree = "<group>"; };
968+
AA000001000000000000AAA0 /* DPoPCredentialValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DPoPCredentialValidator.swift; sourceTree = "<group>"; };
963969
5C505FB12E216699005D0757 /* SenderConstraining.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SenderConstraining.swift; sourceTree = "<group>"; };
964970
5C505FB72E2166FB005D0757 /* DPoPProofGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DPoPProofGenerator.swift; sourceTree = "<group>"; };
965971
5C505FBD2E216746005D0757 /* DPoPChallenge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DPoPChallenge.swift; sourceTree = "<group>"; };
@@ -1380,6 +1386,7 @@
13801386
children = (
13811387
5C79AE072E040CA600CD0D41 /* DPoP.swift */,
13821388
5C505FAB2E216672005D0757 /* DPoPError.swift */,
1389+
AA000001000000000000AAA0 /* DPoPCredentialValidator.swift */,
13831390
5C505FB12E216699005D0757 /* SenderConstraining.swift */,
13841391
5C505FC32E216783005D0757 /* ECPublicKey.swift */,
13851392
5C505FB72E2166FB005D0757 /* DPoPProofGenerator.swift */,
@@ -2535,6 +2542,7 @@
25352542
5CDF67392DD3A8D600A9B513 /* Auth0APIError.swift in Sources */,
25362543
5C0AF09D2833420200162044 /* WebAuthentication.swift in Sources */,
25372544
5C505FB02E216677005D0757 /* DPoPError.swift in Sources */,
2545+
AA000001000000000000AAA1 /* DPoPCredentialValidator.swift in Sources */,
25382546
5CB41D4823D0BA2C00074024 /* IDTokenValidator.swift in Sources */,
25392547
D499DB1A2E6EB1FD000E7E2F /* PasskeyEnrollmentChallenge.swift in Sources */,
25402548
D499DB1B2E6EB1FD000E7E2F /* PhoneEnrollmentChallenge.swift in Sources */,
@@ -2718,6 +2726,7 @@
27182726
5C505FB32E21669F005D0757 /* SenderConstraining.swift in Sources */,
27192727
5C505FBE2E21674A005D0757 /* DPoPChallenge.swift in Sources */,
27202728
5C505FAF2E216677005D0757 /* DPoPError.swift in Sources */,
2729+
AA000001000000000000AAA2 /* DPoPCredentialValidator.swift in Sources */,
27212730
5F74CB411CEFD5E600226823 /* JSONObjectPayload.swift in Sources */,
27222731
5C41F6CB244F96E300252548 /* BioAuthentication.swift in Sources */,
27232732
V17KI34D4PWP799FLD81GPVP /* BiometricPolicy.swift in Sources */,
@@ -2956,6 +2965,7 @@
29562965
5C6513AA2791CDDE004EBC22 /* Version.swift in Sources */,
29572966
5C505FD32E21688E005D0757 /* SecureEnclaveKeyStore.swift in Sources */,
29582967
5C505FAD2E216677005D0757 /* DPoPError.swift in Sources */,
2968+
AA000001000000000000AAA3 /* DPoPCredentialValidator.swift in Sources */,
29592969
5B1748761EF2D3A70060E653 /* Shared.swift in Sources */,
29602970
5C80980E275A7B8600DC0A76 /* CredentialsStorage.swift in Sources */,
29612971
F11977F4EFCC4656965E3131 /* JWK+RSA.swift in Sources */,
@@ -3045,6 +3055,7 @@
30453055
5C6513A92791CDDE004EBC22 /* Version.swift in Sources */,
30463056
5C505FD22E21688E005D0757 /* SecureEnclaveKeyStore.swift in Sources */,
30473057
5C505FAC2E216677005D0757 /* DPoPError.swift in Sources */,
3058+
AA000001000000000000AAA4 /* DPoPCredentialValidator.swift in Sources */,
30483059
5B1748771EF2D3A90060E653 /* Shared.swift in Sources */,
30493060
5C80980D275A7B8600DC0A76 /* CredentialsStorage.swift in Sources */,
30503061
8D1D6205C538412A9B9A21C7 /* JWK+RSA.swift in Sources */,
@@ -3157,6 +3168,7 @@
31573168
C1B3B9FD2C24B6D4004A32A4 /* BioAuthentication.swift in Sources */,
31583169
2Z7FPPVSUUJRZC06V5RA8B2B /* BiometricPolicy.swift in Sources */,
31593170
5C505FAE2E216677005D0757 /* DPoPError.swift in Sources */,
3171+
AA000001000000000000AAA5 /* DPoPCredentialValidator.swift in Sources */,
31603172
C1B3B9FE2C24B6D4004A32A4 /* CredentialsManager.swift in Sources */,
31613173
C1B3B9FF2C24B6D4004A32A4 /* CredentialsStorage.swift in Sources */,
31623174
C1B3BA002C24B6D4004A32A4 /* CredentialsManagerError.swift in Sources */,

Auth0/DPoP/DPoPCredentialValidator.swift

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@ struct DPoPCredentialValidator: Sendable {
4040

4141
let hasKeyPair = try? dpop.hasKeypair()
4242
guard hasKeyPair == true else {
43-
try? storage.deleteEntry(forKey: credentialsKey)
44-
try? storage.deleteEntry(forKey: thumbprintKey)
43+
try clearAll()
4544
throw CredentialsManagerError.dpopKeyMissing
4645
}
4746

4847
let currentThumbprint = try dpop.jkt()
4948
if let stored = storedThumbprint {
5049
guard stored == currentThumbprint else {
51-
try? storage.deleteEntry(forKey: credentialsKey)
52-
try? storage.deleteEntry(forKey: thumbprintKey)
50+
try clearAll()
5351
throw CredentialsManagerError.dpopKeyMismatch
5452
}
5553
} else {
@@ -78,6 +76,11 @@ struct DPoPCredentialValidator: Sendable {
7876

7977
// MARK: - Private
8078

79+
private func clearAll() throws {
80+
try storage.deleteEntry(forKey: credentialsKey)
81+
try? storage.deleteEntry(forKey: thumbprintKey)
82+
}
83+
8184
private func storedThumbprintValue() -> String? {
8285
let data = try? storage.getEntry(forKey: thumbprintKey)
8386
return data.flatMap { String(data: $0, encoding: .utf8) }

0 commit comments

Comments
 (0)