Fixes #3862 Support SDK 1.0 in 2.0 topics #3870

01binary · 2017-08-02T15:10:26Z

Can we mark off the steps that require ASP.NET Core 2.0? Did we lose the steps for 1.x?
@RickAndMSFT

Added tabbed snippets like on this page:
https://docs.microsoft.com/en-us/aspnet/core/tutorials/first-web-api?tabs=aspnet1x

Unfortunately docfx cannot preview the tabs, you will have to look at internal build to verify they are working.

Not sure why it says 17 commits, merging just one. I pulled from this repo before making any changes. If you see anything wrong let me know.

Minor clean up - remove future tense. Split up long sentences to help software translators.

dnfclas · 2017-08-02T15:10:31Z

@01binary,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by .NET Foundation. We will now review your pull request.
Thanks,
.NET Foundation Pull Request Bot

Rick-Anderson · 2017-08-02T16:49:52Z

@scottaddie @tdykstra can you advice how to prevent PR from showing previous commits?
Tabs look good.

Rick-Anderson · 2017-08-02T16:50:45Z

@tdykstra @scottaddie Is this OK to merge? The file differences are correct and minimal. If it's OK, can one of you merge this? I'm traveling today.

Rick-Anderson · 2017-08-02T16:51:13Z

Review URL

scottaddie · 2017-08-02T19:00:15Z

aspnetcore/security/authentication/social/facebook-logins.md


 ```csharp
-services.AddFacebookAuthentication(facebookOptions =>
+services.AddFacebookAuthentication(new FacebookOptions()


The 2.0 RTM bits change the code to the following:

```csharp services.AddAuthentication().AddFacebook(o => { o.AppId = Configuration["Authentication:Facebook:AppId"]; o.AppSecret = Configuration["Authentication:Facebook:AppSecret"]; }); ```

Reverting to prev. with named options object for readability

scottaddie · 2017-08-02T19:01:31Z

aspnetcore/security/authentication/social/google-logins.md


 ```csharp
-services.AddGoogleAuthentication(googleOptions =>
+services.AddGoogleAuthentication(new GoogleOptions()


The 2.0 RTM bits change the code to the following:

services.AddAuthentication().AddGoogle(o => { o.ClientId = Configuration["Authentication:Google:ClientId"]; o.ClientSecret = Configuration["Authentication:Google:ClientSecret"]; });

scottaddie · 2017-08-02T19:02:35Z

aspnetcore/security/authentication/social/microsoft-logins.md

+Add the Microsoft Account middleware in the `ConfigureServices` method in `Startup.cs` file:
+
+```csharp
+services.AddMicrosoftAuthentication(new MicrosoftAccountOptions()


The 2.0 RTM bits change the code to the following:

services.AddAuthentication().AddMicrosoftAccount(o => { o.ClientId = Configuration["Authentication:Microsoft:ApplicationId"]; o.ClientSecret = Configuration["Authentication:Microsoft:Password"]; });

scottaddie · 2017-08-02T19:03:22Z

aspnetcore/security/authentication/social/twitter-logins.md


 ```csharp
-services.AddTwitterAuthentication(twitterOptions =>
+services.AddTwitterAuthentication(new TwitterOptions()


The 2.0 RTM bits change the code to the following:

services.AddAuthentication().AddTwitter(o => { o.ConsumerKey = Configuration["Authentication:Twitter:ConsumerKey"]; o.ConsumerSecret = Configuration["Authentication:Twitter:ConsumerSecret"]; });

scottaddie · 2017-08-02T19:04:13Z

aspnetcore/security/authentication/social/facebook-logins.md


-Add the Facebook middleware in the `ConfigureServices` method in the *Startup.cs* file:
+* To install this package with Visual Studio 2017, right-click on the project and select **Manage NuGet Packages**.
+* To install with **dotnet** CLI, execute the following in your project directory:


dotnet CLI --> .NET Core CLI

scottaddie · 2017-08-02T19:06:56Z

aspnetcore/security/authentication/social/twitter-logins.md

+
+# [ASP.NET Core 1.x](#tab/aspnet1x)
+
+Add the Twitter middleware in the `Configure` method in `Startup.cs` file:


Italicize Startup.cs

scottaddie · 2017-08-02T19:07:04Z

aspnetcore/security/authentication/social/twitter-logins.md

+
+# [ASP.NET Core 2.0](#tab/aspnet20)
+
+Add the Twitter middleware in the `ConfigureServices` method in `Startup.cs` file:


Italicize Startup.cs

scottaddie · 2017-08-02T19:07:37Z

aspnetcore/security/authentication/social/microsoft-logins.md

-> See the [MicrosoftOptions](https://github.com/aspnet/Security/blob/dev/src/Microsoft.AspNetCore.Authentication.Microsoft/MicrosoftOptions.cs) class in ASP.NET Core repository for more information on configuration options supported by Microsoft Account middleware. This can be used to request different information about the user.
+# [ASP.NET Core 2.0](#tab/aspnet20)
+
+Add the Microsoft Account middleware in the `ConfigureServices` method in `Startup.cs` file:


Italicize Startup.cs

scottaddie · 2017-08-02T19:08:02Z

aspnetcore/security/authentication/social/google-logins.md

+
+# [ASP.NET Core 2.0](#tab/aspnet20)
+
+Add the Google middleware in the `ConfigureServices` method in `Startup.cs` file:


Italicize Startup.cs

scottaddie · 2017-08-02T19:08:15Z

aspnetcore/security/authentication/social/google-logins.md

@@ -84,25 +84,40 @@ The values for these tokens can be found in the JSON file downloaded in the prev

 ## Configure Google middleware

-Note: The project template used in this tutorial ensures that 
-[Microsoft.AspNetCore.Authentication.Google](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.Google) package is installed.
+The project template used in this tutorial ensures that [Microsoft.AspNetCore.Authentication.Google](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.Google) package is installed.

 * To install this package with Visual Studio 2017, right-click on the project and select **Manage NuGet Packages**.
 * To install with **dotnet** CLI, execute the following in your project directory:


dotnet CLI --> .NET Core CLI

scottaddie · 2017-08-02T19:40:38Z

@Rick-Anderson We may want to consider reverting the merge. The code snippets are incorrect for 2.0 RTM.

01binary · 2017-08-02T21:23:08Z

I got confused with the signature, it is indeed a function returning XXXOptions. That's what I originally tested with before changing to new XXXOptions()

[EDIT]

Oops, didn't see on my phone that this got merged. We should roll back! Does anyone know how? I can do another PR if needed.

01binary · 2017-08-03T14:45:08Z

Allright, cooking another PR, please don't merge it too soon this time.

01binary and others added 17 commits July 26, 2017 23:18

#3753 Update social logins index

a19d39c

#3753 Update facebook logins

976592a

#3753 Update Google logins

4a443c2

#3753 Update Twitter logins

30789dc

#3753 Update Microsoft logins

8ad1d8e

#3753 Combine social and local login accounts screenshot update

d71a9ea

#3753 Fix app name in screenshot

3ad4c02

#3753 QA pass

1a7d9f9

#3753 Put borders on screenshots to replace shadows

0920d62

Update facebook-logins.md

b0e932d

Minor clean up - remove future tense. Split up long sentences to help software translators.

Update facebook-logins.md

205314e

Update google-logins.md

25f67db

Update index.md

17e96d1

#3753 Fix missing anchor

30d68b1

Merge with origin

2744d8f

Merge branch 'master' of https://github.com/aspnet/Docs

2d932bc

#3862 Social snippets by SDK vesion

4788e29

dnfclas added the cla-already-signed label Aug 2, 2017

Rick-Anderson merged commit 88069f5 into dotnet:master Aug 2, 2017

scottaddie self-requested a review August 2, 2017 18:59

scottaddie reviewed Aug 2, 2017

View reviewed changes

01binary mentioned this pull request Aug 3, 2017

Fixes #3862 Support SDK 1.0 in 2.0 topics (revert and fix) #3874

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #3862 Support SDK 1.0 in 2.0 topics #3870

Fixes #3862 Support SDK 1.0 in 2.0 topics #3870

01binary commented Aug 2, 2017

dnfclas commented Aug 2, 2017

Rick-Anderson commented Aug 2, 2017

Rick-Anderson commented Aug 2, 2017

Rick-Anderson commented Aug 2, 2017

scottaddie Aug 2, 2017

01binary Aug 3, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie Aug 2, 2017

scottaddie commented Aug 2, 2017

01binary commented Aug 2, 2017 •

edited

Loading

01binary commented Aug 3, 2017


		# [ASP.NET Core 1.x](#tab/aspnet1x)

		Add the Twitter middleware in the `Configure` method in `Startup.cs` file:


		# [ASP.NET Core 2.0](#tab/aspnet20)

		Add the Twitter middleware in the `ConfigureServices` method in `Startup.cs` file:


		# [ASP.NET Core 2.0](#tab/aspnet20)

		Add the Google middleware in the `ConfigureServices` method in `Startup.cs` file:

Fixes #3862 Support SDK 1.0 in 2.0 topics #3870

Fixes #3862 Support SDK 1.0 in 2.0 topics #3870

Conversation

01binary commented Aug 2, 2017

dnfclas commented Aug 2, 2017

Rick-Anderson commented Aug 2, 2017

Rick-Anderson commented Aug 2, 2017

Rick-Anderson commented Aug 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

scottaddie commented Aug 2, 2017

01binary commented Aug 2, 2017 • edited Loading

01binary commented Aug 3, 2017

01binary commented Aug 2, 2017 •

edited

Loading