Skip to content

Commit

Permalink
fix: updated event handler for custom tab dismiss event on android an…
Browse files Browse the repository at this point in the history 
…d ios
  • Loading branch information
@YermekG
YermekG committed Jan 10, 2024
1 parent bbed0b3 commit 848800d
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 111 deletions.
Binary file modified Content/PackagedResources/index.uasset
View file
Binary file not shown.
50 changes: 26 additions & 24 deletions Source/Immutable/Private/Immutable/Android/ImmutableAndroidJNI.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,42 @@
#include "ImmutableAndroidJNI.h"

#if PLATFORM_ANDROID

#include "Immutable/ImmutablePassport.h"
#include "Immutable/ImmutableSubsystem.h"
#include "Engine/GameEngine.h"


#if PLATFORM_ANDROID

const UImmutablePassport* GetPassport()
UImmutablePassport* GetPassport()
{
if (!GEngine)
{
return nullptr;
}
UGameEngine* GameEngine = Cast<UGameEngine>(GEngine);

if (!GameEngine)
{
return nullptr;
}

const auto GameWorld = GEngine->GetWorld();
UWorld* World = GameEngine ? GameEngine->GetGameWorld() : NULL;

if (!GameWorld)
{
return nullptr;
}
if (!World)
{
return nullptr;
}

auto ImmutableSubsystem = GameWorld->GetGameInstance()->GetSubsystem<UImmutableSubsystem>();
auto ImmutableSubsystem = World->GetGameInstance()->GetSubsystem<UImmutableSubsystem>();

if (!ImmutableSubsystem)
{
return nullptr;
}
if (!ImmutableSubsystem)
{
return nullptr;
}

auto Passport = ImmutableSubsystem->GetPassport();
auto Passport = ImmutableSubsystem->GetPassport();

if (!Passport.IsValid())
{
return nullptr;
}
if (!Passport.IsValid())
{
return nullptr;
}

return Passport.Get();
return Passport.Get();
}

JNI_METHOD void Java_com_epicgames_unreal_GameActivity_handleDeepLink(JNIEnv *env, jobject obj, jstring jDeeplink)
Expand Down
165 changes: 79 additions & 86 deletions Source/Immutable/Private/Immutable/ImmutablePassport.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ void UImmutablePassport::ConnectPKCE(const FImtblPassportResponseDelegate &Respo
#endif

PKCEResponseDelegate = ResponseDelegate;
CallJS(ImmutablePassportAction::GetPKCEAuthUrl, TEXT(""), PKCEResponseDelegate, FImtblJSResponseDelegate::CreateUObject(this, &UImmutablePassport::OnGetPKCEAuthUrlResponse));
CallJS(ImmutablePassportAction::GetPKCEAuthUrl, TEXT(""), PKCEResponseDelegate,
FImtblJSResponseDelegate::CreateUObject(this, &UImmutablePassport::OnGetPKCEAuthUrlResponse));
}
#endif

Expand Down Expand Up @@ -392,8 +393,6 @@ void UImmutablePassport::OnLogoutResponse(FImtblJSResponse Response)
{
if (auto ResponseDelegate = GetResponseDelegate(Response))
{
FString Msg;

if (Response.success)
{
IMTBL_LOG("Logged out.")
Expand All @@ -404,29 +403,47 @@ void UImmutablePassport::OnLogoutResponse(FImtblJSResponse Response)
Response.JsonObject->TryGetStringField(TEXT("result"), Url);
if (!Url.IsEmpty())
{
#if PLATFORM_WINDOWS
FPlatformProcess::LaunchURL(*Url, nullptr, &Err);
if (Err.Len())
#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
if (IsPKCEConnected)
{
Msg = "Failed to connect to Browser: " + Err;
IMTBL_ERR("%s", *Msg);
ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{ false, Msg, Response });
return;
}
#elif PLATFORM_ANDROID
LaunchAndroidUrl(Url);
PKCELogoutResponseDelegate = ResponseDelegate.GetValue();
#if PLATFORM_ANDROID
LaunchAndroidUrl(Url);
#elif PLATFORM_IOS || PLATFORM_MAC
[[ImmutableIOS instance] launchUrl:TCHAR_TO_ANSI(*Url)];
[[ImmutableIOS instance] launchUrl:TCHAR_TO_ANSI(*Url)];
#endif
}
else
{
#endif
FPlatformProcess::LaunchURL(*Url, nullptr, &Err);
if (Err.Len())
{
FString Msg = "Failed to connect to Browser: " + Err;
IMTBL_ERR("%s", *Msg);
ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{ false, Msg, Response });
return;
}

ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{ Response.success, "Logged out" });
#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
}
#endif
}
else
{
ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{ false, "Logout Url is empty", Response });
}
bIsLoggedIn = false;
}
else
{
FString Msg = Response.Error.IsSet() ? Response.Error->ToString() : Response.JsonObject->GetStringField(TEXT("error"));

ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{ Response.success, Msg, Response });

IMTBL_ERR("Error logging out.")
Response.Error.IsSet() ? Msg = Response.Error->ToString() : Msg = Response.JsonObject->GetStringField(TEXT("error"));
}
ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{ Response.success, Msg, Response });
}
}

Expand Down Expand Up @@ -497,7 +514,6 @@ void UImmutablePassport::OnConnectEvmResponse(FImtblJSResponse Response)
}

#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
// private async UniTask LaunchAuthUrl()
void UImmutablePassport::OnGetPKCEAuthUrlResponse(FImtblJSResponse Response)
{
if (PKCEResponseDelegate.IsBound())
Expand All @@ -514,8 +530,6 @@ void UImmutablePassport::OnGetPKCEAuthUrlResponse(FImtblJSResponse Response)
// Handle deeplink calls
OnHandleDeepLink = FImtblPassportHandleDeepLinkDelegate::CreateUObject(this, &UImmutablePassport::OnDeepLinkActivated);

FString Err;

Msg = Response.JsonObject->GetStringField(TEXT("result")).Replace(TEXT(" "), TEXT("+"));
#if PLATFORM_ANDROID
OnPKCEDismissed = FImtblPassportOnPKCEDismissedDelegate::CreateUObject(this, &UImmutablePassport::HandleOnLoginPKCEDismissed);
Expand All @@ -526,47 +540,44 @@ void UImmutablePassport::OnGetPKCEAuthUrlResponse(FImtblJSResponse Response)
#elif PLATFORM_MAC
[[ImmutableMac instance] launchUrl:TCHAR_TO_ANSI(*Msg) forRedirectUri:TCHAR_TO_ANSI(*InitData.redirectUri)];
#endif

if (Err.Len())
{
Msg = "Failed to connect to Browser: " + Err;
IMTBL_ERR("%s", *Msg);
bSuccess = false;
}
else
{
return;
}
}
#if PLATFORM_IOS || PLATFORM_MAC
PKCEResponseDelegate.ExecuteIfBound(FImmutablePassportResult{ bSuccess, Msg });
PKCEResponseDelegate = nullptr;
#endif
}
else
{
IMTBL_ERR("Unable to return a response for Connect PKCE");
}
}

void UImmutablePassport::OnConnectPKCEResponse(FImtblJSResponse Response) {
if (PKCEResponseDelegate.IsBound()) {
FString Msg;
if (Response.success) {
IMTBL_LOG("Successfully connected via PKCE")
bIsLoggedIn = true;
} else {
IMTBL_WARN("Connect PKCE attempt failed.");
Response.Error.IsSet()
? Msg = Response.Error->ToString()
: Msg = Response.JsonObject->GetStringField(TEXT("error"));
}
PKCEResponseDelegate.ExecuteIfBound(
FImmutablePassportResult{Response.success, Msg});
PKCEResponseDelegate = nullptr;
} else {
IMTBL_ERR("Unable to return a response for Connect PKCE");
}
void UImmutablePassport::OnConnectPKCEResponse(FImtblJSResponse Response)
{
if (PKCEResponseDelegate.IsBound())
{
FString Msg;

if (Response.success)
{
IMTBL_LOG("Successfully connected via PKCE")
bIsLoggedIn = true;
IsPKCEConnected = true;
}
else
{
IMTBL_WARN("Connect PKCE attempt failed.");
Response.Error.IsSet() ? Msg = Response.Error->ToString() : Msg = Response.JsonObject->GetStringField(TEXT("error"));
}
PKCEResponseDelegate.ExecuteIfBound(FImmutablePassportResult{Response.success, Msg});
PKCEResponseDelegate = nullptr;
}
else
{
IMTBL_ERR("Unable to return a response for Connect PKCE");
}
#if PLATFORM_ANDROID
completingPKCE = false;
completingPKCE = false;
#endif
}
#endif
Expand Down Expand Up @@ -894,7 +905,7 @@ void UImmutablePassport::CompleteLoginPKCEFlow(FString Url)
completingPKCE = true;
#endif

// Get code and state from deeplink URL
// Get code and state from deeplink URL
TOptional<FString> Code, State;
FString Endpoint, Params;
Url.Split(TEXT("?"), &Endpoint, &Params);
Expand Down Expand Up @@ -981,12 +992,28 @@ void UImmutablePassport::HandleOnLoginPKCEDismissed()
}
}

void UImmutablePassport::HandleCustomTabsDismissed(FString Url) const
void UImmutablePassport::HandleCustomTabsDismissed(FString Url)
{
IMTBL_LOG("On PKCE Dismissed");

if (!Url.StartsWith(LoginPKCEUrl))
// Dismiss routine for logout
IMTBL_LOG("PKCE received url %s", *Url);

TOptional<FString> Parameter = FGenericPlatformHttp::GetUrlParameter(Url, TEXT("resultTo"));

if (Parameter.IsSet())
{
IMTBL_LOG("PKCE received url resultTo parameter %s", *Parameter.GetValue());
}
if (IsPKCEConnected)
{
if (PKCELogoutResponseDelegate.IsBound())
{
PKCELogoutResponseDelegate.ExecuteIfBound(FImmutablePassportResult{ true, "Logged out" });
PKCELogoutResponseDelegate = nullptr;
}
IsPKCEConnected = false;

return;
}

Expand All @@ -1006,26 +1033,6 @@ void UImmutablePassport::CallJniStaticVoidMethod(JNIEnv *Env, const jclass Class
Env->DeleteLocalRef(Class);
}

// class AndroidPKCECallback
// {
// private UImmutablePassport* ImmutablePassport = nullptr;
//
// public AndroidPKCECallback(UImmutablePassport* callback)
// {
// this.callback = callback;
// }
//
// void onCustomTabsDismissed(FString url)
// {
// // To differentiate what triggered this
// // if (url == PassportImpl.loginPKCEUrl)
// {
// // Custom tabs dismissed for login flow
// ImmutablePassport->HandleOnLoginPKCEDismissed(PassportImpl.completingPKCE);
// }
// }
// }

void UImmutablePassport::LaunchAndroidUrl(FString Url)
{
if (JNIEnv *Env = FAndroidApplication::GetJavaEnv())
Expand All @@ -1038,17 +1045,3 @@ void UImmutablePassport::LaunchAndroidUrl(FString Url)
}
}
#endif

// void UImmutablePassport::OnReady(const FOnPassportReadyDelegate::FDelegate&
// Delegate)
// {
// if (JSConnector->IsBridgeReady())
// {
// // TODO: run on next tick rather than immediately
// Delegate.ExecuteIfBound();
// }
// else
// {
// OnPassportReady.Add(Delegate);
// }
// }
4 changes: 3 additions & 1 deletion Source/Immutable/Public/Immutable/ImmutablePassport.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ class IMMUTABLE_API UImmutablePassport : public UObject

#if PLATFORM_ANDROID
void HandleDeepLink(FString DeepLink) const;
void HandleCustomTabsDismissed(FString Url) const;
void HandleCustomTabsDismissed(FString Url);
#elif PLATFORM_IOS | PLATFORM_MAC
void HandleDeepLink(NSString* sDeepLink) const;
#endif
Expand Down Expand Up @@ -545,6 +545,8 @@ class IMMUTABLE_API UImmutablePassport : public UObject
// Since the second part of PKCE is triggered by deep links, saving the
// response delegate here so it's easier to get
FImtblPassportResponseDelegate PKCEResponseDelegate;
FImtblPassportResponseDelegate PKCELogoutResponseDelegate;
bool IsPKCEConnected = false;
#endif

// Ensures that Passport has been initialized before calling JS
Expand Down

0 comments on commit 848800d

Please sign in to comment.