@frontegg/ionic-capacitor 2.0.0 → 2.0.1

package/android/src/main/java/com/frontegg/ionic/FronteggNativePlugin.java

@@ -42,8 +42,11 @@ public class FronteggNativePlugin extends Plugin {
         List<RegionConfig> regions = new ArrayList<>();
         JSONArray array;
         try {
-            array = this.getConfig().getConfigJSON().getJSONArray("regions");
+            array = this.getConfig().getConfigJSON().optJSONArray("regions");
 
+            if (array == null) {
+                array = new JSONArray();
+            }
             for (int i = 0; i < array.length(); i++) {
                 JSONObject regionJson = (JSONObject) array.get(i);
                 regions.add(new RegionConfig(
@@ -61,9 +64,12 @@ public class FronteggNativePlugin extends Plugin {
             PluginConfig config = this.getConfig();
             String baseUrl = config.getString("baseUrl");
             String clientId = config.getString("clientId");
-            String regionKey = config.getString("regionKey");
-            if (baseUrl == null || clientId == null || regionKey == null) {
-                throw new RuntimeException("Missing required config parameters: baseUrl, clientId, regionKey");
+
+            if (baseUrl == null || clientId == null) {
+                throw new RuntimeException("Missing required config parameters: baseUrl, clientId");
+            }
+            if(baseUrl.startsWith("https://")) {
+                baseUrl = baseUrl.substring(baseUrl.indexOf("://") + 3);
             }
             FronteggApp.Companion.init(
                 baseUrl,

package/dist/esm/definitions.d.ts

@@ -63,7 +63,7 @@ declare type FronteggNativeRegionOptions = {
      * @since 1.0.0
      * @example [{key: "us", baseUrl: "https://us-api.frontegg.com", clientId: "us-client-id"}]
      */
-    regions?: RegionConfig[];
+    regions: RegionConfig[];
 };
 declare type FronteggNativeOptions = (FronteggNativeStandardOptions | FronteggNativeRegionOptions) & {
     handleLoginWithSocialLogin?: boolean;

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["\nimport type { ListenerCallback, PluginListenerHandle } from '@capacitor/core';\nimport type { ITenantsResponse, IUserProfile } from '@frontegg/rest-api';\n\nexport type User = IUserProfile & {\n  tenants: ITenantsResponse[];\n  activeTenant: ITenantsResponse\n}\n\nexport interface FronteggState {\n  accessToken: string | null;\n  refreshToken: string | null;\n  isAuthenticated: boolean;\n  user: User | null;\n  showLoader: boolean;\n  selectedRegion: string | null;\n}\n\n\nexport type SubscribeFunc<T, K extends keyof T> = (value: T[K]) => void\nexport type SubscribeMap<T> = {\n  [K in keyof T]: Set<SubscribeFunc<T, K>>\n}\n\n\nexport interface FronteggConstants {\n  baseUrl: string;\n  clientId: string;\n  bundleId: string;\n  isRegional: boolean;\n  regionData?: { key: string, baseUrl: string, clientId: string }[]\n}\n\nexport interface FronteggNativePlugin {\n  addListener(eventName: string, listenerFunc: ListenerCallback): Promise<PluginListenerHandle> & PluginListenerHandle\n\n  getConstants(): Promise<FronteggConstants>;\n\n  getAuthState(): Promise<FronteggState>;\n\n  login(): Promise<void>;\n\n  logout(): void;\n\n  switchTenant(payload: { tenantId: string }): Promise<void>;\n\n  /**\n   * used to initialize the plugin with multiple regions\n   * for more information see:\n   * iOS: https://github.com/frontegg/frontegg-ios-swift#multi-region-support\n   * Android: https://github.com/frontegg/frontegg-android-kotlin#multi-region-support\n   */\n  initWithRegion(payload: { regionKey: string }): Promise<void>;\n\n  refreshToken(): Promise<void>;\n\n}\n\n\n\nexport type RegionConfig = {\n  key: string;\n  baseUrl: string;\n  clientId: string;\n};\n\n\n\ntype FronteggNativeStandardOptions = {\n  baseUrl: string;\n  clientId: string;\n\n}\ntype FronteggNativeRegionOptions = {\n  /**\n   * This is an array of regions to be used as frontegg app.\n   *\n   * @since 1.0.0\n   * @example [{key: \"us\", baseUrl: \"https://us-api.frontegg.com\", clientId: \"us-client-id\"}]\n   */\n  regions?: RegionConfig[];\n}\ntype FronteggNativeOptions = (FronteggNativeStandardOptions | FronteggNativeRegionOptions) & {\n  handleLoginWithSocialLogin?: boolean;\n  handleLoginWithSSO?: boolean;\n}\n// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore\ndeclare module \"@capacitor/cli\" {\n  export interface PluginsConfig {\n    /**\n     * You can configure the way the push notifications are displayed when the app is in foreground.\n     */\n    FronteggNative?: FronteggNativeOptions;\n  }\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["\nimport type { ListenerCallback, PluginListenerHandle } from '@capacitor/core';\nimport type { ITenantsResponse, IUserProfile } from '@frontegg/rest-api';\n\nexport type User = IUserProfile & {\n  tenants: ITenantsResponse[];\n  activeTenant: ITenantsResponse\n}\n\nexport interface FronteggState {\n  accessToken: string | null;\n  refreshToken: string | null;\n  isAuthenticated: boolean;\n  user: User | null;\n  showLoader: boolean;\n  selectedRegion: string | null;\n}\n\n\nexport type SubscribeFunc<T, K extends keyof T> = (value: T[K]) => void\nexport type SubscribeMap<T> = {\n  [K in keyof T]: Set<SubscribeFunc<T, K>>\n}\n\n\nexport interface FronteggConstants {\n  baseUrl: string;\n  clientId: string;\n  bundleId: string;\n  isRegional: boolean;\n  regionData?: { key: string, baseUrl: string, clientId: string }[]\n}\n\nexport interface FronteggNativePlugin {\n  addListener(eventName: string, listenerFunc: ListenerCallback): Promise<PluginListenerHandle> & PluginListenerHandle\n\n  getConstants(): Promise<FronteggConstants>;\n\n  getAuthState(): Promise<FronteggState>;\n\n  login(): Promise<void>;\n\n  logout(): void;\n\n  switchTenant(payload: { tenantId: string }): Promise<void>;\n\n  /**\n   * used to initialize the plugin with multiple regions\n   * for more information see:\n   * iOS: https://github.com/frontegg/frontegg-ios-swift#multi-region-support\n   * Android: https://github.com/frontegg/frontegg-android-kotlin#multi-region-support\n   */\n  initWithRegion(payload: { regionKey: string }): Promise<void>;\n\n  refreshToken(): Promise<void>;\n\n}\n\n\n\nexport type RegionConfig = {\n  key: string;\n  baseUrl: string;\n  clientId: string;\n};\n\n\n\ntype FronteggNativeStandardOptions = {\n  baseUrl: string;\n  clientId: string;\n\n}\ntype FronteggNativeRegionOptions = {\n  /**\n   * This is an array of regions to be used as frontegg app.\n   *\n   * @since 1.0.0\n   * @example [{key: \"us\", baseUrl: \"https://us-api.frontegg.com\", clientId: \"us-client-id\"}]\n   */\n  regions: RegionConfig[];\n}\ntype FronteggNativeOptions = (FronteggNativeStandardOptions | FronteggNativeRegionOptions) & {\n  handleLoginWithSocialLogin?: boolean;\n  handleLoginWithSSO?: boolean;\n}\n// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore\ndeclare module \"@capacitor/cli\" {\n  export interface PluginsConfig {\n    /**\n     * You can configure the way the push notifications are displayed when the app is in foreground.\n     */\n    FronteggNative?: FronteggNativeOptions;\n  }\n}\n"]}

package/ios/Plugin/FronteggNativePlugin.swift

@@ -11,29 +11,29 @@ import Capacitor
 public class FronteggNativePlugin: CAPPlugin {
     public let fronteggApp = FronteggApp.shared
     var cancellables = Set<AnyCancellable>()
-    
+
     private var workItem: DispatchWorkItem?
     private let delay: TimeInterval = 0.05  // 200ms delay
-    
+
     func debounce(_ action: @escaping () -> Void) {
         workItem?.cancel()
         let newWorkItem = DispatchWorkItem(block: action)
         DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: newWorkItem)
         workItem = newWorkItem
     }
-    
+
     override public func load() {
-        
+
         let config = self.getConfig()
-        
+
         let handleLoginWithSocialLogin = config.getBoolean("handleLoginWithSocialLogin", true)
         let handleLoginWithSSO = config.getBoolean("handleLoginWithSSO", false)
-        
-        if let array = config.getArray("regions"),
+
+        if let array = config.getArray("regions", []),
         array.count > 0 {
             print("region initialization")
             var regions:[RegionConfig] = []
-            
+
             array.forEach {item in
                 if let dict = item as? [String:String]  {
                     regions.append(RegionConfig(
@@ -43,7 +43,7 @@ public class FronteggNativePlugin: CAPPlugin {
                     ))
                 }
             }
-            
+
             if(regions.isEmpty){
                 print("Frontegg Error: Missing regions configurations")
                 exit(1)
@@ -64,9 +64,9 @@ public class FronteggNativePlugin: CAPPlugin {
                 exit(1)
             }
         }
-        
-        
-        
+
+
+
         let auth = fronteggApp.auth
         var anyChange: AnyPublisher<Void, Never> {
             return Publishers.Merge8 (
@@ -81,26 +81,26 @@ public class FronteggNativePlugin: CAPPlugin {
             )
             .eraseToAnyPublisher()
         }
-        
+
         anyChange.sink(receiveValue: { () in
             self.debounce() {
                 self.sendEvent()
             }
         }).store(in: &cancellables)
-        
+
         self.sendEvent()
     }
-    
-    
-    
+
+
+
     func sendEvent() {
         let auth = fronteggApp.auth
-        
+
         var jsonUser: [String: Any]? = nil
         if let userData = try? JSONEncoder().encode(auth.user) {
             jsonUser = try? JSONSerialization.jsonObject(with: userData, options: .allowFragments) as? [String: Any]
         }
-        
+
         let body: [String: Any?] = [
             "accessToken": auth.accessToken,
             "refreshToken": auth.refreshToken,
@@ -111,13 +111,13 @@ public class FronteggNativePlugin: CAPPlugin {
             "showLoader": auth.showLoader,
             "selectedRegion": regionToJson(auth.selectedRegion)
         ]
-        
+
         self.notifyListeners("onFronteggAuthEvent", data: body as [String : Any])
     }
-    
-    
+
+
     func regionToJson(_ region: RegionConfig?) -> [String:String]? {
-        
+
         if let reg = region {
             return [
                 "baseUrl": reg.baseUrl,
@@ -129,17 +129,17 @@ public class FronteggNativePlugin: CAPPlugin {
         }
     }
     func regionsToJson(_ regions: [RegionConfig]) -> [[String:String]] {
-        
+
         var regionData: [[String:String]] = []
         regions.forEach { reg in
             if let region = regionToJson(reg) {
                 regionData.append(region)
             }
         }
-        
+
         return regionData
     }
-    
+
     @objc func getConstants(_ call: CAPPluginCall) {
         call.resolve([
             "baseUrl": fronteggApp.baseUrl,
@@ -149,43 +149,43 @@ public class FronteggNativePlugin: CAPPlugin {
             "regionData": regionsToJson(fronteggApp.auth.regionData)
         ])
     }
-    
+
     @objc func login(_ call: CAPPluginCall) {
         DispatchQueue.main.sync {
             fronteggApp.auth.login()
         }
         call.resolve()
     }
-    
+
     @objc func logout(_ call: CAPPluginCall) {
         DispatchQueue.main.sync {
             fronteggApp.auth.logout()
         }
         call.resolve()
     }
-    
+
     @objc func switchTenant(_ call: CAPPluginCall) {
         guard let tenantId = call.options["tenantId"] as? String else {
             call.reject("No tenantId provided")
             return
         }
-        
+
         fronteggApp.auth.switchTenant(tenantId: tenantId) { _ in
             call.resolve()
         }
     }
-    
+
     @objc func initWithRegion(_ call: CAPPluginCall) {
         guard let regionKey = call.options["regionKey"] as? String else {
             call.reject("No regionKey provided")
             return
         }
-        
+
         fronteggApp.initWithRegion(regionKey: regionKey)
     }
-    
+
     @objc func refreshToken(_ call: CAPPluginCall) {
-        
+
         DispatchQueue.global(qos: .background).async {
             Task {
                 await self.fronteggApp.auth.refreshTokenIfNeeded()
@@ -193,14 +193,14 @@ public class FronteggNativePlugin: CAPPlugin {
             }
         }
     }
-    
+
     @objc func getAuthState(_ call: CAPPluginCall) {
         let auth = fronteggApp.auth
         var jsonUser: [String: Any]? = nil
         if let userData = try? JSONEncoder().encode(auth.user) {
             jsonUser = try? JSONSerialization.jsonObject(with: userData, options: .allowFragments) as? [String: Any]
         }
-        
+
         let body: [String: Any?] = [
             "accessToken": auth.accessToken,
             "refreshToken": auth.refreshToken,
@@ -213,5 +213,5 @@ public class FronteggNativePlugin: CAPPlugin {
         ]
         call.resolve(body as [String: Any] )
     }
-    
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontegg/ionic-capacitor",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Frontegg Ionic Capacitor SDK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",