diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-05 22:06:52 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-05 22:06:52 -0700 |
| commit | a1513732aff8dc75c026bef440083bcaafc73b60 (patch) | |
| tree | c59aa6327aa410e9e8c350ee8cb371b5cffb957f /samples | |
| parent | 2847bf5a7d5103ba8694f6b0347047273646e4ee (diff) | |
| parent | 0aedb0da7764bc42761384c43404be15063aad40 (diff) | |
| download | DotNetOpenAuth-a1513732aff8dc75c026bef440083bcaafc73b60.zip DotNetOpenAuth-a1513732aff8dc75c026bef440083bcaafc73b60.tar.gz DotNetOpenAuth-a1513732aff8dc75c026bef440083bcaafc73b60.tar.bz2 | |
Merge branch 'v3.0' into v3.1
Conflicts:
build.proj
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/OpenIdProviderWebForms/Web.config | 5 | ||||
| -rw-r--r-- | samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs | 3 | ||||
| -rw-r--r-- | samples/OpenIdRelyingPartyWebForms/Web.config | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/samples/OpenIdProviderWebForms/Web.config b/samples/OpenIdProviderWebForms/Web.config index 745cb2c..a6cd2eb 100644 --- a/samples/OpenIdProviderWebForms/Web.config +++ b/samples/OpenIdProviderWebForms/Web.config @@ -91,9 +91,10 @@ <!-- Trust level discussion: Full: everything works High: TRACE compilation symbol must NOT be defined - Medium/Low: doesn't work on default machine.config, because WebPermission.Connect is denied. + Medium: doesn't work unless originUrl=".*" or WebPermission.Connect is extended. + Low: doesn't work because WebPermission.Connect is denied. --> - <trust level="High" originUrl=""/> + <trust level="Medium" originUrl=".*"/> <pages> <controls> <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> diff --git a/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs b/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs index 784533b..fd22389 100644 --- a/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs +++ b/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs @@ -10,6 +10,8 @@ using DotNetOpenAuth.OpenId.RelyingParty; public class UserController : Controller { + private static OpenIdRelyingParty openid = new OpenIdRelyingParty(); + public ActionResult Index() { if (!User.Identity.IsAuthenticated) { Response.Redirect("/User/Login?ReturnUrl=Index"); @@ -34,7 +36,6 @@ [ValidateInput(false)] public ActionResult Authenticate(string returnUrl) { - var openid = new OpenIdRelyingParty(); var response = openid.GetResponse(); if (response == null) { // Stage 2: user submitting Identifier diff --git a/samples/OpenIdRelyingPartyWebForms/Web.config b/samples/OpenIdRelyingPartyWebForms/Web.config index 4408ebf..7983e21 100644 --- a/samples/OpenIdRelyingPartyWebForms/Web.config +++ b/samples/OpenIdRelyingPartyWebForms/Web.config @@ -62,9 +62,10 @@ <!-- Trust level discussion: Full: everything works High: TRACE compilation symbol must NOT be defined - Medium/Low: doesn't work on default machine.config, because WebPermission.Connect is denied. + Medium: doesn't work unless originUrl=".*" or WebPermission.Connect is extended. + Low: doesn't work because WebPermission.Connect is denied. --> - <trust level="High" originUrl=""/> + <trust level="Medium" originUrl=".*"/> </system.web> <!-- log4net is a 3rd party (free) logger library that dotnetopenid will use if present but does not require. --> |