Moved overridden ToString method to AuthenticationBase class

This commit is contained in:
sta 2014-07-03 19:34:32 +09:00
parent cdea232f2f
commit a2fcc8990f
3 changed files with 21 additions and 28 deletions

View File

@ -129,6 +129,23 @@ namespace WebSocketSharp.Net
return res; 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 #endregion
} }
} }

View File

@ -102,12 +102,12 @@ namespace WebSocketSharp.Net
: null; : null;
} }
internal string ToBasicString () internal override string ToBasicString ()
{ {
return String.Format ("Basic realm=\"{0}\"", Parameters["realm"]); return String.Format ("Basic realm=\"{0}\"", Parameters["realm"]);
} }
internal string ToDigestString () internal override string ToDigestString ()
{ {
var output = new StringBuilder (128); var output = new StringBuilder (128);
@ -142,19 +142,5 @@ namespace WebSocketSharp.Net
} }
#endregion #endregion
#region Public Methods
public override string ToString ()
{
var schm = Scheme;
return schm == AuthenticationSchemes.Basic
? ToBasicString ()
: schm == AuthenticationSchemes.Digest
? ToDigestString ()
: String.Empty;
}
#endregion
} }
} }

View File

@ -269,7 +269,7 @@ namespace WebSocketSharp.Net
return res; return res;
} }
internal string ToBasicString () internal override string ToBasicString ()
{ {
var userPass = String.Format ("{0}:{1}", Parameters["username"], Parameters["password"]); var userPass = String.Format ("{0}:{1}", Parameters["username"], Parameters["password"]);
var cred = Convert.ToBase64String (Encoding.UTF8.GetBytes (userPass)); var cred = Convert.ToBase64String (Encoding.UTF8.GetBytes (userPass));
@ -277,7 +277,7 @@ namespace WebSocketSharp.Net
return "Basic " + cred; return "Basic " + cred;
} }
internal string ToDigestString () internal override string ToDigestString ()
{ {
var output = new StringBuilder (256); var output = new StringBuilder (256);
output.AppendFormat ( output.AppendFormat (
@ -318,16 +318,6 @@ namespace WebSocketSharp.Net
: null; : null;
} }
public override string ToString ()
{
var schm = Scheme;
return schm == AuthenticationSchemes.Basic
? ToBasicString ()
: schm == AuthenticationSchemes.Digest
? ToDigestString ()
: String.Empty;
}
#endregion #endregion
} }
} }