#270 Rename auth wrapper's internal collections to Items.

Tratcher · Tratcher · commit 74f29ad54d94 · 2015-04-21T11:35:56.000-07:00
diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationDescription.cs b/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationDescription.cs
@@ -21,30 +21,30 @@ public class AuthenticationDescription
         /// </summary>
         public AuthenticationDescription()
         {
-            Dictionary = new Dictionary<string, object>(StringComparer.Ordinal);
+            Items = new Dictionary<string, object>(StringComparer.Ordinal);
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AuthenticationDescription"/> class
         /// </summary>
-        /// <param name="properties"></param>
-        public AuthenticationDescription([NotNull] IDictionary<string, object> properties)
+        /// <param name="items"></param>
+        public AuthenticationDescription([NotNull] IDictionary<string, object> items)
         {
-            Dictionary = properties;
+            Items = items;
         }
 
         /// <summary>
         /// Contains metadata about the authentication provider.
         /// </summary>
-        public IDictionary<string, object> Dictionary { get; private set; }
+        public IDictionary<string, object> Items { get; private set; }
 
         /// <summary>
         /// Gets or sets the name used to reference the authentication middleware instance.
         /// </summary>
         public string AuthenticationScheme
         {
             get { return GetString(AuthenticationSchemePropertyKey); }
-            set { Dictionary[AuthenticationSchemePropertyKey] = value; }
+            set { Items[AuthenticationSchemePropertyKey] = value; }
         }
 
         /// <summary>
@@ -53,13 +53,13 @@ public string AuthenticationScheme
         public string Caption
         {
             get { return GetString(CaptionPropertyKey); }
-            set { Dictionary[CaptionPropertyKey] = value; }
+            set { Items[CaptionPropertyKey] = value; }
         }
 
         private string GetString(string name)
         {
             object value;
-            if (Dictionary.TryGetValue(name, out value))
+            if (Items.TryGetValue(name, out value))
             {
                 return Convert.ToString(value, CultureInfo.InvariantCulture);
             }
diff --git a/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationProperties.cs b/src/Microsoft.AspNet.Http.Core/Authentication/AuthenticationProperties.cs
@@ -24,71 +24,71 @@ public class AuthenticationProperties
         /// Initializes a new instance of the <see cref="AuthenticationProperties"/> class
         /// </summary>
         public AuthenticationProperties()
-            : this(dictionary: null)
+            : this(items: null)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AuthenticationProperties"/> class
         /// </summary>
-        /// <param name="dictionary"></param>
-        public AuthenticationProperties(IDictionary<string, string> dictionary)
+        /// <param name="items"></param>
+        public AuthenticationProperties(IDictionary<string, string> items)
         {
-            Dictionary = dictionary ?? new Dictionary<string, string>(StringComparer.Ordinal);
+            Items = items ?? new Dictionary<string, string>(StringComparer.Ordinal);
         }
 
         /// <summary>
         /// State values about the authentication session.
         /// </summary>
-        public IDictionary<string, string> Dictionary { get; private set; }
+        public IDictionary<string, string> Items { get; private set; }
 
         /// <summary>
         /// Gets or sets whether the authentication session is persisted across multiple requests.
         /// </summary>
         public bool IsPersistent
         {
-            get { return Dictionary.ContainsKey(IsPersistentKey); }
+            get { return Items.ContainsKey(IsPersistentKey); }
             set
             {
-                if (Dictionary.ContainsKey(IsPersistentKey))
+                if (Items.ContainsKey(IsPersistentKey))
                 {
                     if (!value)
                     {
-                        Dictionary.Remove(IsPersistentKey);
+                        Items.Remove(IsPersistentKey);
                     }
                 }
                 else
                 {
                     if (value)
                     {
-                        Dictionary.Add(IsPersistentKey, string.Empty);
+                        Items.Add(IsPersistentKey, string.Empty);
                     }
                 }
             }
         }
 
         /// <summary>
-        /// Gets or sets the full path or absolute URI to be used as an http redirect response value. 
+        /// Gets or sets the full path or absolute URI to be used as an http redirect response value.
         /// </summary>
         [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings", Justification = "By design")]
         public string RedirectUri
         {
             get
             {
                 string value;
-                return Dictionary.TryGetValue(RedirectUriKey, out value) ? value : null;
+                return Items.TryGetValue(RedirectUriKey, out value) ? value : null;
             }
             set
             {
                 if (value != null)
                 {
-                    Dictionary[RedirectUriKey] = value;
+                    Items[RedirectUriKey] = value;
                 }
                 else
                 {
-                    if (Dictionary.ContainsKey(RedirectUriKey))
+                    if (Items.ContainsKey(RedirectUriKey))
                     {
-                        Dictionary.Remove(RedirectUriKey);
+                        Items.Remove(RedirectUriKey);
                     }
                 }
             }
@@ -102,7 +102,7 @@ public DateTimeOffset? IssuedUtc
             get
             {
                 string value;
-                if (Dictionary.TryGetValue(IssuedUtcKey, out value))
+                if (Items.TryGetValue(IssuedUtcKey, out value))
                 {
                     DateTimeOffset dateTimeOffset;
                     if (DateTimeOffset.TryParseExact(value, UtcDateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTimeOffset))
@@ -116,13 +116,13 @@ public DateTimeOffset? IssuedUtc
             {
                 if (value.HasValue)
                 {
-                    Dictionary[IssuedUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);
+                    Items[IssuedUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);
                 }
                 else
                 {
-                    if (Dictionary.ContainsKey(IssuedUtcKey))
+                    if (Items.ContainsKey(IssuedUtcKey))
                     {
-                        Dictionary.Remove(IssuedUtcKey);
+                        Items.Remove(IssuedUtcKey);
                     }
                 }
             }
@@ -136,7 +136,7 @@ public DateTimeOffset? ExpiresUtc
             get
             {
                 string value;
-                if (Dictionary.TryGetValue(ExpiresUtcKey, out value))
+                if (Items.TryGetValue(ExpiresUtcKey, out value))
                 {
                     DateTimeOffset dateTimeOffset;
                     if (DateTimeOffset.TryParseExact(value, UtcDateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTimeOffset))
@@ -150,13 +150,13 @@ public DateTimeOffset? ExpiresUtc
             {
                 if (value.HasValue)
                 {
-                    Dictionary[ExpiresUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);
+                    Items[ExpiresUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);
                 }
                 else
                 {
-                    if (Dictionary.ContainsKey(ExpiresUtcKey))
+                    if (Items.ContainsKey(ExpiresUtcKey))
                     {
-                        Dictionary.Remove(ExpiresUtcKey);
+                        Items.Remove(ExpiresUtcKey);
                     }
                 }
             }
@@ -170,7 +170,7 @@ public bool? AllowRefresh
             get
             {
                 string value;
-                if (Dictionary.TryGetValue(RefreshKey, out value))
+                if (Items.TryGetValue(RefreshKey, out value))
                 {
                     bool refresh;
                     if (bool.TryParse(value, out refresh))
@@ -184,13 +184,13 @@ public bool? AllowRefresh
             {
                 if (value.HasValue)
                 {
-                    Dictionary[RefreshKey] = value.Value.ToString();
+                    Items[RefreshKey] = value.Value.ToString();
                 }
                 else
                 {
-                    if (Dictionary.ContainsKey(RefreshKey))
+                    if (Items.ContainsKey(RefreshKey))
                     {
-                        Dictionary.Remove(RefreshKey);
+                        Items.Remove(RefreshKey);
                     }
                 }
             }
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -87,7 +87,7 @@ public override void Challenge(AuthenticationProperties properties, string authe
             HttpResponseFeature.StatusCode = 401;
             var handler = HttpAuthenticationFeature.Handler;
 
-            var challengeContext = new ChallengeContext(authenticationScheme, properties == null ? null : properties.Dictionary);
+            var challengeContext = new ChallengeContext(authenticationScheme, properties == null ? null : properties.Items);
             if (handler != null)
             {
                 handler.Challenge(challengeContext);
@@ -103,7 +103,7 @@ public override void SignIn(string authenticationScheme, [NotNull] ClaimsPrincip
         {
             var handler = HttpAuthenticationFeature.Handler;
 
-            var signInContext = new SignInContext(authenticationScheme, principal, properties == null ? null : properties.Dictionary);
+            var signInContext = new SignInContext(authenticationScheme, principal, properties == null ? null : properties.Items);
             if (handler != null)
             {
                 handler.SignIn(signInContext);
@@ -120,7 +120,7 @@ public override void SignOut(string authenticationScheme, AuthenticationProperti
         {
             var handler = HttpAuthenticationFeature.Handler;
 
-            var signOutContext = new SignOutContext(authenticationScheme, properties?.Dictionary);
+            var signOutContext = new SignOutContext(authenticationScheme, properties?.Items);
             if (handler != null)
             {
                 handler.SignOut(signOutContext);

Original file line number	Diff line number	Diff line change
`@@ -21,30 +21,30 @@ public class AuthenticationDescription`
`21`	`21`	`/// </summary>`
`22`	`22`	`public AuthenticationDescription()`
`23`	`23`	`{`
`24`		`- Dictionary = new Dictionary<string, object>(StringComparer.Ordinal);`
	`24`	`+ Items = new Dictionary<string, object>(StringComparer.Ordinal);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// Initializes a new instance of the <see cref="AuthenticationDescription"/> class`
`29`	`29`	`/// </summary>`
`30`		`- /// <param name="properties"></param>`
`31`		`- public AuthenticationDescription([NotNull] IDictionary<string, object> properties)`
	`30`	`+ /// <param name="items"></param>`
	`31`	`+ public AuthenticationDescription([NotNull] IDictionary<string, object> items)`
`32`	`32`	`{`
`33`		`- Dictionary = properties;`
	`33`	`+ Items = items;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/// <summary>`
`37`	`37`	`/// Contains metadata about the authentication provider.`
`38`	`38`	`/// </summary>`
`39`		`- public IDictionary<string, object> Dictionary { get; private set; }`
	`39`	`+ public IDictionary<string, object> Items { get; private set; }`
`40`	`40`
`41`	`41`	`/// <summary>`
`42`	`42`	`/// Gets or sets the name used to reference the authentication middleware instance.`
`43`	`43`	`/// </summary>`
`44`	`44`	`public string AuthenticationScheme`
`45`	`45`	`{`
`46`	`46`	`get { return GetString(AuthenticationSchemePropertyKey); }`
`47`		`- set { Dictionary[AuthenticationSchemePropertyKey] = value; }`
	`47`	`+ set { Items[AuthenticationSchemePropertyKey] = value; }`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// <summary>`
`@@ -53,13 +53,13 @@ public string AuthenticationScheme`
`53`	`53`	`public string Caption`
`54`	`54`	`{`
`55`	`55`	`get { return GetString(CaptionPropertyKey); }`
`56`		`- set { Dictionary[CaptionPropertyKey] = value; }`
	`56`	`+ set { Items[CaptionPropertyKey] = value; }`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private string GetString(string name)`
`60`	`60`	`{`
`61`	`61`	`object value;`
`62`		`- if (Dictionary.TryGetValue(name, out value))`
	`62`	`+ if (Items.TryGetValue(name, out value))`
`63`	`63`	`{`
`64`	`64`	`return Convert.ToString(value, CultureInfo.InvariantCulture);`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,71 +24,71 @@ public class AuthenticationProperties`
`24`	`24`	`/// Initializes a new instance of the <see cref="AuthenticationProperties"/> class`
`25`	`25`	`/// </summary>`
`26`	`26`	`public AuthenticationProperties()`
`27`		`- : this(dictionary: null)`
	`27`	`+ : this(items: null)`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// Initializes a new instance of the <see cref="AuthenticationProperties"/> class`
`33`	`33`	`/// </summary>`
`34`		`- /// <param name="dictionary"></param>`
`35`		`- public AuthenticationProperties(IDictionary<string, string> dictionary)`
	`34`	`+ /// <param name="items"></param>`
	`35`	`+ public AuthenticationProperties(IDictionary<string, string> items)`
`36`	`36`	`{`
`37`		`- Dictionary = dictionary ?? new Dictionary<string, string>(StringComparer.Ordinal);`
	`37`	`+ Items = items ?? new Dictionary<string, string>(StringComparer.Ordinal);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/// <summary>`
`41`	`41`	`/// State values about the authentication session.`
`42`	`42`	`/// </summary>`
`43`		`- public IDictionary<string, string> Dictionary { get; private set; }`
	`43`	`+ public IDictionary<string, string> Items { get; private set; }`
`44`	`44`
`45`	`45`	`/// <summary>`
`46`	`46`	`/// Gets or sets whether the authentication session is persisted across multiple requests.`
`47`	`47`	`/// </summary>`
`48`	`48`	`public bool IsPersistent`
`49`	`49`	`{`
`50`		`- get { return Dictionary.ContainsKey(IsPersistentKey); }`
	`50`	`+ get { return Items.ContainsKey(IsPersistentKey); }`
`51`	`51`	`set`
`52`	`52`	`{`
`53`		`- if (Dictionary.ContainsKey(IsPersistentKey))`
	`53`	`+ if (Items.ContainsKey(IsPersistentKey))`
`54`	`54`	`{`
`55`	`55`	`if (!value)`
`56`	`56`	`{`
`57`		`- Dictionary.Remove(IsPersistentKey);`
	`57`	`+ Items.Remove(IsPersistentKey);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`else`
`61`	`61`	`{`
`62`	`62`	`if (value)`
`63`	`63`	`{`
`64`		`- Dictionary.Add(IsPersistentKey, string.Empty);`
	`64`	`+ Items.Add(IsPersistentKey, string.Empty);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/// <summary>`
`71`		`- /// Gets or sets the full path or absolute URI to be used as an http redirect response value.`
	`71`	`+ /// Gets or sets the full path or absolute URI to be used as an http redirect response value.`
`72`	`72`	`/// </summary>`
`73`	`73`	`[SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings", Justification = "By design")]`
`74`	`74`	`public string RedirectUri`
`75`	`75`	`{`
`76`	`76`	`get`
`77`	`77`	`{`
`78`	`78`	`string value;`
`79`		`- return Dictionary.TryGetValue(RedirectUriKey, out value) ? value : null;`
	`79`	`+ return Items.TryGetValue(RedirectUriKey, out value) ? value : null;`
`80`	`80`	`}`
`81`	`81`	`set`
`82`	`82`	`{`
`83`	`83`	`if (value != null)`
`84`	`84`	`{`
`85`		`- Dictionary[RedirectUriKey] = value;`
	`85`	`+ Items[RedirectUriKey] = value;`
`86`	`86`	`}`
`87`	`87`	`else`
`88`	`88`	`{`
`89`		`- if (Dictionary.ContainsKey(RedirectUriKey))`
	`89`	`+ if (Items.ContainsKey(RedirectUriKey))`
`90`	`90`	`{`
`91`		`- Dictionary.Remove(RedirectUriKey);`
	`91`	`+ Items.Remove(RedirectUriKey);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -102,7 +102,7 @@ public DateTimeOffset? IssuedUtc`
`102`	`102`	`get`
`103`	`103`	`{`
`104`	`104`	`string value;`
`105`		`- if (Dictionary.TryGetValue(IssuedUtcKey, out value))`
	`105`	`+ if (Items.TryGetValue(IssuedUtcKey, out value))`
`106`	`106`	`{`
`107`	`107`	`DateTimeOffset dateTimeOffset;`
`108`	`108`	`if (DateTimeOffset.TryParseExact(value, UtcDateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTimeOffset))`
`@@ -116,13 +116,13 @@ public DateTimeOffset? IssuedUtc`
`116`	`116`	`{`
`117`	`117`	`if (value.HasValue)`
`118`	`118`	`{`
`119`		`- Dictionary[IssuedUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);`
	`119`	`+ Items[IssuedUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);`
`120`	`120`	`}`
`121`	`121`	`else`
`122`	`122`	`{`
`123`		`- if (Dictionary.ContainsKey(IssuedUtcKey))`
	`123`	`+ if (Items.ContainsKey(IssuedUtcKey))`
`124`	`124`	`{`
`125`		`- Dictionary.Remove(IssuedUtcKey);`
	`125`	`+ Items.Remove(IssuedUtcKey);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`}`
`@@ -136,7 +136,7 @@ public DateTimeOffset? ExpiresUtc`
`136`	`136`	`get`
`137`	`137`	`{`
`138`	`138`	`string value;`
`139`		`- if (Dictionary.TryGetValue(ExpiresUtcKey, out value))`
	`139`	`+ if (Items.TryGetValue(ExpiresUtcKey, out value))`
`140`	`140`	`{`
`141`	`141`	`DateTimeOffset dateTimeOffset;`
`142`	`142`	`if (DateTimeOffset.TryParseExact(value, UtcDateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTimeOffset))`
`@@ -150,13 +150,13 @@ public DateTimeOffset? ExpiresUtc`
`150`	`150`	`{`
`151`	`151`	`if (value.HasValue)`
`152`	`152`	`{`
`153`		`- Dictionary[ExpiresUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);`
	`153`	`+ Items[ExpiresUtcKey] = value.Value.ToString(UtcDateTimeFormat, CultureInfo.InvariantCulture);`
`154`	`154`	`}`
`155`	`155`	`else`
`156`	`156`	`{`
`157`		`- if (Dictionary.ContainsKey(ExpiresUtcKey))`
	`157`	`+ if (Items.ContainsKey(ExpiresUtcKey))`
`158`	`158`	`{`
`159`		`- Dictionary.Remove(ExpiresUtcKey);`
	`159`	`+ Items.Remove(ExpiresUtcKey);`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`	`}`
`@@ -170,7 +170,7 @@ public bool? AllowRefresh`
`170`	`170`	`get`
`171`	`171`	`{`
`172`	`172`	`string value;`
`173`		`- if (Dictionary.TryGetValue(RefreshKey, out value))`
	`173`	`+ if (Items.TryGetValue(RefreshKey, out value))`
`174`	`174`	`{`
`175`	`175`	`bool refresh;`
`176`	`176`	`if (bool.TryParse(value, out refresh))`
`@@ -184,13 +184,13 @@ public bool? AllowRefresh`
`184`	`184`	`{`
`185`	`185`	`if (value.HasValue)`
`186`	`186`	`{`
`187`		`- Dictionary[RefreshKey] = value.Value.ToString();`
	`187`	`+ Items[RefreshKey] = value.Value.ToString();`
`188`	`188`	`}`
`189`	`189`	`else`
`190`	`190`	`{`
`191`		`- if (Dictionary.ContainsKey(RefreshKey))`
	`191`	`+ if (Items.ContainsKey(RefreshKey))`
`192`	`192`	`{`
`193`		`- Dictionary.Remove(RefreshKey);`
	`193`	`+ Items.Remove(RefreshKey);`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public override void Challenge(AuthenticationProperties properties, string authe`
`87`	`87`	`HttpResponseFeature.StatusCode = 401;`
`88`	`88`	`var handler = HttpAuthenticationFeature.Handler;`
`89`	`89`
`90`		`- var challengeContext = new ChallengeContext(authenticationScheme, properties == null ? null : properties.Dictionary);`
	`90`	`+ var challengeContext = new ChallengeContext(authenticationScheme, properties == null ? null : properties.Items);`
`91`	`91`	`if (handler != null)`
`92`	`92`	`{`
`93`	`93`	`handler.Challenge(challengeContext);`
`@@ -103,7 +103,7 @@ public override void SignIn(string authenticationScheme, [NotNull] ClaimsPrincip`
`103`	`103`	`{`
`104`	`104`	`var handler = HttpAuthenticationFeature.Handler;`
`105`	`105`
`106`		`- var signInContext = new SignInContext(authenticationScheme, principal, properties == null ? null : properties.Dictionary);`
	`106`	`+ var signInContext = new SignInContext(authenticationScheme, principal, properties == null ? null : properties.Items);`
`107`	`107`	`if (handler != null)`
`108`	`108`	`{`
`109`	`109`	`handler.SignIn(signInContext);`
`@@ -120,7 +120,7 @@ public override void SignOut(string authenticationScheme, AuthenticationProperti`
`120`	`120`	`{`
`121`	`121`	`var handler = HttpAuthenticationFeature.Handler;`
`122`	`122`
`123`		`- var signOutContext = new SignOutContext(authenticationScheme, properties?.Dictionary);`
	`123`	`+ var signOutContext = new SignOutContext(authenticationScheme, properties?.Items);`
`124`	`124`	`if (handler != null)`
`125`	`125`	`{`
`126`	`126`	`handler.SignOut(signOutContext);`