Skip to content

Commit

Permalink
Upgrade Frontegg Native SDKs, Add support for loginHint in login acti…
Browse files Browse the repository at this point in the history
…on, Login promise now waiting until login process finished
  • Loading branch information
frontegg-david committed Nov 1, 2024
1 parent 8bacbcf commit 42dfc06
Show file tree
Hide file tree
Showing 13 changed files with 87 additions and 12,089 deletions.
2 changes: 1 addition & 1 deletion FronteggIonicCapacitor.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.22"
s.swift_version = '5.1'
s.pod_target_xcconfig = {
'CODE_SIGNING_ALLOWED' => 'YES'
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.25'
implementation 'com.frontegg.sdk:android:1.2.27'

testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 17 additions & 12 deletions android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand All @@ -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();
Expand All @@ -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;
Expand All @@ -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
Expand Down
Loading

0 comments on commit 42dfc06

Please sign in to comment.