@frontegg/ionic-capacitor 2.0.7 → 2.0.8

package/FronteggIonicCapacitor.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
-  s.dependency "FronteggSwift", "1.2.11"
+  s.dependency "FronteggSwift", "1.2.16"
   s.swift_version = '5.1'
   s.pod_target_xcconfig = {
     'CODE_SIGNING_ALLOWED' => 'YES'

package/README.md

@@ -31,6 +31,8 @@ features for the product-led era.
   - [Step 1: Add regions to your Frontegg configuration](#step-1-add-regions-to-your-frontegg-configuration)
   - [Setup multi-region support for iOS Platform](#setup-multi-region-support-for-ios-platform)
   - [Setup multi-region support for Android Platform](#setup-multi-region-support-for-android-platform)
+- [Multi-apps Android Support](#multi-apps-support)
+  - [Step 1: Add application id to your Frontegg configuration](#step-1-add-application-id-to-your-frontegg-configuration)
 
 ## Project Requirements
 
@@ -832,3 +834,70 @@ NOTE: if you are using `Custom Chrome Tab` you have to use `android:name` `com.f
     </activity>
 </application>
 ```
+
+## Multi-apps Support
+
+This guide outlines the steps to configure your application to support multiple applications.
+
+### Step 1: Add application id to your Frontegg configuration
+
+Add `applicationId` to your Frontegg configuration in `capacitor.config.ts` file:
+
+Find example code in [example/capacitor.config.ts](example/capacitor.config.ts) file.
+
+
+```typescript
+import { CapacitorConfig } from '@capacitor/cli';
+
+const config: CapacitorConfig = {
+/*...*/
+plugins: {
+
+    /*...*/
+
+    FronteggNative: {
+        baseUrl: 'https://{FRONTEGG_DOMAIN_HOST.com}',
+        clientId: '{FRONTEGG_CLIENT_ID}',
+        applicationId: '{FRONTEGG_APPLICATION_ID}',
+    }
+}
+};
+
+export default config;
+```
+
+Or add `applicationId` to the `regions`:
+
+```typescript
+import { CapacitorConfig } from '@capacitor/cli';
+
+const config: CapacitorConfig = {
+  /*...*/
+  plugins: {
+
+    /*...*/
+
+    FronteggNative: {
+      
+      /** Remove baseUrl and clientId from here */
+      // baseUrl: 'https://{FRONTEGG_DOMAIN_HOST.com}',
+      // clientId: '{FRONTEGG_CLIENT_ID}',
+      // applicationId: '{FRONTEGG_APPLICATION_ID}',
+      
+      regions: [ {
+        key: 'REGION_1_KEY',
+        baseUrl: 'https://region1.forntegg.com',
+        clientId: 'REGION_1_CLIEND_ID', 
+        applicationId: '{FRONTEGG_REGION_1_APPLICATION_ID}'
+      }, {
+        key: 'REGION_2_KEY',
+        baseUrl: 'https://region2.forntegg.com',
+        clientId: 'REGION_2_CLIEND_ID', 
+        applicationId: '{FRONTEGG_REGION_2_APPLICATION_ID}',
+      } ]
+    }
+  }
+};
+
+export default config;
+```

package/android/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     implementation "androidx.browser:browser:1.5.0"
     implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
     implementation 'com.google.code.gson:gson:2.10'
-    implementation 'com.frontegg.sdk:android:1.2.10'
+    implementation 'com.frontegg.sdk:android:1.2.18'
 
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

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

@@ -40,7 +40,7 @@ public class FronteggNativePlugin extends Plugin {
 
         // for regions initialization
         List<RegionConfig> regions = new ArrayList<>();
-        boolean useAssetLinks = this.getConfig().getBoolean("useAssetsLinks", true);
+        boolean useAssetLinks = this.getConfig().getBoolean("useAssetLinks", true);
         boolean useChromeCustomTabs = this.getConfig().getBoolean("useChromeCustomTabs", false);
         JSONArray array;
         try {
@@ -51,10 +51,15 @@ public class FronteggNativePlugin extends Plugin {
             }
             for (int i = 0; i < array.length(); i++) {
                 JSONObject regionJson = (JSONObject) array.get(i);
+                String applicationId = null;
+                if (regionJson.has("applicationId")) {
+                    applicationId = regionJson.getString("applicationId");
+                }
                 regions.add(new RegionConfig(
                     regionJson.getString("key"),
                     regionJson.getString("baseUrl"),
-                    regionJson.getString("clientId")
+                    regionJson.getString("clientId"),
+                    applicationId
                 ));
             }
 
@@ -66,6 +71,7 @@ public class FronteggNativePlugin extends Plugin {
             PluginConfig config = this.getConfig();
             String baseUrl = config.getString("baseUrl");
             String clientId = config.getString("clientId");
+            String applicationId = config.getString("applicationId");
 
             if (baseUrl == null || clientId == null) {
                 throw new RuntimeException("Missing required config parameters: baseUrl, clientId");
@@ -77,15 +83,18 @@ public class FronteggNativePlugin extends Plugin {
                 baseUrl,
                 clientId,
                 this.getContext(),
+                applicationId,
                 useAssetLinks,
-                useChromeCustomTabs
+                useChromeCustomTabs,
+                null
             );
         }else {
             FronteggApp.Companion.initWithRegions(
                 regions,
                 this.getContext(),
                 useAssetLinks,
-                useChromeCustomTabs
+                useChromeCustomTabs,
+                null
             );
         }
 
@@ -176,7 +185,7 @@ public class FronteggNativePlugin extends Plugin {
             call.reject("No tenantId provided");
             return;
         }
-        FronteggApp.Companion.getInstance().getAuth().switchTenant(tenantId, () -> {
+        FronteggApp.Companion.getInstance().getAuth().switchTenant(tenantId, (success) -> {
             call.resolve();
             return null;
         });
@@ -219,6 +228,7 @@ public class FronteggNativePlugin extends Plugin {
 
         String baseUrl = FronteggAuth.Companion.getInstance().getBaseUrl();
         String clientId = FronteggAuth.Companion.getInstance().getClientId();
+        String applicationId = FronteggAuth.Companion.getInstance().getApplicationId();
         String packageName = getContext().getPackageName();
 
         List<RegionConfig> regionsData = FronteggApp.Companion.getInstance().getRegions();
@@ -227,6 +237,7 @@ public class FronteggNativePlugin extends Plugin {
         resultMap.put("baseUrl", baseUrl);
         resultMap.put("clientId", clientId);
         resultMap.put("bundleId", packageName);
+        resultMap.put("applicationId", applicationId);
         resultMap.put("isRegional", regionsData.size() > 0);
         resultMap.put("regionData", Parser.regionsToJSONObject(regionsData));
 

package/dist/esm/definitions.d.ts

@@ -19,6 +19,7 @@ export declare type SubscribeMap<T> = {
 export interface FronteggConstants {
     baseUrl: string;
     clientId: string;
+    applicationId: string | null;
     bundleId: string;
     isRegional: boolean;
     regionData?: {
@@ -61,10 +62,12 @@ export declare type RegionConfig = {
     key: string;
     baseUrl: string;
     clientId: string;
+    applicationId?: string;
 };
 declare type FronteggNativeStandardOptions = {
     baseUrl: string;
     clientId: string;
+    applicationId?: string;
 };
 declare type FronteggNativeRegionOptions = {
     /**

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import 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\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\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(\n    eventName: string,\n    listenerFunc: ListenerCallback,\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n  getConstants(): Promise<FronteggConstants>;\n\n  getAuthState(): Promise<FronteggState>;\n\n  login(): Promise<void>;\n\n  /**\n   * Used to log in with social login provider directly without visiting the login page\n   * @param payload\n   * @param payload.type - the direct login type (direct, social-login, custom-social-login)\n   * @param payload.data - the direct login data (for direct it's saml url request, for social-login it's the provider name, for custom-social-login it's the provider entity id)\n   */\n  directLoginAction(payload: { type: string; data: string }): 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\nexport type RegionConfig = {\n  key: string;\n  baseUrl: string;\n  clientId: string;\n};\n\ntype FronteggNativeStandardOptions = {\n  baseUrl: string;\n  clientId: string;\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 = (\n  | FronteggNativeStandardOptions\n  | FronteggNativeRegionOptions\n) & {\n  /**\n   * Weather to handle login with social login in external browser.\n   * If set to false, the plugin will navigate to the social login page with application webview.\n   *\n   * NOTE: some of the social login providers prevent login from embedded webview.\n   *\n   *  @default true\n   */\n  handleLoginWithSocialLogin?: boolean;\n  /**\n   *  Weather to handle login with SSO in external browser.\n   *  If set to false, the plugin will navigate to the sso page with application webview.\n   *\n   *  @default false\n   */\n  handleLoginWithSSO?: boolean;\n  /**\n   * Weather to use the assetlinks to for oauth/callback, this is the default behavior.\n   * disabling this will cause the plugin to use custom url scheme for oauth/callback.\n   *\n   * NOTE: custom url scheme require user interaction to return to the app.\n   * @default true\n   */\n  useAssetLinks?: boolean;\n\n  /**\n   * Weather to To enable social login via Chrome Custom Tabs, set the useChromeCustomTabs flag to true.\n   * By default, the SDK uses the Chrome browser for social login.\n   *\n   * NOTE: custom url scheme require user interaction to return to the app.\n   * @default true\n   */\n  useChromeCustomTabs?: 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":["import 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\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\nexport interface FronteggConstants {\n  baseUrl: string;\n  clientId: string;\n  applicationId: string | null;\n  bundleId: string;\n  isRegional: boolean;\n  regionData?: { key: string; baseUrl: string; clientId: string }[];\n}\n\nexport interface FronteggNativePlugin {\n  addListener(\n    eventName: string,\n    listenerFunc: ListenerCallback,\n  ): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n  getConstants(): Promise<FronteggConstants>;\n\n  getAuthState(): Promise<FronteggState>;\n\n  login(): Promise<void>;\n\n  /**\n   * Used to log in with social login provider directly without visiting the login page\n   * @param payload\n   * @param payload.type - the direct login type (direct, social-login, custom-social-login)\n   * @param payload.data - the direct login data (for direct it's saml url request, for social-login it's the provider name, for custom-social-login it's the provider entity id)\n   */\n  directLoginAction(payload: { type: string; data: string }): 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\nexport type RegionConfig = {\n  key: string;\n  baseUrl: string;\n  clientId: string;\n  applicationId?: string;\n};\n\ntype FronteggNativeStandardOptions = {\n  baseUrl: string;\n  clientId: string;\n  applicationId?: string;\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 = (\n  | FronteggNativeStandardOptions\n  | FronteggNativeRegionOptions\n) & {\n  /**\n   * Weather to handle login with social login in external browser.\n   * If set to false, the plugin will navigate to the social login page with application webview.\n   *\n   * NOTE: some of the social login providers prevent login from embedded webview.\n   *\n   *  @default true\n   */\n  handleLoginWithSocialLogin?: boolean;\n  /**\n   *  Weather to handle login with SSO in external browser.\n   *  If set to false, the plugin will navigate to the sso page with application webview.\n   *\n   *  @default false\n   */\n  handleLoginWithSSO?: boolean;\n  /**\n   * Weather to use the assetlinks to for oauth/callback, this is the default behavior.\n   * disabling this will cause the plugin to use custom url scheme for oauth/callback.\n   *\n   * NOTE: custom url scheme require user interaction to return to the app.\n   * @default true\n   */\n  useAssetLinks?: boolean;\n\n  /**\n   * Weather to To enable social login via Chrome Custom Tabs, set the useChromeCustomTabs flag to true.\n   * By default, the SDK uses the Chrome browser for social login.\n   *\n   * NOTE: custom url scheme require user interaction to return to the app.\n   * @default true\n   */\n  useChromeCustomTabs?: 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

@@ -39,7 +39,8 @@ public class FronteggNativePlugin: CAPPlugin {
                     regions.append(RegionConfig(
                         key: dict["key"]!,
                         baseUrl: dict["baseUrl"]!,
-                        clientId: dict["clientId"]!
+                        clientId: dict["clientId"]!,
+                        applicationId: dict["applicationId"]
                     ))
                 }
             }
@@ -57,6 +58,7 @@ public class FronteggNativePlugin: CAPPlugin {
                let clientId = config.getString("clientId") {
                 fronteggApp.manualInit(baseUrl: baseUrl,
                                        cliendId: clientId,
+                                       applicationId: config.getString("applicationId"),
                                        handleLoginWithSocialLogin: handleLoginWithSocialLogin,
                                        handleLoginWithSSO: handleLoginWithSSO)
             }else {
@@ -116,21 +118,22 @@ public class FronteggNativePlugin: CAPPlugin {
     }
 
 
-    func regionToJson(_ region: RegionConfig?) -> [String:String]? {
+    func regionToJson(_ region: RegionConfig?) -> [String:String?]? {
 
         if let reg = region {
             return [
                 "baseUrl": reg.baseUrl,
                 "clientId": reg.clientId,
+                "applicationId": reg.applicationId,
                 "key": reg.key
             ]
         }else {
             return nil
         }
     }
-    func regionsToJson(_ regions: [RegionConfig]) -> [[String:String]] {
+    func regionsToJson(_ regions: [RegionConfig]) -> [[String:String?]] {
 
-        var regionData: [[String:String]] = []
+        var regionData: [[String:String?]] = []
         regions.forEach { reg in
             if let region = regionToJson(reg) {
                 regionData.append(region)
@@ -144,6 +147,7 @@ public class FronteggNativePlugin: CAPPlugin {
         call.resolve([
             "baseUrl": fronteggApp.baseUrl,
             "clientId": fronteggApp.clientId,
+            "applicationId": fronteggApp.applicationId as Any,
             "bundleId": Bundle.main.bundleIdentifier!,
             "isRegional": fronteggApp.auth.isRegional,
             "regionData": regionsToJson(fronteggApp.auth.regionData)

package/package.json

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