diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/HomeController.cs b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/HomeController.cs index 4a791db6..d8741e38 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/HomeController.cs +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/HomeController.cs @@ -16,8 +16,8 @@ public HomeController(ILogger logger) public IActionResult Index() { - if (!new SessionStateCredentialStore(HttpContext.Session).HasAllCredentials()) - return RedirectToAction("Index", "OAuth"); + if (!new OAuth2SessionCredentialStore(HttpContext.Session).HasAllCredentials()) + return RedirectToAction("Index", "OAuth2"); return View(); } diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/OAuth2Controller.cs b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/OAuth2Controller.cs new file mode 100644 index 00000000..8817b6c9 --- /dev/null +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/OAuth2Controller.cs @@ -0,0 +1,75 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Extensions; +using LinqToTwitter.OAuth; +using Microsoft.Extensions.Primitives; +using System.Collections.Generic; + +namespace LinqToTwitter.MVC.CSharp.Controllers +{ + public class OAuth2Controller : Controller + { + private readonly ILogger logger; + + public OAuth2Controller(ILogger logger) + { + this.logger = logger; + } + + public ActionResult Index() + { + return View(); + } + + public async Task BeginAsync() + { + string twitterCallbackUrl = Request.GetDisplayUrl().Replace("Begin", "Complete"); + + var auth = new MvcOAuth2Authorizer + { + CredentialStore = new OAuth2SessionCredentialStore(HttpContext.Session) + { + ClientID = Environment.GetEnvironmentVariable(OAuthKeys.TwitterClientID), + ClientSecret = Environment.GetEnvironmentVariable(OAuthKeys.TwitterClientSecret), + Scopes = new List + { + "tweet.read", + "tweet.write", + "tweet.moderate.write", + "users.read", + "follows.read", + "follows.write", + "offline.access", + "space.read", + "mute.read", + "mute.write", + "like.read", + "like.write", + "block.read", + "block.write" + }, + RedirectUri = twitterCallbackUrl, + } + }; + + return await auth.BeginAuthorizeAsync("MyState"); + } + + public async Task CompleteAsync() + { + var auth = new MvcOAuth2Authorizer + { + CredentialStore = new OAuth2SessionCredentialStore(HttpContext.Session) + }; + + Request.Query.TryGetValue("code", out StringValues code); + Request.Query.TryGetValue("state", out StringValues state); + + await auth.CompleteAuthorizeAsync(code, state); + + return RedirectToAction("Index", "Home"); + } + } +} diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/OAuthController.cs b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/OAuthController.cs index a1652de5..9cce29c0 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/OAuthController.cs +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/OAuthController.cs @@ -8,11 +8,11 @@ namespace LinqToTwitter.MVC.CSharp.Controllers { public class OAuthController : Controller { - private readonly ILogger _logger; + private readonly ILogger logger; public OAuthController(ILogger logger) { - _logger = logger; + this.logger = logger; } public ActionResult Index() @@ -36,7 +36,7 @@ public async Task BeginAsync() //var parameters = new Dictionary { { "my_custom_param", "val" } }; //string twitterCallbackUrl = Request.GetDisplayUrl().Replace("Begin", "Complete"); //return await auth.BeginAuthorizationAsync(new Uri(twitterCallbackUrl), parameters); - + await auth.CredentialStore.ClearAsync(); string twitterCallbackUrl = Request.GetDisplayUrl().Replace("Begin", "Complete"); return await auth.BeginAuthorizationAsync(new Uri(twitterCallbackUrl)); } diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/StatusDemosController.cs b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/TweetDemosController.cs similarity index 52% rename from Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/StatusDemosController.cs rename to Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/TweetDemosController.cs index 4ebb565c..43505bfd 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/StatusDemosController.cs +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Controllers/TweetDemosController.cs @@ -1,4 +1,5 @@ using LinqToTwitter; +using LinqToTwitter.Common; using LinqToTwitter.MVC.CSharp.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; @@ -10,11 +11,11 @@ namespace MvcDemo.Controllers { - public class StatusDemosController : Controller + public class TweetDemosController : Controller { readonly IWebHostEnvironment webHostEnvironment; - public StatusDemosController(IWebHostEnvironment webHostEnvironment) + public TweetDemosController(IWebHostEnvironment webHostEnvironment) { this.webHostEnvironment = webHostEnvironment; } @@ -38,14 +39,14 @@ public ActionResult Tweet() [ActionName("Tweet")] public async Task TweetAsync(SendTweetViewModel tweet) { - var auth = new MvcAuthorizer + var auth = new MvcOAuth2Authorizer { - CredentialStore = new SessionStateCredentialStore(HttpContext.Session) + CredentialStore = new OAuth2SessionCredentialStore(HttpContext.Session) }; var ctx = new TwitterContext(auth); - Status responseTweet = await ctx.TweetAsync(tweet.Text); + Tweet responseTweet = await ctx.TweetAsync(tweet.Text); var responseTweetVM = new SendTweetViewModel { @@ -56,27 +57,44 @@ public async Task TweetAsync(SendTweetViewModel tweet) return View(responseTweetVM); } - [ActionName("HomeTimeline")] - public async Task HomeTimelineAsync() + [ActionName("TweetTimeline")] + public async Task TweetTimelineAsync() { - var auth = new MvcAuthorizer + var auth = new MvcOAuth2Authorizer { - CredentialStore = new SessionStateCredentialStore(HttpContext.Session) + CredentialStore = new OAuth2SessionCredentialStore(HttpContext.Session) }; var ctx = new TwitterContext(auth); - var tweets = + var userQuery = + await + (from usr in ctx.TwitterUser + where usr.Type == UserType.UsernameLookup && + usr.Usernames == "Linq2Twitr" && + usr.UserFields == UserField.ProfileImageUrl + select usr) + .SingleOrDefaultAsync(); + + TwitterUser user = userQuery.Users.FirstOrDefault(); + + var tweetQuery = await - (from tweet in ctx.Status - where tweet.Type == StatusType.Home + (from tweet in ctx.Tweets + where tweet.Type == TweetType.TweetsTimeline && + tweet.ID == user.ID.ToString() + select tweet) + .SingleOrDefaultAsync(); + + var tweets = + (from tweet in tweetQuery.Tweets select new TweetViewModel { - ImageUrl = tweet.User.ProfileImageUrl, - ScreenName = tweet.User.ScreenNameResponse, - Text = tweet.Text + ImageUrl = user.ProfileImageUrl, + ScreenName = user.Name, + Text = tweet.Text }) - .ToListAsync(); + .ToList(); return View(tweets); } @@ -84,12 +102,12 @@ public async Task HomeTimelineAsync() [ActionName("UploadImage")] public async Task UploadImageAsync() { - var auth = new MvcAuthorizer + var auth = new MvcOAuth2Authorizer { - CredentialStore = new SessionStateCredentialStore(HttpContext.Session) + CredentialStore = new OAuth2SessionCredentialStore(HttpContext.Session) }; - var twitterCtx = new TwitterContext(auth); + var ctx = new TwitterContext(auth); string status = $"Testing multi-image tweet #Linq2Twitter £ {DateTime.Now}"; string mediaCategory = "tweet_image"; @@ -102,23 +120,23 @@ public async Task UploadImageAsync() var imageUploadTasks = new List> { - twitterCtx.UploadMediaAsync(System.IO.File.ReadAllBytes(path), "image/jpg", mediaCategory), + ctx.UploadMediaAsync(System.IO.File.ReadAllBytes(path), "image/jpg", mediaCategory), }; await Task.WhenAll(imageUploadTasks); - List mediaIds = + List mediaIds = (from tsk in imageUploadTasks - select tsk.Result.MediaID) + select tsk.Result.MediaID.ToString()) .ToList(); - Status tweet = await twitterCtx.TweetAsync(status, mediaIds); + Tweet tweet = await ctx.TweetMediaAsync(status, mediaIds); return View( - new TweetViewModel + new MediaViewModel { - ImageUrl = tweet.User.ProfileImageUrl, - ScreenName = tweet.User.ScreenNameResponse, + MediaUrl = tweet.Entities.Urls.FirstOrDefault()?.Url, + Description = tweet.Entities.Urls.FirstOrDefault()?.Description, Text = tweet.Text }); } diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp.csproj b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp.csproj index 3335898f..d5a1529d 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp.csproj +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp.csproj @@ -5,7 +5,16 @@ - + + + + + + ..\..\..\..\..\src\LinqToTwitter6\LinqToTwitter.AspNet\bin\Debug\net5.0\LinqToTwitter.dll + + + ..\..\..\..\..\src\LinqToTwitter6\LinqToTwitter.AspNet\bin\Debug\net5.0\LinqToTwitter.AspNet.dll + diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Models/MediaViewModel.cs b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Models/MediaViewModel.cs new file mode 100644 index 00000000..347fb7e2 --- /dev/null +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Models/MediaViewModel.cs @@ -0,0 +1,18 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace LinqToTwitter.MVC.CSharp.Models +{ + public class MediaViewModel + { + [DisplayName("Image")] + [DataType(DataType.ImageUrl)] + public string MediaUrl { get; set; } + + [DisplayName("Screen Name")] + public string Description { get; set; } + + [DisplayName("Tweet")] + public string Text { get; set; } + } +} diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Properties/launchSettings.json b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Properties/launchSettings.json index 6b676099..a2b1728b 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Properties/launchSettings.json +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:62333", + "applicationUrl": "http://127.0.0.1:62333", "sslPort": 44395 } }, @@ -19,7 +19,7 @@ "commandName": "Project", "dotnetRunMessages": "true", "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", + "applicationUrl": "https://127.0.0.1:5001;http://127.0.0.1:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Startup.cs b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Startup.cs index 4b992f02..a0b42e0a 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Startup.cs +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Startup.cs @@ -25,7 +25,6 @@ public void ConfigureServices(IServiceCollection services) services.AddSession(options => { - options.IdleTimeout = TimeSpan.FromSeconds(10); options.Cookie.HttpOnly = true; options.Cookie.IsEssential = true; }); diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/OAuth/index.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/OAuth/index.cshtml index 14ef4f8a..8be7b2b2 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/OAuth/index.cshtml +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/OAuth/index.cshtml @@ -1,7 +1,7 @@ @{ - ViewBag.Title = "Authorizing Application"; + ViewBag.Title = "Authorizing Application with OAuth 1.0A"; } -

Authorize with OAuth

+

Authorize with OAuth 1.0A

@Html.ActionLink("Begin the Authorization Process", "Begin") diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/OAuth2/Index.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/OAuth2/Index.cshtml new file mode 100644 index 00000000..aca3a761 --- /dev/null +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/OAuth2/Index.cshtml @@ -0,0 +1,7 @@ +@{ + ViewBag.Title = "Authorizing Application with OAuth 2.0"; +} + +

Authorize with OAuth 2.0

+@Html.ActionLink("Begin the Authorization Process", "Begin") + diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/Shared/_Layout.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/Shared/_Layout.cshtml index 2b4dd454..fd109c30 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/Shared/_Layout.cshtml +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/Shared/_Layout.cshtml @@ -22,7 +22,7 @@ Home
  • - Status Demos + Tweet Demos
  • Privacy diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/Index.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/Index.cshtml deleted file mode 100644 index cd092918..00000000 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/Index.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@{ - ViewBag.Title = "Status Demos"; -} - -

    Status Demos

    - -

    @Html.ActionLink("Tweet Demo", "Tweet")

    - -

    @Html.ActionLink("Home Timeline Demo", "HomeTimeline")

    - -

    @Html.ActionLink("Upload Image Demo", "UploadImage")

    \ No newline at end of file diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/Index.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/Index.cshtml new file mode 100644 index 00000000..431285f6 --- /dev/null +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/Index.cshtml @@ -0,0 +1,11 @@ +@{ + ViewBag.Title = "Tweet Demos"; +} + +

    Tweet Demos

    + +

    @Html.ActionLink("Tweet Demo", "Tweet")

    + +

    @Html.ActionLink("Tweet Timeline Demo", "TweetTimeline")

    + +

    @Html.ActionLink("Upload Image Demo", "UploadImage")

    \ No newline at end of file diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/Tweet.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/Tweet.cshtml similarity index 100% rename from Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/Tweet.cshtml rename to Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/Tweet.cshtml diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/HomeTimeline.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/TweetTimeline.cshtml similarity index 91% rename from Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/HomeTimeline.cshtml rename to Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/TweetTimeline.cshtml index 1834824c..fef5b184 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/HomeTimeline.cshtml +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/TweetTimeline.cshtml @@ -1,10 +1,10 @@ @model IEnumerable @{ - ViewBag.Title = "Home Timeline"; + ViewBag.Title = "Tweet Timeline"; } -

    Home Timeline Demo

    +

    Tweet Timeline Demo

    diff --git a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/UploadImage.cshtml b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/UploadImage.cshtml similarity index 53% rename from Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/UploadImage.cshtml rename to Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/UploadImage.cshtml index cbb0b745..f21a99cb 100644 --- a/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/StatusDemos/UploadImage.cshtml +++ b/Samples/LinqToTwitter6/ASP.NET/LinqToTwitter.MVC.CSharp/LinqToTwitter.MVC.CSharp/Views/TweetDemos/UploadImage.cshtml @@ -1,4 +1,4 @@ -@model LinqToTwitter.MVC.CSharp.Models.TweetViewModel +@model LinqToTwitter.MVC.CSharp.Models.MediaViewModel @{ ViewBag.Title = "Upload Image"; @@ -9,21 +9,26 @@

    Image Details

    +

    + Note: This part of the demo only works with OAuth 1.0a. + To use OAuth 1.0a, visit the HomeController.Index and + switch the redirection to "OAuth" instead of "OAuth2". +

    - @Html.DisplayNameFor(model => model.ImageUrl) + @Html.DisplayNameFor(model => model.MediaUrl)
    - @Html.DisplayFor(model => model.ImageUrl) + @Html.DisplayFor(model => model.MediaUrl)
    - @Html.DisplayNameFor(model => model.ScreenName) + @Html.DisplayNameFor(model => model.Description)
    - @Html.DisplayFor(model => model.ScreenName) + @Html.DisplayFor(model => model.Description)
    diff --git a/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/OAuth.cs b/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/OAuth.cs index 86150ab6..758fc0f2 100644 --- a/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/OAuth.cs +++ b/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/OAuth.cs @@ -1,5 +1,6 @@ using LinqToTwitter.OAuth; using System; +using System.Collections.Generic; using System.Diagnostics; namespace ConsoleDemo.CSharp @@ -14,6 +15,7 @@ public static IAuthorizer ChooseAuthenticationStrategy() Console.WriteLine(" 2 - Application-Only"); Console.WriteLine(" 3 - Single User"); Console.WriteLine(" 4 - XAuth"); + //Console.WriteLine(" 5 - OAuth 2.0"); Console.Write("\nPlease choose (1, 2, 3, or 4): "); ConsoleKeyInfo input = Console.ReadKey(); @@ -25,6 +27,7 @@ public static IAuthorizer ChooseAuthenticationStrategy() '2' => DoApplicationOnlyAuth(), '3' => DoSingleUserAuth(), '4' => DoXAuth(), + //'5' => DoOAuth2ConfidentialAuth(), _ => DoPinOAuth(), }; @@ -75,6 +78,7 @@ static IAuthorizer DoApplicationOnlyAuth() return auth; } + static IAuthorizer DoSingleUserAuth() { var auth = new SingleUserAuthorizer @@ -106,5 +110,38 @@ static IAuthorizer DoXAuth() return auth; } + + // Not yet implemented + //static IAuthorizer DoOAuth2ConfidentialAuth() + //{ + // var auth = new OAuth2Authorizer() + // { + // CredentialStore = new OAuth2CredentialStore + // { + // ClientID = Environment.GetEnvironmentVariable(OAuthKeys.TwitterClientID), + // ClientSecret = Environment.GetEnvironmentVariable(OAuthKeys.TwitterClientSecret), + // Scopes = new List + // { + // "tweet.read", + // "tweet.write", + // "tweet.moderate.write", + // "users.read", + // "follows.read", + // "follows.write", + // "offline.access", + // "space.read", + // "mute.read", + // "mute.write", + // "like.read", + // "like.write", + // "block.read", + // "block.write" + // }, + // RedirectUri = "https://127.0.0.1" + // } + // }; + + // return auth; + //} } } diff --git a/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/Program.cs b/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/Program.cs index b7386557..86cf690b 100644 --- a/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/Program.cs +++ b/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/Program.cs @@ -25,7 +25,7 @@ static async Task DoDemosAsync() await auth.AuthorizeAsync(); - // This is how you access credentials after authorization. + // For OAuth 1.0A Only: This is how you access credentials after authorization. // The oauthToken and oauthTokenSecret do not expire. // You can use the userID to associate the credentials with the user. // You can save credentials any way you want - database, isolated storage, etc. - it's up to you. diff --git a/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/SearchDemos.cs b/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/SearchDemos.cs index f71c952f..e140e309 100644 --- a/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/SearchDemos.cs +++ b/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/SearchDemos.cs @@ -64,16 +64,17 @@ static void ShowMenu() static async Task DoSearchAsync(TwitterContext twitterCtx) { - string searchTerm = "\"LINQ to Twitter\" OR Linq2Twitter OR LinqToTwitter OR JoeMayo"; + string searchTerm = "linq to"; + //string searchTerm = "\"LINQ to Twitter\" OR Linq2Twitter OR LinqToTwitter OR JoeMayo"; //searchTerm = "кот ("; Search? searchResponse = await (from search in twitterCtx.Search where search.Type == SearchType.Search && - search.Query == searchTerm && - search.IncludeEntities == true && - search.TweetMode == TweetMode.Extended + search.Query == searchTerm //&& + //search.IncludeEntities == true && + //search.TweetMode == TweetMode.Extended select search) .SingleOrDefaultAsync(); diff --git a/src/LinqToTwitter6/LinqToTwitter.AspNet/LinqToTwitter.AspNet.csproj b/src/LinqToTwitter6/LinqToTwitter.AspNet/LinqToTwitter.AspNet.csproj index d4dbc4d4..cd24b14f 100644 --- a/src/LinqToTwitter6/LinqToTwitter.AspNet/LinqToTwitter.AspNet.csproj +++ b/src/LinqToTwitter6/LinqToTwitter.AspNet/LinqToTwitter.AspNet.csproj @@ -2,7 +2,7 @@ net5.0 - 6.7.1 + 6.11.0 Joe Mayo Joe Mayo LINQ to Twitter for ASP.NET @@ -16,7 +16,13 @@ This library has ASP.NET authorizers and SessionStateCredentialCache that you'll https://github.com/JoeMayo/LinqToTwitter twitter twitterapi twitterdev tweet linq social linqtotwitter linq2twitter - Note: In previous versions of LINQ to Twitter, this was included in the `linqtotwitter` package. In version 6, ASP.NET Core 5 support is a separate package with a dependency on `linqtotwitter` v6.0+. + +Note: In previous versions of LINQ to Twitter, this was included in the `linqtotwitter` package. In version 6, ASP.NET Core 5 support is a separate package with a dependency on `linqtotwitter` v6.0+. + +- Added OAuth 2.0 Support, including a new MvcOAuth2Authorizer and OAuth2SessionStateCredentialStore. +- Fixed a bug with SessionStateCredentialStore.ClearAsync that prevented it from working. + + ReadMe.md @@ -33,6 +39,10 @@ This library has ASP.NET authorizers and SessionStateCredentialCache that you'll True + + True + \ + diff --git a/src/LinqToTwitter6/LinqToTwitter.AspNet/MvcAuthorizer.cs b/src/LinqToTwitter6/LinqToTwitter.AspNet/MvcAuthorizer.cs index 61d192c2..321cc894 100644 --- a/src/LinqToTwitter6/LinqToTwitter.AspNet/MvcAuthorizer.cs +++ b/src/LinqToTwitter6/LinqToTwitter.AspNet/MvcAuthorizer.cs @@ -7,7 +7,7 @@ namespace LinqToTwitter { public class MvcAuthorizer : AspNetAuthorizer { - private string _authUrl; + string _authUrl; public async Task BeginAuthorizationAsync() { diff --git a/src/LinqToTwitter6/LinqToTwitter.AspNet/MvcOAuth2Authorizer.cs b/src/LinqToTwitter6/LinqToTwitter.AspNet/MvcOAuth2Authorizer.cs new file mode 100644 index 00000000..26d6afb9 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter.AspNet/MvcOAuth2Authorizer.cs @@ -0,0 +1,21 @@ +using LinqToTwitter.OAuth; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; + +namespace LinqToTwitter +{ + public class MvcOAuth2Authorizer : OAuth2Authorizer + { + string authUrl; + + public new async Task BeginAuthorizeAsync(string state = null) + { + if (GoToTwitterAuthorization == null) + GoToTwitterAuthorization = authUrl => { this.authUrl = authUrl; }; + + await base.BeginAuthorizeAsync(state).ConfigureAwait(false); + + return new RedirectResult(authUrl); + } + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter.AspNet/OAuth2SessionCredentialStore.cs b/src/LinqToTwitter6/LinqToTwitter.AspNet/OAuth2SessionCredentialStore.cs new file mode 100644 index 00000000..94eb5e3e --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter.AspNet/OAuth2SessionCredentialStore.cs @@ -0,0 +1,170 @@ +using LinqToTwitter.OAuth; +using Microsoft.AspNetCore.Http; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace LinqToTwitter +{ + /// + /// Credential Store for ASP.NET applications - Uses Session State + /// + public class OAuth2SessionCredentialStore : OAuth2CredentialStore + { + readonly ISession session; + + public OAuth2SessionCredentialStore(IHttpContextAccessor httpCtx) + { + session = httpCtx.HttpContext.Session; + } + + public OAuth2SessionCredentialStore(ISession session) + { + this.session = session; + } + + /// + /// Required for all clients - you can find this in the Twitter Developer portal + /// + public override string ClientID + { + get + { + return session.GetString("OAuth2ClientID"); + } + set + { + session.SetString("OAuth2ClientID", value); + } + } + + /// + /// Required for confidential clients - you can find this in the Twitter Developer portal + /// + public override string ClientSecret + { + get + { + return session.GetString("OAuth2ClientSecret"); + } + set + { + session.SetString("OAuth2ClientSecret", value); + } + } + + /// + /// Send when authorizing and getting access token to verify original source + /// + public override string CodeChallenge + { + get + { + return session.GetString("OAuth2CodeChallenge"); + } + set + { + session.SetString("OAuth2CodeChallenge", value); + } + } + + /// + /// Required - these are the permissions you want the user to give your app. + /// See endpoint documentation for what scopes are required. + /// + public override IEnumerable Scopes + { + get + { + return + session + .GetString("OAuth2Scopes") + .Split(' ') + .ToList(); + } + set + { + if (value != null) + session + .SetString( + "OAuth2Scopes", + string.Join(' ', value)); + } + } + + /// + /// Populated after user approves your app and used for each command/query + /// + public override string AccessToken + { + get + { + return session.GetString("OAuth2AccessToken"); + } + set + { + session.SetString("OAuth2AccessToken", value); + } + } + + /// + /// Can be used to get a new AccessToken - only available if you authorized with `offline.access` scope. + /// + public override string RefreshToken + { + get + { + return session.GetString("OAuth2RefreshToken"); + } + set + { + session.SetString("OAuth2RefreshToken", (string)value); + } + } + + /// + /// Url that Twitter redirects to after user authorizes your app + /// + public override string RedirectUri + { + get + { + return session.GetString("OAuth2Callback"); + } + set + { + session.SetString("OAuth2Callback", value); + } + } + + /// + /// Value to verify against what was sent to Twitter and what was received. + /// Helps prevent CSRF attack. + /// + public override string State + { + get + { + return session.GetString("OAuth2State"); + } + set + { + session.SetString("OAuth2State", value); + } + } + + public override Task ClearAsync() + { + session.Remove("OAuth2ClientID"); + session.Remove("OAuth2ClientSecret"); + session.Remove("OAuth2CodeChallenge"); + session.Remove("OAuth2Scopes"); + session.Remove("OAuth2AccessToken"); + session.Remove("OAuth2RefreshToken"); + session.Remove("OAuth2Callback"); + session.Remove("OAuth2State"); + + return Task.CompletedTask; + } + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter.AspNet/SessionStateCredentialStore.cs b/src/LinqToTwitter6/LinqToTwitter.AspNet/SessionStateCredentialStore.cs index f83ffe2c..f846fff7 100644 --- a/src/LinqToTwitter6/LinqToTwitter.AspNet/SessionStateCredentialStore.cs +++ b/src/LinqToTwitter6/LinqToTwitter.AspNet/SessionStateCredentialStore.cs @@ -94,14 +94,14 @@ public override ulong UserID public override Task ClearAsync() { - ConsumerKey = null; - ConsumerSecret = null; - OAuthToken = null; - OAuthTokenSecret = null; - ScreenName = null; - UserID = 0ul; + session.Remove("OAuthConsumerKey"); + session.Remove("OAuthConsumerSecret"); + session.Remove("OAuthToken"); + session.Remove("OAuthTokenSecret"); + session.Remove("ScreenNameToken"); + session.Remove("UserIdToken"); - return base.ClearAsync(); + return Task.CompletedTask; } } } diff --git a/src/LinqToTwitter6/LinqToTwitter.Tests/OAuth/OAuth2AuthorizerTests.cs b/src/LinqToTwitter6/LinqToTwitter.Tests/OAuth/OAuth2AuthorizerTests.cs new file mode 100644 index 00000000..b374ec65 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter.Tests/OAuth/OAuth2AuthorizerTests.cs @@ -0,0 +1,111 @@ +using LinqToTwitter.OAuth; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace LinqToTwitter.Tests.OAuth +{ + [TestClass] + public class OAuth2AuthorizerTests + { + OAuth2Authorizer auth; + + [TestInitialize] + public void Init() + { + auth = new OAuth2Authorizer(); + } + + [TestMethod] + public void GenerateCodeChallenge_ReturnsValuesGreaterThanOrEqualTo44() + { + string codeChallenge = auth.GenerateCodeChallenge(); + Assert.IsTrue(codeChallenge.Length >= 44); + } + + [TestMethod] + public void GenerateCodeChallenge_ReturnsValuesLessThanOrEqualTo127() + { + string codeChallenge = auth.GenerateCodeChallenge(); + Assert.IsTrue(codeChallenge.Length <= 127); + } + + [TestMethod] + public void GenerateCodeChallenge_ReturnsAlphabeticCharacters() + { + string codeChallenge = auth.GenerateCodeChallenge(); + + foreach (var ch in codeChallenge) + Assert.IsTrue(OAuth2Authorizer.ValidCharacters.Contains(ch)); + } + + [TestMethod] + public void PrepareAuthorizeUrl_WithAllInputs_BuildsUrl() + { + const string State = "state"; + + auth.CredentialStore = + new OAuth2CredentialStore + { + ClientID = "MyClientID", + ClientSecret = "MyClientSecret", + Scopes = new List + { + "tweet.read", "users.read", "account.follows.read", "account.follows.write" + }, + RedirectUri = "https://www.example.com" + }; + + string authUrl = auth.PrepareAuthorizeUrl(State); + + string[] parts = authUrl.Split('?'); + + Dictionary queryParms = null; + if (parts.Length == 2) + queryParms = + (from parm in parts[1].Split('&') + select parm.Split('=')) + .ToDictionary(key => key[0], val => val[1]); + + Assert.IsNotNull(queryParms); + Assert.AreEqual("code", queryParms["response_type"]); + Assert.AreEqual("MyClientID", queryParms["client_id"]); + Assert.AreEqual("https://www.example.com", queryParms["redirect_uri"]); + Assert.AreEqual("tweet.read users.read account.follows.read account.follows.write", queryParms["scope"]); + Assert.AreEqual(State, queryParms["state"]); + Assert.AreEqual("S256", queryParms["code_challenge_method"]); + Assert.IsTrue(queryParms["code_challenge"].Length > 16); + } + + [TestMethod] + public void PrepareTokenParams_WithAllInputs_ReturnsParamString() + { + const string CodeFromTwitterAuthorize = "MyCode"; + const string ExpectedParams = + "code=MyCode&" + + "grant_type=authorization_code&" + + "client_id=My Client ID&" + + "redirect_uri=https://www.example.com&" + + "code_verifier=challenge"; + + auth.CredentialStore = + new OAuth2CredentialStore + { + ClientID = "My Client ID", + ClientSecret = "MyClientSecret", + Scopes = new List + { + "tweet.read", "users.read", "account.follows.read", "account.follows.write" + }, + RedirectUri = "https://www.example.com", + CodeChallenge = "challenge" + }; + + string queryParms = auth.PrepareAccessTokenParams(CodeFromTwitterAuthorize); + + Assert.IsNotNull(queryParms); + Assert.AreEqual(ExpectedParams, queryParms); + } + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter.Tests/OAuth/OAuth2CredentialStoreTests.cs b/src/LinqToTwitter6/LinqToTwitter.Tests/OAuth/OAuth2CredentialStoreTests.cs new file mode 100644 index 00000000..8e2e0394 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter.Tests/OAuth/OAuth2CredentialStoreTests.cs @@ -0,0 +1,46 @@ +using LinqToTwitter.OAuth; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace LinqToTwitter.Tests.OAuth +{ + [TestClass] + public class OAuth2CredentialStoreTests + { + OAuth2CredentialStore credStore; + + [TestInitialize] + public void Init() + { + credStore = new OAuth2CredentialStore() + { + AccessToken = "123", + ClientID = "456", + ClientSecret = "789", + CodeChallenge = "012", + RedirectUri = "345", + RefreshToken = "123", + Scopes = new List(), + State = "678", + }; + } + + [TestMethod] + public async Task GenerateCodeChallenge_ReturnsValuesGreaterThanOrEqualTo44() + { + await credStore.ClearAsync(); + + Assert.IsNull(credStore.AccessToken); + Assert.IsNull(credStore.ClientID); + Assert.IsNull(credStore.ClientSecret); + Assert.IsNull(credStore.CodeChallenge); + Assert.IsNull(credStore.RedirectUri); + Assert.IsNull(credStore.RefreshToken); + Assert.IsNull(credStore.Scopes); + Assert.IsNull(credStore.State); + } + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter/LinqToTwitter.csproj b/src/LinqToTwitter6/LinqToTwitter/LinqToTwitter.csproj index f95ced0d..62e00a5f 100644 --- a/src/LinqToTwitter6/LinqToTwitter/LinqToTwitter.csproj +++ b/src/LinqToTwitter6/LinqToTwitter/LinqToTwitter.csproj @@ -4,7 +4,7 @@ net5.0 enable LINQ to Twitter is a 3rd party LINQ Provider that lets you tweet and query with the Twitter API. - 6.10.0 + 6.11.0 Joe Mayo Joe Mayo linqtotwitter @@ -17,10 +17,11 @@ https://github.com/JoeMayo/LinqToTwitter twitter twitterapi twitterdev tweet linq social linqtotwitter linq2twitter -- Added Twitter API v2 List API support +- Added OAuth 2.0 support false false + ReadMe.md @@ -32,6 +33,10 @@ True + + True + \ + diff --git a/src/LinqToTwitter6/LinqToTwitter/Net/TwitterErrorHandler.cs b/src/LinqToTwitter6/LinqToTwitter/Net/TwitterErrorHandler.cs index 837c98fa..325e542c 100644 --- a/src/LinqToTwitter6/LinqToTwitter/Net/TwitterErrorHandler.cs +++ b/src/LinqToTwitter6/LinqToTwitter/Net/TwitterErrorHandler.cs @@ -126,31 +126,63 @@ public static TwitterErrorDetails ParseTwitterErrorMessage(string responseStr) { List? errors = null; if (root.TryGetProperty("errors", out JsonElement errorElement)) + { errors = (from error in errorElement.EnumerateArray() select new Error { Message = error.GetString("message"), Parameters = - (from parm in error.GetProperty("parameters").EnumerateObject() - let vals = - (from val in parm.Value.EnumerateArray() - select val.GetString()) - .ToArray() - select new { parm.Name, vals }) - .ToDictionary( - key => key.Name, - val => val.vals) + (from parm in error.GetProperty("parameters").EnumerateObject() + let vals = + (from val in parm.Value.EnumerateArray() + select val.GetString()) + .ToArray() + select new { parm.Name, vals }) + .ToDictionary( + key => key.Name, + val => val.vals) }) .ToList(); - return new TwitterErrorDetails + return new TwitterErrorDetails + { + Title = root.GetString("title"), + Detail = root.GetString("detail"), + Type = root.GetString("type"), + Errors = errors + }; + } + else if(root.TryGetProperty("error", out JsonElement errorMessage)) { - Title = root.GetString("title"), - Detail = root.GetString("detail"), - Type = root.GetString("type"), - Errors = errors - }; + root.TryGetProperty("error_description", out JsonElement errorDescription); + + return new TwitterErrorDetails + { + Title = errorMessage.GetString(), + Detail = errorDescription.GetString(), + Type = "OAuth2", + Errors = new() + { + new Error + { + Code = 0, + Message = errorDescription.GetString(), + Request = errorMessage.GetString() + } + } + }; + } + else + { + return new TwitterErrorDetails + { + Title = "Unknown Error", + Detail = root.GetString(), + Type = "Unknown", + Errors = errors + }; + } } else // version 1 { @@ -201,10 +233,13 @@ select val.GetString()) static int GetTwitterApiVersion(JsonElement root) { + bool hasError = root.TryGetProperty("error", out _); + bool hasErrorDescription = root.TryGetProperty("error_description", out _); bool hasTitle = root.TryGetProperty("title", out _); bool hasType = root.TryGetProperty("type", out _); - return hasTitle && hasType ? TwitterApiV2 : TwitterApiV1; + return + (hasTitle && hasType) || (hasError && hasErrorDescription) ? TwitterApiV2 : TwitterApiV1; } } } diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/ApplicationOnlyAuthorizer.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/ApplicationOnlyAuthorizer.cs index 79d151be..36690b7b 100644 --- a/src/LinqToTwitter6/LinqToTwitter/OAuth/ApplicationOnlyAuthorizer.cs +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/ApplicationOnlyAuthorizer.cs @@ -13,13 +13,13 @@ public class ApplicationOnlyAuthorizer : AuthorizerBase, IAuthorizer { public string? BasicToken { get; set; } public string? BearerToken { get; set; } - public string OAuth2Token { get; set; } - public string OAuth2InvalidateToken { get; set; } + public string OAuth2TokenUrl { get; set; } + public string OAuth2InvalidateTokenUrl { get; set; } public ApplicationOnlyAuthorizer() { - OAuth2Token = "https://api.twitter.com/oauth2/token"; - OAuth2InvalidateToken = "https://api.twitter.com/oauth2/invalidate_token"; + OAuth2TokenUrl = "https://api.twitter.com/oauth2/token"; + OAuth2InvalidateTokenUrl = "https://api.twitter.com/oauth2/invalidate_token"; } public async Task AuthorizeAsync() @@ -32,7 +32,7 @@ public async Task InvalidateAsync() { EncodeCredentials(); - var req = new HttpRequestMessage(System.Net.Http.HttpMethod.Post, OAuth2InvalidateToken); + var req = new HttpRequestMessage(HttpMethod.Post, OAuth2InvalidateTokenUrl); req.Headers.Add("Authorization", "Basic " + BasicToken); req.Headers.Add("User-Agent", UserAgent); req.Headers.ExpectContinue = false; @@ -58,7 +58,7 @@ public async Task InvalidateAsync() async Task GetBearerTokenAsync() { - var req = new HttpRequestMessage(System.Net.Http.HttpMethod.Post, OAuth2Token); + var req = new HttpRequestMessage(HttpMethod.Post, OAuth2TokenUrl); req.Headers.Add("Authorization", "Basic " + BasicToken); req.Headers.Add("User-Agent", UserAgent); req.Headers.ExpectContinue = false; diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/IOAuth2Authorizer.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/IOAuth2Authorizer.cs new file mode 100644 index 00000000..12e501d1 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/IOAuth2Authorizer.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; + +namespace LinqToTwitter.OAuth +{ + public interface IOAuth2Authorizer : IAuthorizer + { + Task BeginAuthorizeAsync(string? state); + Task CompleteAuthorizeAsync(string code, string? state); + Task RevokeTokenAsync(); + Task RefreshTokenAsync(); + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/IOAuth2CredentialStore.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/IOAuth2CredentialStore.cs new file mode 100644 index 00000000..23364227 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/IOAuth2CredentialStore.cs @@ -0,0 +1,49 @@ +using System.Collections.Generic; + +namespace LinqToTwitter.OAuth +{ + public interface IOAuth2CredentialStore : ICredentialStore + { + /// + /// Required - you can find this in the Twitter Developer portal + /// + string? ClientID { get; set; } + + /// + /// Required for confidential clients - you can find this in the Twitter Developer portal + /// + string? ClientSecret { get; set; } + + /// + /// Required - these are the permissions you want the user to give your app. + /// See endpoint documentation for what scopes are required. + /// + IEnumerable? Scopes { get; set; } + + /// + /// Populated after user approves your app and used for each command/query + /// + string? AccessToken { get; set; } + + /// + /// Can be used to get a new AccessToken - only available if you authorized with `offline.access` scope. + /// + string? RefreshToken { get; set; } + + /// + /// Url that Twitter redirects to after user authorizes your app + /// + string? RedirectUri { get; set; } + + /// + /// Send when authorizing and getting access token to verify original source + /// + string? CodeChallenge { get; set; } + + /// + /// Value to verify against what was sent to Twitter and what was received. + /// Helps prevent CSRF attack. + /// + string? State { get; set; } + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/InMemoryCredentialStore.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/InMemoryCredentialStore.cs index cb3c1703..af238fef 100644 --- a/src/LinqToTwitter6/LinqToTwitter/OAuth/InMemoryCredentialStore.cs +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/InMemoryCredentialStore.cs @@ -20,7 +20,7 @@ public class InMemoryCredentialStore : ICredentialStore public virtual ulong UserID { get; set; } - public bool HasAllCredentials() + public virtual bool HasAllCredentials() { return !string.IsNullOrWhiteSpace(ConsumerKey) && diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2Authorizer.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2Authorizer.cs new file mode 100644 index 00000000..dea2a8c4 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2Authorizer.cs @@ -0,0 +1,327 @@ +using LinqToTwitter.Common; +using LinqToTwitter.Net; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Security.Cryptography; +using System.Text; +using System.Text.Json; +using System.Threading.Tasks; + +namespace LinqToTwitter.OAuth +{ + public class OAuth2Authorizer : OAuth2AuthorizerBase, IOAuth2Authorizer + { + public const string CredentialStoreMessage = "You must assign the CredentialStore property (with required values)."; + + public const string ValidCharacterString = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"; + public static readonly char[] ValidCharacters = ValidCharacterString.ToCharArray(); + + public string AuthorizeUrl { get; set; } + public string AccessTokenUrl { get; set; } + public string RefreshTokenUrl { get; set; } + public string RevokeTokenUrl { get; set; } + + public string? BasicToken { get; set; } + + /// + /// This is a hook where you can assign + /// an to perform the technology + /// specific redirection action. + /// + /// The string passed as the paramter + /// is the Twitter authorization URL. + /// + public Action? GoToTwitterAuthorization { get; set; } + + public OAuth2Authorizer() + { + AuthorizeUrl = "https://twitter.com/i/oauth2/authorize"; + AccessTokenUrl = "https://api.twitter.com/2/oauth2/token"; + RefreshTokenUrl = "https://api.twitter.com/2/oauth2/token"; + RevokeTokenUrl = "https://api.twitter.com/2/oauth2/revoke"; + + SupportsCompression = true; + + if (string.IsNullOrWhiteSpace(UserAgent)) + UserAgent = L2TKeys.DefaultUserAgent; + } + + void HandleAuthorizationHeader(HttpRequestMessage req, string url) + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + + bool isAuthorizationRequest(string url) => url.StartsWith(AuthorizeUrl); + bool isPublicClient() => !string.IsNullOrWhiteSpace(credStore.ClientSecret); + + if (isAuthorizationRequest(url) || isPublicClient()) + return; + + string authHeader = + "Basic " + + Convert.ToBase64String( + Encoding.UTF8.GetBytes( + $"{credStore.ClientID}:{credStore.ClientSecret}")); + req.Headers.Add("Authorization", authHeader); + } + + HttpRequestMessage GetHttpRequestMessage(HttpMethod method, string url) + { + var req = new HttpRequestMessage(method, url); + req.Headers.Add("User-Agent", UserAgent); + HandleAuthorizationHeader(req, url); + return req; + } + + public async Task SendHttpAsync(HttpRequestMessage req) + { + var handler = new HttpClientHandler(); + if (handler.SupportsAutomaticDecompression) + handler.AutomaticDecompression = DecompressionMethods.GZip; + if (Proxy != null && handler.SupportsProxy) + handler.Proxy = Proxy; + + var client = new HttpClient(handler); + + var msg = await client.SendAsync(req).ConfigureAwait(false); + + await TwitterErrorHandler.ThrowIfErrorAsync(msg).ConfigureAwait(false); + + return await msg.Content.ReadAsStringAsync().ConfigureAwait(false); + } + + public virtual async Task GetAuthorizationCodeAsync(string authUrl) + { + var req = GetHttpRequestMessage(HttpMethod.Get, authUrl); + return await SendHttpAsync(req).ConfigureAwait(false); + } + + public virtual async Task GetAccessTokenAsync(string code) + { + HttpRequestMessage req = GetHttpRequestMessage(HttpMethod.Post, AccessTokenUrl); + + string postParams = PrepareAccessTokenParams(code); + + req.Content = new StringContent(postParams, Encoding.UTF8, "application/x-www-form-urlencoded"); + + return await SendHttpAsync(req).ConfigureAwait(false); + } + + public async Task RevokeTokenAsync() + { + HttpRequestMessage req = GetHttpRequestMessage(HttpMethod.Post, RevokeTokenUrl); + + string postParams = PrepareRevokeTokenParams(); + + req.Content = new StringContent(postParams, Encoding.UTF8, "application/x-www-form-urlencoded"); + + return await SendHttpAsync(req).ConfigureAwait(false); + } + + public async Task RefreshTokenAsync() + { + HttpRequestMessage req = GetHttpRequestMessage(HttpMethod.Post, RefreshTokenUrl); + + string postParams = PrepareRefreshTokenParams(); + + req.Content = new StringContent(postParams, Encoding.UTF8, "application/x-www-form-urlencoded"); + + string tokenResponse = await SendHttpAsync(req).ConfigureAwait(false); + + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + + var tokenResponseJson = JsonDocument.Parse(tokenResponse).RootElement; + credStore.AccessToken = tokenResponseJson.GetString("access_token"); + credStore.RefreshToken = tokenResponseJson.GetString("refresh_token"); + + return tokenResponse; + } + + string ToBase64Url(byte[] bytes) + { + return Convert + .ToBase64String(bytes) + .Replace('+', '-') + .Replace('/', '_') + .TrimEnd('='); + } + + public virtual string GenerateCodeChallenge() + { + var rand = new Random((int)DateTime.UtcNow.Ticks); + int size = rand.Next(44, 127); + var chars = new char[size]; + + for (int i = 0; i < chars.Length; i++) + { + int charIndex = rand.Next(0, ValidCharacters.Length); + chars[i] = ValidCharacters[charIndex]; + } + + return new string(chars); + } + + public virtual string? HashCodeChallenge(string challenge) + { + byte[] challengeBytes = Encoding.ASCII.GetBytes(challenge); + + using var sha256 = SHA256.Create(); + + byte[] challengeHashed = sha256.ComputeHash(challengeBytes); + + return ToBase64Url(challengeHashed); + } + + public virtual string PrepareAuthorizeUrl(string? state = null) + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + + string scopes = string.Join(' ', credStore.Scopes ?? new string[0]); + + credStore.CodeChallenge = GenerateCodeChallenge(); + string? hashedCodeChallenge = HashCodeChallenge(credStore.CodeChallenge); + + Func getState = (state) => string.IsNullOrWhiteSpace(state) ? "" : $"state={state}&"; + + return + $"{AuthorizeUrl}?" + + $"response_type=code&" + + $"client_id={credStore.ClientID}&" + + $"redirect_uri={credStore.RedirectUri}&" + + $"scope={scopes}&" + + $"{getState(state)}" + + $"code_challenge={hashedCodeChallenge}&" + + $"code_challenge_method=S256"; + } + + public virtual string PrepareAccessTokenParams(string? code) + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + if (string.IsNullOrWhiteSpace(credStore.ClientID)) + throw new ArgumentException($"You must populate CredentialStore with a {nameof(credStore.ClientID)} before calling AuthorizeAsync.", nameof(credStore.ClientID)); + if (string.IsNullOrWhiteSpace(credStore.RedirectUri)) + throw new ArgumentException($"You must populate CredentialStore with a {nameof(credStore.RedirectUri)} before calling AuthorizeAsync.", nameof(credStore.RedirectUri)); + if (string.IsNullOrWhiteSpace(code)) + throw new ArgumentException($"You must populate CredentialStore with a {nameof(code)} before calling AuthorizeAsync.", nameof(code)); + if (string.IsNullOrWhiteSpace(credStore?.CodeChallenge)) + throw new InvalidOperationException("Internal LINQ to Twitter error - Missing Code Challenge!"); + + return + $"code={Url.PercentEncode(code)}&" + + $"grant_type=authorization_code&" + + $"client_id={credStore.ClientID}&" + + $"redirect_uri={credStore.RedirectUri}&" + + $"code_verifier={credStore.CodeChallenge}"; + } + + public virtual string PrepareRefreshTokenParams() + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + if (string.IsNullOrWhiteSpace(credStore.ClientID)) + throw new ArgumentException($"You must populate CredentialStore with a {nameof(credStore.ClientID)} before calling AuthorizeAsync.", nameof(credStore.ClientID)); + if (string.IsNullOrWhiteSpace(credStore.RefreshToken)) + throw new ArgumentException( + "Your CredentialStore doesn't have a refresh token. " + + "Therefore, you are unable to update your token. " + + "To get a refresh token, add the 'offline.access' scope when initially authorizing."); + + return + $"refresh_token={credStore.RefreshToken}&" + + $"grant_type=refresh_token&" + + $"client_id={credStore.ClientID}"; + } + + public virtual string PrepareRevokeTokenParams() + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + if (string.IsNullOrWhiteSpace(credStore.ClientID)) + throw new ArgumentException($"You must populate CredentialStore with a {nameof(credStore.ClientID)} before calling AuthorizeAsync.", nameof(credStore.ClientID)); + if (string.IsNullOrWhiteSpace(credStore.AccessToken)) + throw new ArgumentException($"You must populate CredentialStore with a {nameof(credStore.AccessToken)} before calling AuthorizeAsync.", nameof(credStore.AccessToken)); + + return + $"token={credStore.AccessToken}&" + + $"client_id={credStore.ClientID}&" + + $"token_type_hint=access_token"; + } + + /// + /// Performs Basic Authorization (not implemented yet) + /// + public async Task AuthorizeAsync() + { + await Task.CompletedTask; + } + + /// + /// Starts the authorization process + /// + /// Any state of your choice for security checks durng . + /// + /// For missing Credential Store + /// For missing ClientID or Scopes + public async Task BeginAuthorizeAsync(string? state = null) + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + + credStore.State = state; + + if (credStore.HasAllCredentials()) return; + + if (string.IsNullOrWhiteSpace(credStore.ClientID)) + throw new ArgumentException($"You must populate CredentialStore with a {nameof(credStore.ClientID)} before calling AuthorizeAsync.", nameof(credStore.ClientID)); + if (!credStore.Scopes?.Any() ?? false) + throw new ArgumentException($"You must populate CredentialStore with {nameof(credStore.Scopes)} (permissions) before calling AuthorizeAsync.", nameof(credStore.Scopes)); + + string authUrl = PrepareAuthorizeUrl(state); + + if (GoToTwitterAuthorization != null) + GoToTwitterAuthorization(authUrl); + + await Task.CompletedTask; + } + + /// + /// Completes the authorization process, which gets access token + /// (and optionally refresh token if you added the "offline.access" scope) + /// + /// Authorization code result from the process. + /// If missing CredentialStore + /// When state passed here doesn't equal state passed to , then possible CSRF attack. + public async Task CompleteAuthorizeAsync(string code, string? state = null) + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + + if (state != credStore.State) + throw new TwitterQueryException("Possible CSRF attack - State doesn't match. Check that the state sent in the begin request matches the state in the received request."); + + string tokenResponse = await GetAccessTokenAsync(code); + + var tokenResponseJson = JsonDocument.Parse(tokenResponse).RootElement; + credStore.AccessToken = tokenResponseJson.GetString("access_token"); + credStore.RefreshToken = tokenResponseJson.GetString("refresh_token"); + } + + /// + /// Called by LINQ to Twitter provider to build the Authorization header for each request. + /// + /// For missing CredentialStore + public override string? GetAuthorizationString(string method, string oauthUrl, IDictionary parameters) + { + if (CredentialStore is not IOAuth2CredentialStore credStore) + throw new NullReferenceException(CredentialStoreMessage); + + return $"Bearer {credStore.AccessToken}"; + } + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2AuthorizerBase.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2AuthorizerBase.cs new file mode 100644 index 00000000..22a5d7c1 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2AuthorizerBase.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; +using System.Net; + +namespace LinqToTwitter.OAuth +{ + public abstract class OAuth2AuthorizerBase + { + /// + /// User-Agent header string sent to Twitter to represent your application. Defaults to LINQ to Twitter. + /// + public string? UserAgent { get; set; } + + /// + /// Allows user to specify a proxy for HTTP requests + /// + public IWebProxy? Proxy { get; set; } + + /// + /// LINQ to Twitter will use gzip compression if the client supports it + /// + public bool SupportsCompression { get; set; } + + /// + /// Get/Set Credentials + /// + public ICredentialStore? CredentialStore { get; set; } + + public abstract string? GetAuthorizationString(string method, string oauthUrl, IDictionary parameters); + } +} \ No newline at end of file diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2CredentialStore.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2CredentialStore.cs new file mode 100644 index 00000000..9992c38d --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuth2CredentialStore.cs @@ -0,0 +1,72 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace LinqToTwitter.OAuth +{ + /// + /// Manages credentials for OAuth2 Authentications + /// + public class OAuth2CredentialStore : InMemoryCredentialStore, IOAuth2CredentialStore + { + /// + /// Required for all clients - you can find this in the Twitter Developer portal + /// + public virtual string? ClientID { get; set; } + + /// + /// Required for confidential clients - you can find this in the Twitter Developer portal + /// + public virtual string? ClientSecret { get; set; } + + /// + /// Send when authorizing and getting access token to verify original source + /// + public virtual string? CodeChallenge { get; set; } + + /// + /// Required - these are the permissions you want the user to give your app. + /// See endpoint documentation for what scopes are required. + /// + public virtual IEnumerable? Scopes { get; set; } + + /// + /// Populated after user approves your app and used for each command/query + /// + public virtual string? AccessToken { get; set; } + + /// + /// Can be used to get a new AccessToken - only available if you authorized with `offline.access` scope. + /// + public virtual string? RefreshToken { get; set; } + + /// + /// Url that Twitter redirects to after user authorizes your app + /// + public virtual string? RedirectUri { get; set; } + + /// + /// Value to verify against what was sent to Twitter and what was received. + /// Helps prevent CSRF attack. + /// + public virtual string? State { get; set; } + + /// + /// Sets all properties to default values + /// + public override async Task ClearAsync() + { + await base.ClearAsync(); + + AccessToken = default; + ClientID = default; + ClientSecret = default; + CodeChallenge = default; + RefreshToken = default; + RedirectUri = default; + Scopes = default; + State = default; + } + + public override bool HasAllCredentials() => !string.IsNullOrWhiteSpace(AccessToken); + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuthKeys.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuthKeys.cs index 4ace56ae..3a1ceb61 100644 --- a/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuthKeys.cs +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuthKeys.cs @@ -8,5 +8,7 @@ public class OAuthKeys public const string TwitterOAuthTokenSecret = "TwitterOAuthTokenSecret"; public const string TwitterAccessToken = "TwitterAccessToken"; public const string TwitterAccessTokenSecret = "TwitterAccessTokenSecret"; + public const string TwitterClientID = "TwitterClientID"; + public const string TwitterClientSecret = "TwitterClientSecret"; } } diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuthListener.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuthListener.cs new file mode 100644 index 00000000..a6d407ec --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/OAuthListener.cs @@ -0,0 +1,35 @@ +using System.Net; +using System.Net.Sockets; +using System.Text; + +namespace LinqToTwitter.OAuth +{ + internal class OAuthListener + { + public string Listen(string ip, int port) + { + TcpListener? server = null; + try + { + server = new TcpListener(IPAddress.Parse(ip), port); + server.Start(); + + using TcpClient client = server.AcceptTcpClient(); + using NetworkStream stream = client.GetStream(); + + int readCount; + var bytes = new byte[256]; + var sb = new StringBuilder(); + + while ((readCount = stream.Read(bytes, 0, bytes.Length)) != 0) + sb.Append(Encoding.UTF8.GetString(bytes, 0, readCount)); + + return sb.ToString(); + } + finally + { + server?.Stop(); + } + } + } +} diff --git a/src/LinqToTwitter6/LinqToTwitter/OAuth/Scopes.cs b/src/LinqToTwitter6/LinqToTwitter/OAuth/Scopes.cs new file mode 100644 index 00000000..19dca7f0 --- /dev/null +++ b/src/LinqToTwitter6/LinqToTwitter/OAuth/Scopes.cs @@ -0,0 +1,17 @@ +namespace LinqToTwitter.OAuth +{ + public class Scopes + { + public const string TweetRead = "tweet.read"; + + public const string UsersRead = "users.read"; + + public const string AccountFollowsRead = "account.follows.read"; + + public const string AccountFollowsWrite = "account.follows.write"; + + public const string OfflineAccess = "offline.access"; + + public const string SpacesRead = "spaces.read"; + } +}