Skip to content
This repository was archived by the owner on Mar 20, 2019. It is now read-only.

Commit 761bdd6

Browse files
rcollettercollette
committed
Undo CodeMaid formatting
1 parent 2882e4f commit 761bdd6

7 files changed

Lines changed: 141 additions & 233 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
DotNetOpenAuth
22
==============
33

4-
A C# implementation of the OpenID, OAuth and InfoCard protocols
4+
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/DotNetOpenAuth/DotNetOpenAuth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
5+
A C# implementation of the OpenID, OAuth protocols
56

67
Samples available:
78

89
* [Source](https://github.com/DotNetOpenAuth/DotNetOpenAuth.Samples)
9-
* [Test Stubs](http://sourceforge.net/projects/dnoa/files/releases/v4.3/v4.3.1/DotNetOpenAuth-4.3.1.13153-samples.7z/download)

‎samples/OAuth2ProtectedWebApi/Controllers/UserController.cs‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
namespace OAuth2ProtectedWebApi.Controllers
2-
{
1+
namespace OAuth2ProtectedWebApi.Controllers {
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Net.Http;
6+
using System.Security.Principal;
7+
using System.Threading.Tasks;
8+
using System.Web;
9+
using System.Web.Mvc;
10+
using System.Web.Security;
311
using DotNetOpenAuth.Messaging;
412
using DotNetOpenAuth.OAuth2;
13+
using DotNetOpenAuth.OAuth2.Messages;
514
using DotNetOpenAuth.OpenId;
615
using DotNetOpenAuth.OpenId.RelyingParty;
716
using OAuth2ProtectedWebApi.Code;
8-
using System;
9-
using System.Threading.Tasks;
10-
using System.Web.Mvc;
11-
using System.Web.Security;
1217

13-
public class UserController : Controller
14-
{
18+
public class UserController : Controller {
1519
[Authorize]
1620
[HttpGet]
1721
[HttpHeader("x-frame-options", "SAMEORIGIN")] // mitigates clickjacking
18-
public async Task<ActionResult> Authorize()
19-
{
22+
public async Task<ActionResult> Authorize() {
2023
var authServer = new AuthorizationServer(new AuthorizationServerHost());
2124
var authRequest = await authServer.ReadAuthorizationRequestAsync(this.Request);
2225
this.ViewData["scope"] = authRequest.Scope;
@@ -26,19 +29,15 @@ public async Task<ActionResult> Authorize()
2629

2730
[Authorize]
2831
[HttpPost, ValidateAntiForgeryToken]
29-
public async Task<ActionResult> Respond(string request, bool approval)
30-
{
32+
public async Task<ActionResult> Respond(string request, bool approval) {
3133
var authServer = new AuthorizationServer(new AuthorizationServerHost());
3234
var authRequest = await authServer.ReadAuthorizationRequestAsync(new Uri(request));
3335
IProtocolMessage responseMessage;
34-
if (approval)
35-
{
36+
if (approval) {
3637
var grantedResponse = authServer.PrepareApproveAuthorizationRequest(
3738
authRequest, this.User.Identity.Name, authRequest.Scope);
3839
responseMessage = grantedResponse;
39-
}
40-
else
41-
{
40+
} else {
4241
var rejectionResponse = authServer.PrepareRejectAuthorizationRequest(authRequest);
4342
rejectionResponse.Error = Protocol.EndUserAuthorizationRequestErrorCodes.AccessDenied;
4443
responseMessage = rejectionResponse;
@@ -49,14 +48,12 @@ public async Task<ActionResult> Respond(string request, bool approval)
4948
return response.AsActionResult();
5049
}
5150

52-
public async Task<ActionResult> Login(string returnUrl)
53-
{
51+
public async Task<ActionResult> Login(string returnUrl) {
5452
var rp = new OpenIdRelyingParty(null);
5553
Realm officialWebSiteHome = Realm.AutoDetect;
5654
Uri returnTo = new Uri(this.Request.Url, this.Url.Action("Authenticate"));
5755
var request = await rp.CreateRequestAsync(WellKnownProviders.Google, officialWebSiteHome, returnTo);
58-
if (returnUrl != null)
59-
{
56+
if (returnUrl != null) {
6057
request.SetUntrustedCallbackArgument("returnUrl", returnUrl);
6158
}
6259

@@ -65,14 +62,11 @@ public async Task<ActionResult> Login(string returnUrl)
6562
return redirectingResponse.AsActionResult();
6663
}
6764

68-
public async Task<ActionResult> Authenticate()
69-
{
65+
public async Task<ActionResult> Authenticate() {
7066
var rp = new OpenIdRelyingParty(null);
7167
var response = await rp.GetResponseAsync(this.Request);
72-
if (response != null)
73-
{
74-
if (response.Status == AuthenticationStatus.Authenticated)
75-
{
68+
if (response != null) {
69+
if (response.Status == AuthenticationStatus.Authenticated) {
7670
FormsAuthentication.SetAuthCookie(response.ClaimedIdentifier, false);
7771
return this.Redirect(FormsAuthentication.GetRedirectUrl(response.ClaimedIdentifier, false));
7872
}

‎samples/OAuthAuthorizationServer/Controllers/AccountController.cs‎

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,38 @@
1-
namespace OAuthAuthorizationServer.Controllers
2-
{
1+
namespace OAuthAuthorizationServer.Controllers {
2+
using System;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using System.Web.Mvc;
6+
using System.Web.Security;
37
using DotNetOpenAuth.Messaging;
48
using DotNetOpenAuth.OpenId;
59
using DotNetOpenAuth.OpenId.RelyingParty;
610
using OAuthAuthorizationServer.Code;
711
using OAuthAuthorizationServer.Models;
8-
using System;
9-
using System.Linq;
10-
using System.Threading.Tasks;
11-
using System.Web.Mvc;
12-
using System.Web.Security;
1312

1413
[HandleError]
15-
public class AccountController : Controller
16-
{
14+
public class AccountController : Controller {
1715
// **************************************
1816
// URL: /Account/LogOn
1917
// **************************************
20-
public ActionResult LogOn()
21-
{
18+
public ActionResult LogOn() {
2219
return View();
2320
}
2421

2522
[HttpPost]
26-
public async Task<ActionResult> LogOn(LogOnModel model, string returnUrl)
27-
{
28-
if (ModelState.IsValid)
29-
{
23+
public async Task<ActionResult> LogOn(LogOnModel model, string returnUrl) {
24+
if (ModelState.IsValid) {
3025
var rp = new OpenIdRelyingParty();
3126
var request = await rp.CreateRequestAsync(model.UserSuppliedIdentifier, Realm.AutoDetect, new Uri(Request.Url, Url.Action("Authenticate")));
32-
if (request != null)
33-
{
34-
if (returnUrl != null)
35-
{
27+
if (request != null) {
28+
if (returnUrl != null) {
3629
request.AddCallbackArguments("returnUrl", returnUrl);
3730
}
3831

3932
var response = await request.GetRedirectingResponseAsync();
4033
Response.ContentType = response.Content.Headers.ContentType.ToString();
4134
return response.AsActionResult();
42-
}
43-
else
44-
{
35+
} else {
4536
ModelState.AddModelError(string.Empty, "The identifier you supplied is not recognized as a valid OpenID Identifier.");
4637
}
4738
}
@@ -50,21 +41,16 @@ public async Task<ActionResult> LogOn(LogOnModel model, string returnUrl)
5041
return View(model);
5142
}
5243

53-
public async Task<ActionResult> Authenticate(string returnUrl)
54-
{
44+
public async Task<ActionResult> Authenticate(string returnUrl) {
5545
var rp = new OpenIdRelyingParty();
5646
var response = await rp.GetResponseAsync(Request);
57-
if (response != null)
58-
{
59-
switch (response.Status)
60-
{
47+
if (response != null) {
48+
switch (response.Status) {
6149
case AuthenticationStatus.Authenticated:
6250
// Make sure we have a user account for this guy.
6351
string identifier = response.ClaimedIdentifier; // convert to string so LinqToSQL expression parsing works.
64-
if (MvcApplication.DataContext.Users.FirstOrDefault(u => u.OpenIDClaimedIdentifier == identifier) == null)
65-
{
66-
MvcApplication.DataContext.Users.InsertOnSubmit(new User
67-
{
52+
if (MvcApplication.DataContext.Users.FirstOrDefault(u => u.OpenIDClaimedIdentifier == identifier) == null) {
53+
MvcApplication.DataContext.Users.InsertOnSubmit(new User {
6854
OpenIDFriendlyIdentifier = response.FriendlyIdentifierForDisplay,
6955
OpenIDClaimedIdentifier = response.ClaimedIdentifier,
7056
});
@@ -85,8 +71,7 @@ public async Task<ActionResult> Authenticate(string returnUrl)
8571
// **************************************
8672
// URL: /Account/LogOff
8773
// **************************************
88-
public ActionResult LogOff()
89-
{
74+
public ActionResult LogOff() {
9075
FormsAuthentication.SignOut();
9176

9277
return RedirectToAction("Index", "Home");

‎samples/OAuthAuthorizationServer/Controllers/OAuthController.cs‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
namespace OAuthAuthorizationServer.Controllers
2-
{
3-
using DotNetOpenAuth.Messaging;
4-
using DotNetOpenAuth.OAuth2;
5-
using OAuthAuthorizationServer.Code;
6-
using OAuthAuthorizationServer.Models;
1+
namespace OAuthAuthorizationServer.Controllers {
72
using System;
3+
using System.Collections.Generic;
84
using System.Linq;
95
using System.Net;
6+
using System.Security.Cryptography;
107
using System.Threading.Tasks;
118
using System.Web;
129
using System.Web.Mvc;
10+
using DotNetOpenAuth.Messaging;
11+
using DotNetOpenAuth.OAuth2;
12+
using OAuthAuthorizationServer.Code;
13+
using OAuthAuthorizationServer.Models;
1314

14-
public class OAuthController : Controller
15-
{
15+
public class OAuthController : Controller {
1616
private readonly AuthorizationServer authorizationServer = new AuthorizationServer(new OAuth2AuthorizationServer());
1717

1818
/// <summary>
1919
/// The OAuth 2.0 token endpoint.
2020
/// </summary>
2121
/// <returns>The response to the Client.</returns>
22-
public async Task<ActionResult> Token()
23-
{
22+
public async Task<ActionResult> Token() {
2423
var request = await this.authorizationServer.HandleTokenRequestAsync(this.Request, this.Response.ClientDisconnectedToken);
2524
Response.ContentType = request.Content.Headers.ContentType.ToString();
2625
return request.AsActionResult();
@@ -32,27 +31,23 @@ public async Task<ActionResult> Token()
3231
/// <returns>The browser HTML response that prompts the user to authorize the client.</returns>
3332
[Authorize, AcceptVerbs(HttpVerbs.Get | HttpVerbs.Post)]
3433
[HttpHeader("x-frame-options", "SAMEORIGIN")] // mitigates clickjacking
35-
public async Task<ActionResult> Authorize()
36-
{
34+
public async Task<ActionResult> Authorize() {
3735
var pendingRequest = await this.authorizationServer.ReadAuthorizationRequestAsync(Request, Response.ClientDisconnectedToken);
38-
if (pendingRequest == null)
39-
{
36+
if (pendingRequest == null) {
4037
throw new HttpException((int)HttpStatusCode.BadRequest, "Missing authorization request.");
4138
}
4239

4340
var requestingClient = MvcApplication.DataContext.Clients.First(c => c.ClientIdentifier == pendingRequest.ClientIdentifier);
4441

4542
// Consider auto-approving if safe to do so.
46-
if (((OAuth2AuthorizationServer)this.authorizationServer.AuthorizationServerServices).CanBeAutoApproved(pendingRequest))
47-
{
43+
if (((OAuth2AuthorizationServer)this.authorizationServer.AuthorizationServerServices).CanBeAutoApproved(pendingRequest)) {
4844
var approval = this.authorizationServer.PrepareApproveAuthorizationRequest(pendingRequest, HttpContext.User.Identity.Name);
4945
var response = await this.authorizationServer.Channel.PrepareResponseAsync(approval, Response.ClientDisconnectedToken);
5046
Response.ContentType = response.Content.Headers.ContentType.ToString();
5147
return response.AsActionResult();
5248
}
5349

54-
var model = new AccountAuthorizeModel
55-
{
50+
var model = new AccountAuthorizeModel {
5651
ClientApp = requestingClient.Name,
5752
Scope = pendingRequest.Scope,
5853
AuthorizationRequest = pendingRequest,
@@ -67,24 +62,20 @@ public async Task<ActionResult> Authorize()
6762
/// <param name="isApproved">if set to <c>true</c>, the user has authorized the Client; <c>false</c> otherwise.</param>
6863
/// <returns>HTML response that redirects the browser to the Client.</returns>
6964
[Authorize, HttpPost, ValidateAntiForgeryToken]
70-
public async Task<ActionResult> AuthorizeResponse(bool isApproved)
71-
{
65+
public async Task<ActionResult> AuthorizeResponse(bool isApproved) {
7266
var pendingRequest = await this.authorizationServer.ReadAuthorizationRequestAsync(Request, Response.ClientDisconnectedToken);
73-
if (pendingRequest == null)
74-
{
67+
if (pendingRequest == null) {
7568
throw new HttpException((int)HttpStatusCode.BadRequest, "Missing authorization request.");
7669
}
7770

7871
IDirectedProtocolMessage response;
79-
if (isApproved)
80-
{
72+
if (isApproved) {
8173
// The authorization we file in our database lasts until the user explicitly revokes it.
8274
// You can cause the authorization to expire by setting the ExpirationDateUTC
8375
// property in the below created ClientAuthorization.
8476
var client = MvcApplication.DataContext.Clients.First(c => c.ClientIdentifier == pendingRequest.ClientIdentifier);
8577
client.ClientAuthorizations.Add(
86-
new ClientAuthorization
87-
{
78+
new ClientAuthorization {
8879
Scope = OAuthUtilities.JoinScopes(pendingRequest.Scope),
8980
User = MvcApplication.LoggedInUser,
9081
CreatedOnUtc = DateTime.UtcNow,
@@ -94,9 +85,7 @@ public async Task<ActionResult> AuthorizeResponse(bool isApproved)
9485
// In this simple sample, the user either agrees to the entire scope requested by the client or none of it.
9586
// But in a real app, you could grant a reduced scope of access to the client by passing a scope parameter to this method.
9687
response = this.authorizationServer.PrepareApproveAuthorizationRequest(pendingRequest, User.Identity.Name);
97-
}
98-
else
99-
{
88+
} else {
10089
response = this.authorizationServer.PrepareRejectAuthorizationRequest(pendingRequest);
10190
}
10291

‎samples/OAuthAuthorizationServer/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</log4net>
7272

7373
<connectionStrings>
74-
<add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database4.mdf;Integrated Security=True;User Instance=True"
74+
<add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database4.mdf;Integrated Security=True;User Instance=True"
7575
providerName="System.Data.SqlClient" />
7676
</connectionStrings>
7777

0 commit comments

Comments
 (0)