Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit c459640

Browse files
committed
Merge branch 'master' of https://github.com/xamarin/Xamarin.Auth
# Conflicts: # source/Extensions/Xamarin.Auth.Extensions.NetStandard16/Xamarin.Auth.Extensions.NetStandard16.csproj # source/XamarinForms/Xamarin.Auth.Forms.NetStandard16/Xamarin.Auth.Forms.NetStandard16.csproj
2 parents 00e1282 + c832058 commit c459640

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed

build.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
158158
if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
159159
($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
160160
Write-Verbose -Message "Missing or changed package.config hash..."
161-
Remove-Item * -Recurse -Exclude packages.config,nuget.exe
161+
Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
162+
Remove-Item -Recurse
162163
}
163164

164165
Write-Verbose -Message "Restoring tools from NuGet..."

docs/details/issues/open/native-ui-android-customtabs-close.md

+18-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,21 @@ custom tab to open (in the app) and close automatically after the authentication
1212
(for Google) has been received.
1313
1414
LaunchMode on my activity to SingleTask and NoHistory to false.
15-
```
15+
```
16+
17+
18+
https://stackoverflow.com/questions/45350947/xamarin-auth-android-chrome-custom-tabs-doesnt-close-on-redirect
19+
20+
You can go back to your app if you add this code to the end of OnCreate method in
21+
the class that captures the Redirect (CustomUrlSchemeInterceptorActivity) in
22+
Xamarin.Auth example in Android
23+
24+
new Task
25+
(
26+
() =>
27+
{
28+
StartActivity(new Intent(Application.Context,typeof(MainActivity)));
29+
}
30+
).Start();
31+
32+
Where MainActivity is the name of your main Activity class in Android.

docs/details/setup-server-side-oauth-providers/facebook.md

+15
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ WORK IN PROGRESS - CONSTRUCTION_SITE/BAUSTELLE
88
string redirect_url = $"fb{fb_app_id}://authorize";
99
```
1010

11+
The URL can be found in Facebook SDK implementations
12+
13+
* Android
14+
15+
https://github.com/facebook/facebook-android-sdk/blob/45482361eb182bb3392386182f8f4e6c4896c2b9/facebook-common/src/main/java/com/facebook/CustomTabMainActivity.java#L45
16+
17+
* iOS
18+
19+
https://github.com/facebook/facebook-ios-sdk/blob/f7531a838a1ec3308721f335e801ac9f508feee4/FBSDKLoginKit/FBSDKLoginKitTests/FBSDKLoginManagerTests.m#L51
20+
21+
https://github.com/facebook/facebook-ios-sdk/blob/4b4bd9504d70d99d6c6b1ca670f486ac8f494f17/FBSDKLoginKit/FBSDKLoginKit/Internal/FBSDKLoginUtility.m#L43-L47
22+
23+
24+
25+
1126
## Console - Server Side Setup
1227

1328
### Setup 1

samples/Traditional.Standard/Providers/Xamarin.Auth.Sample.XamarinAndroid/Xamarin.Auth.Sample.XamarinAndroid.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidApplication>True</AndroidApplication>
1616
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1717
<AssemblyName>Xamarin.Auth.Sample.XamarinAndroid</AssemblyName>
18-
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
1919
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2020
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
2121
<RestorePackages>true</RestorePackages>

0 commit comments

Comments
 (0)