Skip to content

Commit dfe292a

Browse files
committed
added sdk specific integration for epic auth in sequence login window
1 parent 57a1c40 commit dfe292a

File tree

8 files changed

+28
-22
lines changed

8 files changed

+28
-22
lines changed

Config/DefaultEngine.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bOffsetPlayerGamepadIds=False
1212
GameInstanceClass=/Script/Engine.GameInstance
1313
GameDefaultMap=/Game/StarterContent/Maps/Minimal_Default.Minimal_Default
1414
ServerDefaultMap=/Engine/Maps/Entry.Entry
15-
GlobalDefaultGameMode=/SequencePlugin/Boilerplates/GM_SequenceDemo.GM_SequenceDemo_C
15+
GlobalDefaultGameMode=/Game/Sequence/GM_SequenceUnreal.GM_SequenceUnreal_C
1616
GlobalDefaultServerGameMode=None
1717

1818
[/Script/MacTargetPlatform.XcodeProjectSettings]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:97825a79050014dd1a1e5dd16e5dc38c970f676633f6b349a30accff8bcb6295
3+
size 19991
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:5e88b2311e335108a1d86622617f6b1016d22f1d45d4b95f322585135844f113
3+
size 59188
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:2f17183a09d4fbbdca7c382edf9c45283f5bd296578d9292792aed459873729e
3+
size 126095
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:c076a1235be7b8f568c856239b46f2c417b478b02b7eef716db2f136d32da3d5
3+
size 16735
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:34992ed592f47a907d96ebe10d0bc2e588422976f723409fb1740ff0cdb06424
3-
size 610977
2+
oid sha256:867bb618110e336d113b6c8416fc685bef41b1649776513501ecbde693540037
3+
size 677262

Source/SequenceUnreal/Private/EOSManager.cpp

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,12 @@ void UEOSManager::LoginWithEpicAccountServices(FOnCallback OnSuccess, FOnCallbac
9898
});
9999
}
100100

101-
void UEOSManager::CopyEpicAccountAccessToken(FOnCallbackValue OnSuccess, FOnCallback OnFailure)
101+
FString UEOSManager::CopyEpicAccountAccessToken()
102102
{
103103
if (!this->EpicAccountId)
104104
{
105105
UE_LOG(LogTemp, Error, TEXT("Failed to get Access Token. Epic Account Id is null."));
106-
OnFailure.ExecuteIfBound();
107-
return;
106+
return TEXT("");
108107
}
109108

110109
EOS_Auth_CopyUserAuthTokenOptions TokenOptions
@@ -120,14 +119,12 @@ void UEOSManager::CopyEpicAccountAccessToken(FOnCallbackValue OnSuccess, FOnCall
120119
const FString AccessToken = FString(AuthToken->AccessToken);
121120
UE_LOG(LogTemp, Log, TEXT("Epic Account Services Access Token: %s"), *AccessToken);
122121

123-
OnSuccess.ExecuteIfBound(AccessToken);
124122
EOS_Auth_Token_Release(AuthToken);
123+
return AccessToken;
125124
}
126-
else
127-
{
128-
UE_LOG(LogTemp, Error, TEXT("Failed to copy user auth token: %s"), *FString(EOS_EResult_ToString(Result)));
129-
OnFailure.ExecuteIfBound();
130-
}
125+
126+
UE_LOG(LogTemp, Error, TEXT("Failed to copy user auth token: %s"), *FString(EOS_EResult_ToString(Result)));
127+
return TEXT("");
131128
}
132129

133130
// EOS Connect Services
@@ -203,7 +200,7 @@ void UEOSManager::LoginWithConnectServices(const FString& ExternalToken, FOnCall
203200
});
204201
}
205202

206-
void UEOSManager::CopyConnectIdToken(FOnCallbackValue OnSuccess, FOnCallback OnFailure)
203+
FString UEOSManager::CopyConnectIdToken()
207204
{
208205
EOS_Connect_CopyIdTokenOptions Options = {};
209206
Options.ApiVersion = EOS_CONNECT_COPYIDTOKEN_API_LATEST;
@@ -217,14 +214,12 @@ void UEOSManager::CopyConnectIdToken(FOnCallbackValue OnSuccess, FOnCallback OnF
217214
const FString Jwt = UTF8_TO_TCHAR(IdToken->JsonWebToken);
218215
UE_LOG(LogTemp, Log, TEXT("Connect Services Id Token: %s"), *Jwt);
219216

220-
OnSuccess.ExecuteIfBound(Jwt);
221217
EOS_Connect_IdToken_Release(IdToken);
218+
return Jwt;
222219
}
223-
else
224-
{
225-
UE_LOG(LogTemp, Error, TEXT("Failed to copy ID token: %s"), *FString(EOS_EResult_ToString(Result)));
226-
OnFailure.ExecuteIfBound();
227-
}
220+
221+
UE_LOG(LogTemp, Error, TEXT("Failed to copy ID token: %s"), *FString(EOS_EResult_ToString(Result)));
222+
return TEXT("");
228223
}
229224

230225
char* UEOSManager::GetConfigValue(const FString& Key)

Source/SequenceUnreal/Public/EOSManager.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class SEQUENCEUNREAL_API UEOSManager : public UObject
1414
{
1515
GENERATED_BODY()
1616

17-
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnCallbackValue, const FString&, Value);
1817
DECLARE_DYNAMIC_DELEGATE(FOnCallback);
1918

2019
public:
@@ -42,7 +41,7 @@ class SEQUENCEUNREAL_API UEOSManager : public UObject
4241
void LoginWithEpicAccountServices(FOnCallback OnSuccess, FOnCallback OnFailure);
4342

4443
UFUNCTION(BlueprintCallable, Category="0xSequence SDK")
45-
void CopyEpicAccountAccessToken(FOnCallbackValue OnSuccess, FOnCallback OnFailure);
44+
FString CopyEpicAccountAccessToken();
4645

4746
private:
4847
EOS_HAuth EosAuth = nullptr;
@@ -57,7 +56,7 @@ class SEQUENCEUNREAL_API UEOSManager : public UObject
5756
void LoginWithConnectServices(const FString& ExternalToken, FOnCallback OnSuccess, FOnCallback OnFailure);
5857

5958
UFUNCTION(BlueprintCallable, Category="0xSequence SDK")
60-
void CopyConnectIdToken(FOnCallbackValue OnSuccess, FOnCallback OnFailure);
59+
FString CopyConnectIdToken();
6160

6261
private:
6362
EOS_HConnect EosConnect = nullptr;

0 commit comments

Comments
 (0)