Skip to content
This repository was archived by the owner on Jul 15, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ Packages.dgml
Release
sdk-build.log
project.lock.json
winsdkfb/winsdkfb_uwp/UpgradeLog.htm
2 changes: 1 addition & 1 deletion samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ BOOL MainPage::DidGetAllRequestedPermissions(
BOOL success = FALSE;
FBAccessTokenData^ data = FBSession::ActiveSession->AccessTokenData;

if (data)
if (data && data->DeclinedPermissions)
{
success = !data->DeclinedPermissions->Values->Size;
}
Expand Down
2 changes: 1 addition & 1 deletion samples/LoginCpp-UWP/LoginCpp/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="FBApplicationId" xml:space="preserve">
<value>1606735379540755</value>
<value>519296541448237</value>
<comment>Facebook Application ID</comment>
</data>
<data name="FBWindowsAppId" xml:space="preserve">
Expand Down
11 changes: 11 additions & 0 deletions winsdkfb/winsdkfb/winsdkfb.Shared/FacebookAccessTokenData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ FBAccessTokenData::FBAccessTokenData(
#ifdef _DEBUG
DebugPrintExpirationTime();
#endif

std::wstring wsAccessToken(AccessToken->Data());
_graphDomain = (wsAccessToken.substr(0, 2) == L"GG") ? L"gaming" : L"facebook";
}

FBAccessTokenData::FBAccessTokenData(
Expand All @@ -64,13 +67,21 @@ FBAccessTokenData::FBAccessTokenData(
Vector<String^>^ v = ref new Vector<String^>(0);
_grantedPermissions = ref new FBPermissions(v->GetView());
_declinedPermissions = ref new FBPermissions(v->GetView());

std::wstring wsAccessToken(AccessToken->Data());
_graphDomain = (wsAccessToken.substr(0, 2) == L"GG") ? L"gaming" : L"facebook";
}

String^ FBAccessTokenData::AccessToken::get()
{
return _accessToken;
}

String^ FBAccessTokenData::GraphDomain::get()
{
return _graphDomain;
}

DateTime FBAccessTokenData::ExpirationDate::get()
{
return _expirationDate;
Expand Down
9 changes: 9 additions & 0 deletions winsdkfb/winsdkfb/winsdkfb.Shared/FacebookAccessTokenData.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ namespace winsdkfb
Platform::String^ get();
}

/**
* Graph domain should be used for current access token.
*/
property Platform::String^ GraphDomain
{
Platform::String^ get();
}

/**
* Expiration date of the access token.
*/
Expand Down Expand Up @@ -119,6 +127,7 @@ namespace winsdkfb
#endif

Platform::String^ _accessToken;
Platform::String^ _graphDomain;
Windows::Foundation::DateTime _expirationDate;
FBPermissions^ _grantedPermissions;
FBPermissions^ _declinedPermissions;
Expand Down
15 changes: 14 additions & 1 deletion winsdkfb/winsdkfb/winsdkfb.Shared/FacebookClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ Uri^ FBClient::PrepareRequestUri(
PropertySet^ parameters
)
{
String^ graphDomain = L"facebook";
FBSession^ sess = FBSession::ActiveSession;
GraphUriBuilder^ uriBuilder = ref new GraphUriBuilder(path);

if (parameters == nullptr)
{
Expand Down Expand Up @@ -427,11 +427,24 @@ Uri^ FBClient::PrepareRequestUri(
sess->AccessTokenData->AccessToken);
}

// For applications using Facebook Login for Gaming, graph API requests
// should be sent to different graph domain: graph.fb.gg
if (parametersWithoutMediaObjects->HasKey("access_token"))
{
String^ accessToken = safe_cast<String^>(parametersWithoutMediaObjects->Lookup("access_token"));
std::wstring wsAccessToken(accessToken->Data());
if ((wsAccessToken.substr(0, 2) == L"GG"))
{
graphDomain = L"gaming";
}
}

if (parametersWithoutMediaObjects->HasKey("format"))
{
parametersWithoutMediaObjects->Insert("format", "json-strings");
}

GraphUriBuilder^ uriBuilder = ref new GraphUriBuilder(path, graphDomain);
SerializeParameters(parametersWithoutMediaObjects);

// Add remaining parameters to query string. Note that parameters that
Expand Down
16 changes: 13 additions & 3 deletions winsdkfb/winsdkfb/winsdkfb.Shared/FacebookSession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,16 @@ task<FBResult^> FBSession::GetUserInfo(
)
{
PropertySet^ parameters = ref new PropertySet();
parameters->Insert(L"fields",
L"gender,link,first_name,last_name,locale,timezone,email,updated_time,verified,name,id,picture");
if (TokenData->GraphDomain == L"gaming")
{
parameters->Insert(L"fields", L"link,email,name,id,picture");
}
else
{
parameters->Insert(L"fields",
L"gender,link,first_name,last_name,locale,timezone,email,updated_time,verified,name,id,picture");
}

FBSingleValue^ value = ref new FBSingleValue(
"/me",
parameters,
Expand Down Expand Up @@ -1326,7 +1334,9 @@ int FBSession::APIMinorVersion::get()
void FBSession::SaveGrantedPermissions()
{
auto values =FBSession::DataContainer->Values;
values->Insert(GRANTED_PERMISSIONS_KEY, AccessTokenData->GrantedPermissions->ToString());
if (AccessTokenData->GrantedPermissions != nullptr) {
values->Insert(GRANTED_PERMISSIONS_KEY, this->_AccessTokenData->GrantedPermissions->ToString());
}
}

String^ FBSession::GetGrantedPermissions()
Expand Down
6 changes: 5 additions & 1 deletion winsdkfb/winsdkfb/winsdkfb.Shared/GraphUriBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ using namespace Windows::Foundation::Collections;
using namespace winsdkfb;


GraphUriBuilder::GraphUriBuilder(String^ path)
GraphUriBuilder::GraphUriBuilder(String^ path, String^ graphDomain)
:
_queryParams { ref new PropertySet() }
{
Expand All @@ -45,6 +45,10 @@ GraphUriBuilder::GraphUriBuilder(String^ path)
if (buildDomain)
{
String^ domain = L"https://graph.facebook.com/";
if (graphDomain == L"gaming")
{
domain = L"https://graph.fb.gg/";
}
testUri = ref new Uri(domain + path);
}
_host = testUri->Host;
Expand Down
2 changes: 1 addition & 1 deletion winsdkfb/winsdkfb/winsdkfb.Shared/GraphUriBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace winsdkfb
public ref class GraphUriBuilder sealed
{
public:
GraphUriBuilder(Platform::String^ path);
GraphUriBuilder(Platform::String^ path, Platform::String^ graphDomain);

Windows::Foundation::Uri^ MakeUri();
void AddQueryParam(Platform::String^ query, Platform::String^ param);
Expand Down