Skip to content

Commit

Permalink
Merge pull request #183 from alexookah/next
Browse files Browse the repository at this point in the history 
Resolve deprecated iOS functions, lint fixes
  • Loading branch information
@baumblatt
baumblatt authored Aug 13, 2021
2 parents 7a62d88 + 048fec8 commit ec6d4d0
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 35 deletions.
8 changes: 4 additions & 4 deletions ios/Plugin/Handlers/AppleProviderHandler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class AppleProviderHandler: NSObject, ProviderHandler {

func signOut() {
// there is nothing to do here
print("AppleProviderHandler.signOut called.");
print("AppleProviderHandler.signOut called.")
}

func fillResult(credential: AuthCredential?, data: PluginResultData) -> PluginResultData {
var jsResult: PluginResultData = [:]
func fillResult(credential: AuthCredential?, data: PluginCallResultData) -> PluginCallResultData {
var jsResult: PluginCallResultData = [:]

data.forEach { (key, value) in
jsResult[key] = value
Expand Down Expand Up @@ -93,7 +93,7 @@ extension AppleProviderHandler: ASAuthorizationControllerDelegate, ASAuthorizati
let credential = OAuthProvider.credential(withProviderID: "apple.com", idToken: idTokenString, rawNonce: nonce)

// Sign in with Firebase.
self.plugin?.handleAuthCredentials(credential: credential);
self.plugin?.handleAuthCredentials(credential: credential)
}
}

Expand Down
4 changes: 2 additions & 2 deletions ios/Plugin/Handlers/FacebookProviderHandler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ class FacebookProviderHandler: NSObject, ProviderHandler {
return AccessToken.current != nil
}

func fillResult(credential: AuthCredential?, data: PluginResultData) -> PluginResultData {
func fillResult(credential: AuthCredential?, data: PluginCallResultData) -> PluginCallResultData {
guard let accessToken = AccessToken.current else {
return data
}

var jsResult: PluginResultData = [:]
var jsResult: PluginCallResultData = [:]
data.forEach { (key, value) in
jsResult[key] = value
}
Expand Down
10 changes: 5 additions & 5 deletions ios/Plugin/Handlers/GoogleProviderHandler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class GoogleProviderHandler: NSObject, ProviderHandler, GIDSignInDelegate {
let permissions = self.plugin?.getConfigValue("permissions") as? [String:Any] ?? [:]

if let scopes = permissions["google"] as? [String] {
GIDSignIn.sharedInstance().scopes = scopes;
GIDSignIn.sharedInstance().scopes = scopes
}

let propertiesMap = self.plugin?.getConfigValue("properties") as? [String:Any] ?? [:]
Expand Down Expand Up @@ -62,27 +62,27 @@ class GoogleProviderHandler: NSObject, ProviderHandler, GIDSignInDelegate {
}

let credential = GoogleAuthProvider.credential(withIDToken: authentication.idToken, accessToken: authentication.accessToken)
self.plugin?.handleAuthCredentials(credential: credential);
self.plugin?.handleAuthCredentials(credential: credential)
}

func sign(_ signIn: GIDSignIn!, didDisconnectWith user: GIDGoogleUser!, withError error: Error!) {
self.signOut()
}

func signIn(call: CAPPluginCall) {
GIDSignIn.sharedInstance()?.signIn();
GIDSignIn.sharedInstance()?.signIn()
}

func isAuthenticated() -> Bool {
return GIDSignIn.sharedInstance()?.currentUser != nil
}

func fillResult(credential: AuthCredential?, data: PluginResultData) -> PluginResultData {
func fillResult(credential: AuthCredential?, data: PluginCallResultData) -> PluginCallResultData {
guard let currentUser = GIDSignIn.sharedInstance()?.currentUser else {
return data
}

var jsResult: PluginResultData = [:]
var jsResult: PluginCallResultData = [:]
data.forEach { (key, value) in
jsResult[key] = value
}
Expand Down
20 changes: 11 additions & 9 deletions ios/Plugin/Handlers/PhoneNumberProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import FirebaseAuth

class PhoneNumberProviderHandler: NSObject, ProviderHandler {


var plugin: CapacitorFirebaseAuth? = nil
var mPhoneNumber: String? = nil
var mVerificationId: String? = nil
Expand Down Expand Up @@ -59,12 +58,16 @@ class PhoneNumberProviderHandler: NSObject, ProviderHandler {
// notify event On Cond Sent.
self.plugin?.notifyListeners("cfaSignInPhoneOnCodeSent", data: ["verificationId" : verificationID ])

// return success call.
call.success([
"callbackId": call.callbackId,
"verificationId":verificationID
]);
guard let callbackId = call.callbackId else {
call.reject("There is no callbackId after .verifyPhoneNumber!")
return
}

// return success call.
call.resolve([
"callbackId": callbackId,
"verificationId": verificationID
])
}
}

Expand All @@ -76,9 +79,9 @@ class PhoneNumberProviderHandler: NSObject, ProviderHandler {
return false
}

func fillResult(credential: AuthCredential?, data: PluginResultData) -> PluginResultData {
func fillResult(credential: AuthCredential?, data: PluginCallResultData) -> PluginCallResultData {

var jsResult: PluginResultData = [:]
var jsResult: PluginCallResultData = [:]
data.forEach { (key, value) in
jsResult[key] = value
}
Expand All @@ -88,6 +91,5 @@ class PhoneNumberProviderHandler: NSObject, ProviderHandler {
jsResult["verificationCode"] = self.mVerificationCode

return jsResult

}
}
2 changes: 1 addition & 1 deletion ios/Plugin/Handlers/ProviderHandler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ protocol ProviderHandler {
func signIn(call: CAPPluginCall) -> Void
func signOut() throws -> Void
func isAuthenticated() -> Bool
func fillResult(credential: AuthCredential?, data: PluginResultData) -> PluginResultData
func fillResult(credential: AuthCredential?, data: PluginCallResultData) -> PluginCallResultData
}
8 changes: 4 additions & 4 deletions ios/Plugin/Handlers/TwitterProviderHandler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class TwitterProviderHandler: NSObject, ProviderHandler {
self.plugin!.handleError(message: "A failure occurs in Twitter sign in.")
return
}
self.plugin?.handleAuthCredentials(credential: (authResult?.credential!)!);
self.plugin?.handleAuthCredentials(credential: (authResult?.credential!)!)
}

}
Expand All @@ -44,8 +44,8 @@ class TwitterProviderHandler: NSObject, ProviderHandler {
return false
}

func fillResult(credential: AuthCredential?, data: PluginResultData) -> PluginResultData {
var jsResult: PluginResultData = [:]
func fillResult(credential: AuthCredential?, data: PluginCallResultData) -> PluginCallResultData {
var jsResult: PluginCallResultData = [:]

data.forEach { (key, value) in
jsResult[key] = value
Expand All @@ -61,6 +61,6 @@ class TwitterProviderHandler: NSObject, ProviderHandler {

func signOut() {
// there is nothing to do here
print("TwitterProviderHandler.signOut called.");
print("TwitterProviderHandler.signOut called.")
}
}
20 changes: 10 additions & 10 deletions ios/Plugin/Plugin.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ typealias ProvidersMap = [String:ProviderHandler]
@objc(CapacitorFirebaseAuth)
public class CapacitorFirebaseAuth: CAPPlugin {

var providersNames: [String] = [];
var providersNames: [String] = []
var languageCode: String = "en"
var nativeAuth: Bool = false

Expand All @@ -29,7 +29,7 @@ public class CapacitorFirebaseAuth: CAPPlugin {

if (FirebaseApp.app() == nil) {
FirebaseApp.configure()
Auth.auth().languageCode = self.languageCode;
Auth.auth().languageCode = self.languageCode
}

for provider in self.providersNames {
Expand Down Expand Up @@ -64,11 +64,11 @@ public class CapacitorFirebaseAuth: CAPPlugin {
}

self.callbackId = callbackId
call.save()
call.keepAlive = true

DispatchQueue.main.async {
if (theProvider.isAuthenticated()) {
self.buildResult(credential: nil);
self.buildResult(credential: nil)
return
}

Expand Down Expand Up @@ -117,12 +117,12 @@ public class CapacitorFirebaseAuth: CAPPlugin {
return
}

guard self.bridge?.getSavedCall(callbackId) != nil else {
guard self.bridge?.savedCall(withID: callbackId) != nil else {
print("Ops, there is no saved call building result")
return
}

self.buildResult(credential: credential);
self.buildResult(credential: credential)
}
}

Expand All @@ -132,12 +132,12 @@ public class CapacitorFirebaseAuth: CAPPlugin {
return
}

guard let call = self.bridge?.getSavedCall(callbackId) else {
guard let call = self.bridge?.savedCall(withID: callbackId) else {
print("Ops, there is no saved call building result")
return
}

let jsResult: PluginResultData = [
let jsResult: PluginCallResultData = [
"callbackId": callbackId,
"providerId": call.getString("providerId") ?? "",
]
Expand All @@ -146,7 +146,7 @@ public class CapacitorFirebaseAuth: CAPPlugin {
return
}

call.resolve(provider.fillResult(credential: credential, data: jsResult));
call.resolve(provider.fillResult(credential: credential, data: jsResult))
}

func handleError(message: String) {
Expand All @@ -157,7 +157,7 @@ public class CapacitorFirebaseAuth: CAPPlugin {
return
}

guard let call = self.bridge?.getSavedCall(callbackId) else {
guard let call = self.bridge?.savedCall(withID: callbackId) else {
print("Ops, there is no saved call handling error")
return
}
Expand Down

0 comments on commit ec6d4d0

Please sign in to comment.