From 8425248df807b3042da91e8ca6c2c4b34e901c65 Mon Sep 17 00:00:00 2001 From: David Antoon Date: Mon, 29 Jan 2024 20:49:45 +0200 Subject: [PATCH 1/2] - Restore AbstractFronteggController to UIKit support - Add UIKIt example project --- README.md | 31 +- Sources/FronteggSwift/FronteggAuth.swift | 9 +- .../embedded/CustomWebView.swift | 5 +- .../views/AbstractFronteggController.swift | 35 ++ .../views/FronteggUIKitWrapper.swift | 38 ++ .../demo-uikit.xcodeproj/project.pbxproj | 401 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + demo-uikit/demo-uikit/AppDelegate.swift | 38 ++ .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 13 + .../demo-uikit/Assets.xcassets/Contents.json | 6 + .../demo-uikit/AuthenticationController.swift | 20 + .../Base.lproj/LaunchScreen.storyboard | 25 ++ .../demo-uikit/Base.lproj/Main.storyboard | 80 ++++ demo-uikit/demo-uikit/Frontegg.plist | 14 + demo-uikit/demo-uikit/Info.plist | 25 ++ demo-uikit/demo-uikit/SceneDelegate.swift | 83 ++++ demo-uikit/demo-uikit/ViewController.swift | 31 ++ 19 files changed, 854 insertions(+), 26 deletions(-) create mode 100644 Sources/FronteggSwift/views/AbstractFronteggController.swift create mode 100644 Sources/FronteggSwift/views/FronteggUIKitWrapper.swift create mode 100644 demo-uikit/demo-uikit.xcodeproj/project.pbxproj create mode 100644 demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 demo-uikit/demo-uikit/AppDelegate.swift create mode 100644 demo-uikit/demo-uikit/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 demo-uikit/demo-uikit/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 demo-uikit/demo-uikit/Assets.xcassets/Contents.json create mode 100644 demo-uikit/demo-uikit/AuthenticationController.swift create mode 100644 demo-uikit/demo-uikit/Base.lproj/LaunchScreen.storyboard create mode 100644 demo-uikit/demo-uikit/Base.lproj/Main.storyboard create mode 100644 demo-uikit/demo-uikit/Frontegg.plist create mode 100644 demo-uikit/demo-uikit/Info.plist create mode 100644 demo-uikit/demo-uikit/SceneDelegate.swift create mode 100644 demo-uikit/demo-uikit/ViewController.swift diff --git a/README.md b/README.md index 7f04e40..675054f 100644 --- a/README.md +++ b/README.md @@ -149,16 +149,16 @@ your root project directory, this file will store values to be used variables by return true } ``` - - Create FronteggController class that extends AbstractFronteggController from FronteggSwift + - Create AuthenticationController class that extends AbstractFronteggController from FronteggSwift ```swift // - // FronteggController.swift + // AuthenticationController.swift // import UIKit import FronteggSwift - class FronteggController: AbstractFronteggController { + class AuthenticationController: AbstractFronteggController { override func navigateToAuthenticated(){ // This function will be called when the user is authenticated @@ -237,29 +237,14 @@ your root project directory, this file will store values to be used variables by // if the user is not authenticated let fronteggAuth = FronteggApp.shared.auth - let sub = AnySubscriber( - receiveSubscription: {query in - query.request(.unlimited) - }, receiveValue: { showLoader in - self.showLoader = showLoader - self.label.text = fronteggAuth.user?.email ?? "Unknown" - - if(!showLoader && !fronteggAuth.isAuthenticated){ - // Display your own Authentication View Controller - // to handle after oauth callback - window?.rootViewController = AuthenticationController() - window?.makeKeyAndVisible() - return .none - } - return .unlimited - }) - - FronteggApp.shared.auth.$showLoader.subscribe(sub) - + self.label.text = fronteggAuth.user?.email ?? "Unknown" } @IBAction func logoutButton (){ - FronteggApp.shared.auth.logout() + FronteggApp.shared.auth.logout() { _ in + window?.rootViewController = AuthenticationController() + window?.makeKeyAndVisible() + } } } diff --git a/Sources/FronteggSwift/FronteggAuth.swift b/Sources/FronteggSwift/FronteggAuth.swift index 6b1e6bf..8f3692d 100644 --- a/Sources/FronteggSwift/FronteggAuth.swift +++ b/Sources/FronteggSwift/FronteggAuth.swift @@ -201,7 +201,7 @@ public class FronteggAuth: ObservableObject { } } - public func logout() { + public func logout(_ completion: @escaping (Result) -> Void) { self.isLoading = true DispatchQueue.global(qos: .userInitiated).async { @@ -222,10 +222,15 @@ public class FronteggAuth: ObservableObject { // isLoading must be at the last bottom self.isLoading = false + completion(.success(true)); } } } - + } + public func logout() { + logout { res in + print("logged out") + } } public func refreshTokenIfNeeded() async { diff --git a/Sources/FronteggSwift/embedded/CustomWebView.swift b/Sources/FronteggSwift/embedded/CustomWebView.swift index 8469b72..6156e20 100644 --- a/Sources/FronteggSwift/embedded/CustomWebView.swift +++ b/Sources/FronteggSwift/embedded/CustomWebView.swift @@ -132,11 +132,14 @@ class CustomWebView: WKWebView, WKNavigationDelegate { } let errorMessage = error.localizedDescription; - let url = "\(error.userInfo["NSErrorFailingURLKey"] ?? error.userInfo)" + let url = "\(error.userInfo["NSErrorFailingURLKey"] ?? "")" logger.error("Failed to load page: \(errorMessage), status: \(statusCode), \(error)") + + self.fronteggAuth.webLoading = false let content = generateErrorPage(message: errorMessage, url: url, status: statusCode); webView.loadHTMLString(content, baseURL: nil); + } diff --git a/Sources/FronteggSwift/views/AbstractFronteggController.swift b/Sources/FronteggSwift/views/AbstractFronteggController.swift new file mode 100644 index 0000000..079ed40 --- /dev/null +++ b/Sources/FronteggSwift/views/AbstractFronteggController.swift @@ -0,0 +1,35 @@ +// +// AbstractFronteggController.swift +// +// +// Created by David Frontegg on 30/12/2022. +// + +import Foundation +import UIKit +import SwiftUI + + +open class AbstractFronteggController: UIViewController { + private var logger = getLogger("AbstractFronteggController") + + open func navigateToAuthenticated() { + logger.error("Missing AbstractFronteggController implementation class") + fatalError("Not implemented") + } + + public override func viewDidLoad() { + super.viewDidLoad() + logger.trace("viewDidLoad()") + let childView = UIHostingController(rootView: FronteggUIKitWrapper( + navigateToAuthenticated: navigateToAuthenticated, + loaderView: nil + )) + addChild(childView) + childView.view.frame = self.view.bounds + self.view.addSubview(childView.view) + childView.didMove(toParent: self) + } + + +} diff --git a/Sources/FronteggSwift/views/FronteggUIKitWrapper.swift b/Sources/FronteggSwift/views/FronteggUIKitWrapper.swift new file mode 100644 index 0000000..38c1f6f --- /dev/null +++ b/Sources/FronteggSwift/views/FronteggUIKitWrapper.swift @@ -0,0 +1,38 @@ +// +// FronteggUIKitWrapper.swift +// +// Created by David Frontegg on 14/11/2022. +// + +import SwiftUI + +struct FronteggUIKitWrapper: View { + var loaderView: AnyView + var navigateToAuthenticated: () -> Void + @StateObject var fronteggAuth = FronteggApp.shared.auth + + init(navigateToAuthenticated: @escaping () -> Void, loaderView: AnyView?) { + self.navigateToAuthenticated = navigateToAuthenticated + self.loaderView = loaderView ?? AnyView(DefaultLoader()) + } + public var body: some View { + ZStack { + if fronteggAuth.initializing + || fronteggAuth.showLoader + || fronteggAuth.appLink { + self.loaderView + }else { + if(fronteggAuth.isAuthenticated) { + self.loaderView.onAppear() { + self.navigateToAuthenticated() + } + }else { + self.loaderView.onAppear() { + fronteggAuth.login() + } + } + } + } + .environmentObject(fronteggAuth) + } +} diff --git a/demo-uikit/demo-uikit.xcodeproj/project.pbxproj b/demo-uikit/demo-uikit.xcodeproj/project.pbxproj new file mode 100644 index 0000000..32e837c --- /dev/null +++ b/demo-uikit/demo-uikit.xcodeproj/project.pbxproj @@ -0,0 +1,401 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 56; + objects = { + +/* Begin PBXBuildFile section */ + 41AEA8722B67F4760045C0B3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AEA8712B67F4760045C0B3 /* AppDelegate.swift */; }; + 41AEA8742B67F4760045C0B3 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AEA8732B67F4760045C0B3 /* SceneDelegate.swift */; }; + 41AEA8762B67F4760045C0B3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AEA8752B67F4760045C0B3 /* ViewController.swift */; }; + 41AEA8792B67F4760045C0B3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 41AEA8772B67F4760045C0B3 /* Main.storyboard */; }; + 41AEA87B2B67F4770045C0B3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 41AEA87A2B67F4770045C0B3 /* Assets.xcassets */; }; + 41AEA87E2B67F4770045C0B3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 41AEA87C2B67F4770045C0B3 /* LaunchScreen.storyboard */; }; + 41AEA88B2B67F4D60045C0B3 /* FronteggSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 41AEA88A2B67F4D60045C0B3 /* FronteggSwift */; }; + 41AEA8912B67FC970045C0B3 /* AuthenticationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AEA8902B67FC970045C0B3 /* AuthenticationController.swift */; }; + 41AEA8932B67FD2A0045C0B3 /* Frontegg.plist in Resources */ = {isa = PBXBuildFile; fileRef = 41AEA8922B67FD2A0045C0B3 /* Frontegg.plist */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 41AEA86E2B67F4760045C0B3 /* demo-uikit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "demo-uikit.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 41AEA8712B67F4760045C0B3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 41AEA8732B67F4760045C0B3 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 41AEA8752B67F4760045C0B3 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 41AEA8782B67F4760045C0B3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 41AEA87A2B67F4770045C0B3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 41AEA87D2B67F4770045C0B3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 41AEA87F2B67F4770045C0B3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 41AEA8892B67F4BE0045C0B3 /* frontegg-swift */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "frontegg-swift"; path = ..; sourceTree = ""; }; + 41AEA8902B67FC970045C0B3 /* AuthenticationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationController.swift; sourceTree = ""; }; + 41AEA8922B67FD2A0045C0B3 /* Frontegg.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Frontegg.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 41AEA86B2B67F4760045C0B3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 41AEA88B2B67F4D60045C0B3 /* FronteggSwift in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 41AEA8652B67F4760045C0B3 = { + isa = PBXGroup; + children = ( + 41AEA8882B67F4BE0045C0B3 /* Packages */, + 41AEA8702B67F4760045C0B3 /* demo-uikit */, + 41AEA86F2B67F4760045C0B3 /* Products */, + 41AEA8852B67F48D0045C0B3 /* Frameworks */, + ); + sourceTree = ""; + }; + 41AEA86F2B67F4760045C0B3 /* Products */ = { + isa = PBXGroup; + children = ( + 41AEA86E2B67F4760045C0B3 /* demo-uikit.app */, + ); + name = Products; + sourceTree = ""; + }; + 41AEA8702B67F4760045C0B3 /* demo-uikit */ = { + isa = PBXGroup; + children = ( + 41AEA8712B67F4760045C0B3 /* AppDelegate.swift */, + 41AEA8732B67F4760045C0B3 /* SceneDelegate.swift */, + 41AEA8752B67F4760045C0B3 /* ViewController.swift */, + 41AEA8772B67F4760045C0B3 /* Main.storyboard */, + 41AEA87A2B67F4770045C0B3 /* Assets.xcassets */, + 41AEA87C2B67F4770045C0B3 /* LaunchScreen.storyboard */, + 41AEA87F2B67F4770045C0B3 /* Info.plist */, + 41AEA8902B67FC970045C0B3 /* AuthenticationController.swift */, + 41AEA8922B67FD2A0045C0B3 /* Frontegg.plist */, + ); + path = "demo-uikit"; + sourceTree = ""; + }; + 41AEA8852B67F48D0045C0B3 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + 41AEA8882B67F4BE0045C0B3 /* Packages */ = { + isa = PBXGroup; + children = ( + 41AEA8892B67F4BE0045C0B3 /* frontegg-swift */, + ); + name = Packages; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 41AEA86D2B67F4760045C0B3 /* demo-uikit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 41AEA8822B67F4770045C0B3 /* Build configuration list for PBXNativeTarget "demo-uikit" */; + buildPhases = ( + 41AEA86A2B67F4760045C0B3 /* Sources */, + 41AEA86B2B67F4760045C0B3 /* Frameworks */, + 41AEA86C2B67F4760045C0B3 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "demo-uikit"; + packageProductDependencies = ( + 41AEA88A2B67F4D60045C0B3 /* FronteggSwift */, + ); + productName = "demo-uikit"; + productReference = 41AEA86E2B67F4760045C0B3 /* demo-uikit.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 41AEA8662B67F4760045C0B3 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 1430; + LastUpgradeCheck = 1430; + TargetAttributes = { + 41AEA86D2B67F4760045C0B3 = { + CreatedOnToolsVersion = 14.3.1; + }; + }; + }; + buildConfigurationList = 41AEA8692B67F4760045C0B3 /* Build configuration list for PBXProject "demo-uikit" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 41AEA8652B67F4760045C0B3; + productRefGroup = 41AEA86F2B67F4760045C0B3 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 41AEA86D2B67F4760045C0B3 /* demo-uikit */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 41AEA86C2B67F4760045C0B3 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 41AEA8932B67FD2A0045C0B3 /* Frontegg.plist in Resources */, + 41AEA87E2B67F4770045C0B3 /* LaunchScreen.storyboard in Resources */, + 41AEA87B2B67F4770045C0B3 /* Assets.xcassets in Resources */, + 41AEA8792B67F4760045C0B3 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 41AEA86A2B67F4760045C0B3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 41AEA8762B67F4760045C0B3 /* ViewController.swift in Sources */, + 41AEA8722B67F4760045C0B3 /* AppDelegate.swift in Sources */, + 41AEA8742B67F4760045C0B3 /* SceneDelegate.swift in Sources */, + 41AEA8912B67FC970045C0B3 /* AuthenticationController.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 41AEA8772B67F4760045C0B3 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 41AEA8782B67F4760045C0B3 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 41AEA87C2B67F4770045C0B3 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 41AEA87D2B67F4770045C0B3 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 41AEA8802B67F4770045C0B3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 41AEA8812B67F4770045C0B3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 41AEA8832B67F4770045C0B3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 3R2X6557U2; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "demo-uikit/Info.plist"; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.frontegg.demo; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 41AEA8842B67F4770045C0B3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 3R2X6557U2; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "demo-uikit/Info.plist"; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.frontegg.demo; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 41AEA8692B67F4760045C0B3 /* Build configuration list for PBXProject "demo-uikit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 41AEA8802B67F4770045C0B3 /* Debug */, + 41AEA8812B67F4770045C0B3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 41AEA8822B67F4770045C0B3 /* Build configuration list for PBXNativeTarget "demo-uikit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 41AEA8832B67F4770045C0B3 /* Debug */, + 41AEA8842B67F4770045C0B3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 41AEA88A2B67F4D60045C0B3 /* FronteggSwift */ = { + isa = XCSwiftPackageProductDependency; + productName = FronteggSwift; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = 41AEA8662B67F4760045C0B3 /* Project object */; +} diff --git a/demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/demo-uikit/demo-uikit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/demo-uikit/demo-uikit/AppDelegate.swift b/demo-uikit/demo-uikit/AppDelegate.swift new file mode 100644 index 0000000..4cb44b1 --- /dev/null +++ b/demo-uikit/demo-uikit/AppDelegate.swift @@ -0,0 +1,38 @@ +// +// AppDelegate.swift +// demo-uikit +// +// Created by David Antoon on 29/01/2024. +// + +import UIKit +import FronteggSwift + +@main +class AppDelegate: UIResponder, UIApplicationDelegate { + + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + + FronteggApp.shared.didFinishLaunchingWithOptions() + return true + } + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + // Called when a new scene session is being created. + // Use this method to select a configuration to create the new scene with. + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + // Called when the user discards a scene session. + // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. + // Use this method to release any resources that were specific to the discarded scenes, as they will not return. + } + + +} + diff --git a/demo-uikit/demo-uikit/Assets.xcassets/AccentColor.colorset/Contents.json b/demo-uikit/demo-uikit/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..eb87897 --- /dev/null +++ b/demo-uikit/demo-uikit/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/demo-uikit/demo-uikit/Assets.xcassets/AppIcon.appiconset/Contents.json b/demo-uikit/demo-uikit/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..13613e3 --- /dev/null +++ b/demo-uikit/demo-uikit/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,13 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/demo-uikit/demo-uikit/Assets.xcassets/Contents.json b/demo-uikit/demo-uikit/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/demo-uikit/demo-uikit/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/demo-uikit/demo-uikit/AuthenticationController.swift b/demo-uikit/demo-uikit/AuthenticationController.swift new file mode 100644 index 0000000..2e62162 --- /dev/null +++ b/demo-uikit/demo-uikit/AuthenticationController.swift @@ -0,0 +1,20 @@ +// +// AuthenticationController.swift +// + +import UIKit +import FronteggSwift + +class AuthenticationController: AbstractFronteggController { + + override func navigateToAuthenticated(){ + // This function will be called when the user is authenticated + // to navigate your application to the authenticated screen + + let mainStoryboard: UIStoryboard = UIStoryboard(name: "Main", bundle: nil) + let viewController = mainStoryboard.instantiateViewController(withIdentifier: "authenticatedScreen") + self.view.window?.rootViewController = viewController + self.view.window?.makeKeyAndVisible() + } + +} diff --git a/demo-uikit/demo-uikit/Base.lproj/LaunchScreen.storyboard b/demo-uikit/demo-uikit/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..865e932 --- /dev/null +++ b/demo-uikit/demo-uikit/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo-uikit/demo-uikit/Base.lproj/Main.storyboard b/demo-uikit/demo-uikit/Base.lproj/Main.storyboard new file mode 100644 index 0000000..afc6ca4 --- /dev/null +++ b/demo-uikit/demo-uikit/Base.lproj/Main.storyboard @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo-uikit/demo-uikit/Frontegg.plist b/demo-uikit/demo-uikit/Frontegg.plist new file mode 100644 index 0000000..0b687f4 --- /dev/null +++ b/demo-uikit/demo-uikit/Frontegg.plist @@ -0,0 +1,14 @@ + + + + + embeddedMode + + baseUrl + https://auth.davidantoon.me + clientId + b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca + logLevel + trace + + diff --git a/demo-uikit/demo-uikit/Info.plist b/demo-uikit/demo-uikit/Info.plist new file mode 100644 index 0000000..dd3c9af --- /dev/null +++ b/demo-uikit/demo-uikit/Info.plist @@ -0,0 +1,25 @@ + + + + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + + diff --git a/demo-uikit/demo-uikit/SceneDelegate.swift b/demo-uikit/demo-uikit/SceneDelegate.swift new file mode 100644 index 0000000..1a039f5 --- /dev/null +++ b/demo-uikit/demo-uikit/SceneDelegate.swift @@ -0,0 +1,83 @@ +// +// SceneDelegate.swift +// demo-uikit +// +// Created by David Antoon on 29/01/2024. +// + +import UIKit +import FronteggSwift + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func scene(_ scene: UIScene, openURLContexts URLContexts: Set) { + if let url = URLContexts.first?.url, + url.startAccessingSecurityScopedResource() { + defer { + url.stopAccessingSecurityScopedResource() + } + if url.absoluteString.hasPrefix( FronteggApp.shared.baseUrl ) { + if(FronteggApp.shared.auth.handleOpenUrl(url)){ + // Display your own Authentication View Controller + // to handle after oauth callback + window?.rootViewController = AuthenticationController() + window?.makeKeyAndVisible() + return + } + } + + } + } + func scene(_ scene: UIScene, continue userActivity: NSUserActivity) { + if let url = userActivity.webpageURL { + if(FronteggApp.shared.auth.handleOpenUrl(url)){ + // Display your own Authentication View Controller + // to handle after oauth callback + window?.rootViewController = AuthenticationController() + window?.makeKeyAndVisible() + return + } + } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/demo-uikit/demo-uikit/ViewController.swift b/demo-uikit/demo-uikit/ViewController.swift new file mode 100644 index 0000000..1a1a9a8 --- /dev/null +++ b/demo-uikit/demo-uikit/ViewController.swift @@ -0,0 +1,31 @@ +// +// ViewController.swift +// demo-uikit +// +// Created by David Antoon on 29/01/2024. +// + +import UIKit +import FronteggSwift + +class ViewController: UIViewController { + @IBOutlet weak var label: UILabel! + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view. + + let fronteggAuth = FronteggApp.shared.auth + label.text = fronteggAuth.user?.email + } + + + @IBAction func logoutButton (){ + FronteggApp.shared.auth.logout() { _ in + self.view.window?.rootViewController = AuthenticationController() + self.view.window?.makeKeyAndVisible() + } + } + +} + From a71d425a9482f17077f2997f375b28b088371bfc Mon Sep 17 00:00:00 2001 From: David Antoon Date: Mon, 29 Jan 2024 20:53:06 +0200 Subject: [PATCH 2/2] fix storyboard identifier in example project --- demo-uikit/demo-uikit/Base.lproj/Main.storyboard | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo-uikit/demo-uikit/Base.lproj/Main.storyboard b/demo-uikit/demo-uikit/Base.lproj/Main.storyboard index afc6ca4..310f5b6 100644 --- a/demo-uikit/demo-uikit/Base.lproj/Main.storyboard +++ b/demo-uikit/demo-uikit/Base.lproj/Main.storyboard @@ -8,10 +8,10 @@ - + - +