Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set different app group names for macos and ios

Browse Source
This commit is contained in:
Satindar Dhillon
2022-06-22 13:45:43 -07:00
parent b113d78904
commit f47b1101a3
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apple/OmnivoreKit/Sources/Models/CoreData/StorageProvider.swift
View File

@ -14,10 +14,14 @@ public class PersistentContainer: NSPersistentContainer {
// Store the sqlite file in the app group container.
// This allows shared access for app and app extensions.
let appGroupID = "group.app.omnivoreapp"
// TODO: fix this for macos...it's crashing locally when using forSecurityApplicationGroupIdentifier
#if os(iOS)
let appGroupID = "group.app.omnivoreapp"
#else
let appGroupID = "QJF2XZ86HB.app.omnivore.app"
#endif
let appGroupContainer = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)
let appGroupContainerURL = appGroupContainer?.appendingPathComponent("store.sqlite")
container.persistentStoreDescriptions.first!.url = appGroupContainerURL
container.viewContext.automaticallyMergesChangesFromParent = true

42
apple/OmnivoreKit/Sources/Services/Authentication/GoogleAuth.swift
View File

@ -11,7 +11,10 @@ public enum GoogleAuthResponse {
extension Authenticator {
public func handleGoogleAuth() async -> GoogleAuthResponse {
let idToken = try? await googleSignIn()
let idToken = await withCheckedContinuation { continuation in
googleSignIn { continuation.resume(returning: $0) }
}
guard let idToken = idToken else { return .loginError(error: .unauthorized) }
do {
@ -47,37 +50,34 @@ extension Authenticator {
}
}
func googleSignIn() async throws -> String {
func googleSignIn(completion: @escaping (String?) -> Void) {
#if os(iOS)
let presenting = presentingViewController()
#else
let presenting = await NSApplication.shared.mainWindow
let presenting = NSApplication.shared.windows.first
#endif
guard let presenting = presenting else {
throw LoginError.unknown
completion(nil)
return
}
return try await withCheckedThrowingContinuation { continuation in
let clientID = "\(AppKeys.sharedInstance?.iosClientGoogleId ?? "").apps.googleusercontent.com"
let clientID = "\(AppKeys.sharedInstance?.iosClientGoogleId ?? "").apps.googleusercontent.com"
GIDSignIn.sharedInstance.signIn(
with: GIDConfiguration(clientID: clientID),
presenting: presenting
) { user, error in
guard let user = user, error == nil else {
completion(nil)
return
}
GIDSignIn.sharedInstance.signIn(
with: GIDConfiguration(clientID: clientID),
presenting: presenting
) { user, error in
guard let user = user, error == nil else {
continuation.resume(throwing: LoginError.unauthorized)
user.authentication.do { authentication, error in
guard let idToken = authentication?.idToken, error == nil else {
completion(nil)
return
}
user.authentication.do { authentication, error in
guard let idToken = authentication?.idToken, error == nil else {
continuation.resume(throwing: LoginError.unauthorized)
return
}
continuation.resume(returning: idToken)
}
completion(idToken)
}
}
}