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

Commit 22f3d52

Browse files
committed
#111 - Change Challenge, SignIn parameter order to support params.
1 parent cd78e11 commit 22f3d52

File tree

2 files changed

+33
-12
lines changed

2 files changed

+33
-12
lines changed

src/Microsoft.AspNet.Http/HttpResponse.cs

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,42 +40,62 @@ public virtual void Challenge()
4040

4141
public virtual void Challenge(AuthenticationProperties properties)
4242
{
43-
Challenge(new string[0], properties);
43+
Challenge(properties, new string[0]);
4444
}
4545

4646
public virtual void Challenge(string authenticationType)
4747
{
4848
Challenge(new[] { authenticationType });
4949
}
5050

51-
public virtual void Challenge(string authenticationType, AuthenticationProperties properties)
51+
public virtual void Challenge(AuthenticationProperties properties, string authenticationType)
5252
{
53-
Challenge(new[] { authenticationType }, properties);
53+
Challenge(properties, new[] { authenticationType });
54+
}
55+
56+
public void Challenge(params string[] authenticationTypes)
57+
{
58+
Challenge((IEnumerable<string>)authenticationTypes);
5459
}
5560

5661
public virtual void Challenge(IEnumerable<string> authenticationTypes)
5762
{
58-
Challenge(authenticationTypes, properties: null);
63+
Challenge(properties: null, authenticationTypes: authenticationTypes);
64+
}
65+
66+
public void Challenge(AuthenticationProperties properties, params string[] authenticationTypes)
67+
{
68+
Challenge(properties, (IEnumerable<string>)authenticationTypes);
5969
}
6070

61-
public abstract void Challenge(IEnumerable<string> authenticationTypes, AuthenticationProperties properties);
71+
public abstract void Challenge(AuthenticationProperties properties, IEnumerable<string> authenticationTypes);
6272

6373
public virtual void SignIn(ClaimsIdentity identity)
6474
{
65-
SignIn(identity, properties: null);
75+
SignIn(properties: null, identity: identity);
6676
}
6777

68-
public virtual void SignIn(ClaimsIdentity identity, AuthenticationProperties properties)
78+
public virtual void SignIn(AuthenticationProperties properties, ClaimsIdentity identity)
6979
{
70-
SignIn(new[] { identity }, properties);
80+
SignIn(properties, new[] { identity });
81+
}
82+
83+
public virtual void SignIn(params ClaimsIdentity[] identities)
84+
{
85+
SignIn(properties: null, identities: (IEnumerable<ClaimsIdentity>)identities);
7186
}
7287

7388
public virtual void SignIn(IEnumerable<ClaimsIdentity> identities)
7489
{
75-
SignIn(identities, properties: null);
90+
SignIn(properties: null, identities: identities);
91+
}
92+
93+
public void SignIn(AuthenticationProperties properties, params ClaimsIdentity[] identities)
94+
{
95+
SignIn(properties, (IEnumerable<ClaimsIdentity>)identities);
7696
}
7797

78-
public abstract void SignIn(IEnumerable<ClaimsIdentity> identities, AuthenticationProperties properties);
98+
public abstract void SignIn(AuthenticationProperties properties, IEnumerable<ClaimsIdentity> identities);
7999

80100
public virtual void SignOut()
81101
{

src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public override void Redirect(string location, bool permanent)
124124
Headers.Set(Constants.Headers.Location, location);
125125
}
126126

127-
public override void Challenge(IEnumerable<string> authenticationTypes, AuthenticationProperties properties)
127+
public override void Challenge(AuthenticationProperties properties, IEnumerable<string> authenticationTypes)
128128
{
129129
if (authenticationTypes == null)
130130
{
@@ -147,12 +147,13 @@ public override void Challenge(IEnumerable<string> authenticationTypes, Authenti
147147
}
148148
}
149149

150-
public override void SignIn(IEnumerable<ClaimsIdentity> identities, AuthenticationProperties properties)
150+
public override void SignIn(AuthenticationProperties properties, IEnumerable<ClaimsIdentity> identities)
151151
{
152152
if (identities == null)
153153
{
154154
throw new ArgumentNullException();
155155
}
156+
156157
var handler = HttpAuthenticationFeature.Handler;
157158

158159
var signInContext = new SignInContext(identities, properties == null ? null : properties.Dictionary);

0 commit comments

Comments
 (0)