Moved overridden ToString method to AuthenticationBase class
This commit is contained in:
parent
cdea232f2f
commit
a2fcc8990f
@ -129,6 +129,23 @@ namespace WebSocketSharp.Net
|
||||
return res;
|
||||
}
|
||||
|
||||
internal abstract string ToBasicString ();
|
||||
|
||||
internal abstract string ToDigestString ();
|
||||
|
||||
#endregion
|
||||
|
||||
#region Public Methods
|
||||
|
||||
public override string ToString ()
|
||||
{
|
||||
return _scheme == AuthenticationSchemes.Basic
|
||||
? ToBasicString ()
|
||||
: _scheme == AuthenticationSchemes.Digest
|
||||
? ToDigestString ()
|
||||
: String.Empty;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
@ -102,12 +102,12 @@ namespace WebSocketSharp.Net
|
||||
: null;
|
||||
}
|
||||
|
||||
internal string ToBasicString ()
|
||||
internal override string ToBasicString ()
|
||||
{
|
||||
return String.Format ("Basic realm=\"{0}\"", Parameters["realm"]);
|
||||
}
|
||||
|
||||
internal string ToDigestString ()
|
||||
internal override string ToDigestString ()
|
||||
{
|
||||
var output = new StringBuilder (128);
|
||||
|
||||
@ -142,19 +142,5 @@ namespace WebSocketSharp.Net
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Public Methods
|
||||
|
||||
public override string ToString ()
|
||||
{
|
||||
var schm = Scheme;
|
||||
return schm == AuthenticationSchemes.Basic
|
||||
? ToBasicString ()
|
||||
: schm == AuthenticationSchemes.Digest
|
||||
? ToDigestString ()
|
||||
: String.Empty;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
@ -269,7 +269,7 @@ namespace WebSocketSharp.Net
|
||||
return res;
|
||||
}
|
||||
|
||||
internal string ToBasicString ()
|
||||
internal override string ToBasicString ()
|
||||
{
|
||||
var userPass = String.Format ("{0}:{1}", Parameters["username"], Parameters["password"]);
|
||||
var cred = Convert.ToBase64String (Encoding.UTF8.GetBytes (userPass));
|
||||
@ -277,7 +277,7 @@ namespace WebSocketSharp.Net
|
||||
return "Basic " + cred;
|
||||
}
|
||||
|
||||
internal string ToDigestString ()
|
||||
internal override string ToDigestString ()
|
||||
{
|
||||
var output = new StringBuilder (256);
|
||||
output.AppendFormat (
|
||||
@ -318,16 +318,6 @@ namespace WebSocketSharp.Net
|
||||
: null;
|
||||
}
|
||||
|
||||
public override string ToString ()
|
||||
{
|
||||
var schm = Scheme;
|
||||
return schm == AuthenticationSchemes.Basic
|
||||
? ToBasicString ()
|
||||
: schm == AuthenticationSchemes.Digest
|
||||
? ToDigestString ()
|
||||
: String.Empty;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user