Merge pull request #63 from frontegg/upgrade-native-sdk

Upgrade Frontegg Native SDKs, Add support for loginHint in login action, Login promise now waiting until login process finished

Author: dianaKhortiuk-frontegg

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.21"
+  s.dependency "FronteggSwift", "1.2.23"
   s.swift_version = '5.1'
   s.pod_target_xcconfig = {
     'CODE_SIGNING_ALLOWED' => 'YES'

android/build.gradle

@@ -19,10 +19,10 @@ apply plugin: 'com.android.library'
 
 android {
     namespace "com.frontegg.ionic"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -52,10 +52,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    implementation "androidx.browser:browser:1.5.0"
+    implementation "androidx.browser:browser:1.8.0"
     implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
     implementation 'com.google.code.gson:gson:2.10'
-    implementation 'com.frontegg.sdk:android:1.2.25'
+    implementation 'com.frontegg.sdk:android:1.2.28'
 
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

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

@@ -113,7 +113,8 @@ public void load() {
                 auth.isAuthenticated().getObservable(),
                 auth.isLoading().getObservable(),
                 auth.getInitializing().getObservable(),
-                auth.getShowLoader().getObservable()
+                auth.getShowLoader().getObservable(),
+                auth.getRefreshingToken().getObservable()
         ).subscribe(nullableObject -> {
             debouncer.debounce(this::sendEvent);
         });
@@ -135,6 +136,7 @@ private JSObject getData() {
         boolean isLoading = auth.isLoading().getValue();
         boolean initializing = auth.getInitializing().getValue();
         boolean showLoader = auth.getShowLoader().getValue();
+        boolean refreshingToken = auth.getRefreshingToken().getValue();
         RegionConfig selectedRegion = auth.getSelectedRegion();
 
         JSObject data = new JSObject();
@@ -148,6 +150,7 @@ private JSObject getData() {
         data.put("isLoading", isLoading);
         data.put("initializing", initializing);
         data.put("showLoader", showLoader);
+        data.put("refreshingToken", refreshingToken);
         data.put("selectedRegion", Parser.regionToJSONObject(selectedRegion));
 
         return data;
@@ -156,8 +159,11 @@ private JSObject getData() {
 
     @PluginMethod
     public void login(PluginCall call) {
-        FronteggApp.Companion.getInstance().getAuth().login(this.getActivity());
-        call.resolve();
+        String loginHint = call.getString("loginHint");
+        FronteggApp.Companion.getInstance().getAuth().login(this.getActivity(), loginHint, ()-> {
+            call.resolve();
+            return null;
+        });
     }
 
     @PluginMethod

example/android/app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 
-def fronteggDomain = "auth.davidantoon.me"
+def fronteggDomain = "autheu.davidantoon.me"
 def fronteggClientId = "b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca"
 
 android {
@@ -50,6 +50,7 @@ dependencies {
   implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
   implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
   implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
+
   implementation project(':capacitor-android')
   testImplementation "junit:junit:$junitVersion"
   androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

example/android/build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.0.0'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.gms:google-services:4.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/capacitor.config.ts

@@ -9,17 +9,15 @@ const config: CapacitorConfig = {
   },
   plugins:{
     FronteggNative:{
-      // baseUrl:"https://auth.davidantoon.me",
-      // clientId:"b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca",
       useChromeCustomTabs:true,
       useAssetLinks:true,
       regions:[{
-        key: 'eu1',
-        baseUrl: 'https://auth.davidantoon.me',
+        key: 'EU',
+        baseUrl: 'https://autheu.davidantoon.me',
         clientId: 'b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca'
       }, {
-        key: 'us',
-        baseUrl: 'https://davidprod.frontegg.com',
+        key: 'US',
+        baseUrl: 'https://authus.frontegg.com',
         clientId: 'd7d07347-2c57-4450-8418-0ec7ee6e096b'
       }]
     }

example/ios/App/App/App.entitlements

@@ -2,10 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>webcredentials:auth.davidantoon.me</string>
-		<string>applinks:auth.davidantoon.me</string>
+		<string>webcredentials:autheu.davidantoon.me</string>
+		<string>webcredentials:davidantoon.me</string>
+		<string>applinks:autheu.davidantoon.me</string>
 	</array>
 </dict>
 </plist>

example/ios/App/App/Frontegg-Multi.plist

@@ -6,17 +6,17 @@
     <array>
         <dict>
             <key>key</key>
-            <string>eu</string>
+            <string>EU</string>
             <key>baseUrl</key>
-            <string>https://auth.davidantoon.me</string>
+            <string>https://autheu.davidantoon.me</string>
             <key>clientId</key>
             <string>b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca</string>
         </dict>
         <dict>
             <key>key</key>
-            <string>us</string>
+            <string>US</string>
             <key>baseUrl</key>
-            <string>https://davidprod.frontegg.com</string>
+            <string>https://authus.frontegg.com</string>
             <key>clientId</key>
             <string>d7d07347-2c57-4450-8418-0ec7ee6e096b</string>
         </dict>