Skip to content

Commit 2376da1

Browse files
refactor: use the same protocol for account services
1 parent 1028c7b commit 2376da1

File tree

5 files changed

+20
-45
lines changed

5 files changed

+20
-45
lines changed

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AccountService+Apple.swift

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@
99
import FirebaseAuthSwiftUI
1010
import Observation
1111

12-
protocol AppleOperationReauthentication: ProviderOperationReauthentication {
13-
var appleProvider: AppleProviderSwift { get }
14-
}
15-
16-
extension AppleOperationReauthentication {
17-
var authProvider: AuthProviderSwift { appleProvider }
18-
}
19-
2012
@MainActor
2113
class AppleDeleteUserOperation: AuthenticatedOperation,
22-
@preconcurrency AppleOperationReauthentication {
14+
@preconcurrency ProviderOperationReauthentication {
2315
let appleProvider: AppleProviderSwift
16+
17+
var authProvider: AuthProviderSwift { appleProvider }
18+
2419
init(appleProvider: AppleProviderSwift) {
2520
self.appleProvider = appleProvider
2621
}

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/AccountService+Facebook.swift

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,13 @@
2323
import FirebaseAuthSwiftUI
2424
import Observation
2525

26-
protocol FacebookOperationReauthentication: ProviderOperationReauthentication {
27-
var facebookProvider: FacebookProviderSwift { get }
28-
}
29-
30-
extension FacebookOperationReauthentication {
31-
var authProvider: AuthProviderSwift { facebookProvider }
32-
}
33-
3426
@MainActor
3527
class FacebookDeleteUserOperation: AuthenticatedOperation,
36-
@preconcurrency FacebookOperationReauthentication {
28+
@preconcurrency ProviderOperationReauthentication {
3729
let facebookProvider: FacebookProviderSwift
30+
31+
var authProvider: AuthProviderSwift { facebookProvider }
32+
3833
init(facebookProvider: FacebookProviderSwift) {
3934
self.facebookProvider = facebookProvider
4035
}

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AccountService+Google.swift

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,13 @@
3030
import FirebaseAuthSwiftUI
3131
import Observation
3232

33-
protocol GoogleOperationReauthentication: ProviderOperationReauthentication {
34-
var googleProvider: GoogleProviderSwift { get }
35-
}
36-
37-
extension GoogleOperationReauthentication {
38-
var authProvider: AuthProviderSwift { googleProvider }
39-
}
40-
4133
@MainActor
4234
class GoogleDeleteUserOperation: AuthenticatedOperation,
43-
@preconcurrency GoogleOperationReauthentication {
35+
@preconcurrency ProviderOperationReauthentication {
4436
let googleProvider: GoogleProviderSwift
37+
38+
var authProvider: AuthProviderSwift { googleProvider }
39+
4540
init(googleProvider: GoogleProviderSwift) {
4641
self.googleProvider = googleProvider
4742
}

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/AccountService+OAuth.swift

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@
99
import FirebaseAuthSwiftUI
1010
import Observation
1111

12-
protocol OAuthOperationReauthentication: ProviderOperationReauthentication {
13-
var oauthProvider: OAuthProviderSwift { get }
14-
}
15-
16-
extension OAuthOperationReauthentication {
17-
var authProvider: AuthProviderSwift { oauthProvider }
18-
}
19-
2012
@MainActor
2113
class OAuthDeleteUserOperation: AuthenticatedOperation,
22-
@preconcurrency OAuthOperationReauthentication {
14+
@preconcurrency ProviderOperationReauthentication {
2315
let oauthProvider: OAuthProviderSwift
16+
17+
var authProvider: AuthProviderSwift { oauthProvider }
18+
2419
init(oauthProvider: OAuthProviderSwift) {
2520
self.oauthProvider = oauthProvider
2621
}

FirebaseSwiftUI/FirebaseTwitterSwiftUI/Sources/Services/AccountService+Twitter.swift

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@
99
import FirebaseAuthSwiftUI
1010
import Observation
1111

12-
protocol TwitterOperationReauthentication: ProviderOperationReauthentication {
13-
var twitterProvider: TwitterProviderSwift { get }
14-
}
15-
16-
extension TwitterOperationReauthentication {
17-
var authProvider: AuthProviderSwift { twitterProvider }
18-
}
19-
2012
@MainActor
2113
class TwitterDeleteUserOperation: AuthenticatedOperation,
22-
@preconcurrency TwitterOperationReauthentication {
14+
@preconcurrency ProviderOperationReauthentication {
2315
let twitterProvider: TwitterProviderSwift
16+
17+
var authProvider: AuthProviderSwift { twitterProvider }
18+
2419
init(twitterProvider: TwitterProviderSwift) {
2520
self.twitterProvider = twitterProvider
2621
}

0 commit comments

Comments
 (0)