2006-10-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* src/Mono.Google/Authentication.cs: make the captcha_url relative to
	the url given in the error response.


svn path=/trunk/google-sharp/; revision=66288
This commit is contained in:
Gonzalo Paniagua Javier 2006-10-05 14:14:52 +00:00
Родитель af58003a23
Коммит ae2ea65e82
2 изменённых файлов: 14 добавлений и 2 удалений

Просмотреть файл

@ -1,3 +1,8 @@
2006-10-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* src/Mono.Google/Authentication.cs: make the captcha_url relative to
the url given in the error response.
2006-10-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* src/Mono.Google/AuthErrorCode.cs: removed.

Просмотреть файл

@ -164,7 +164,7 @@ namespace Mono.Google {
AccountDeleted,
AccountDisabled,
ServiceUnavailable
but CaptchRequired is reported as 'cr'. Don't know about the others.
but CaptchaRequired is reported as 'cr'. Don't know about the others.
*/
code = str.Substring (6);
} else if (str.StartsWith ("CaptchaToken=")) {
@ -174,8 +174,15 @@ namespace Mono.Google {
}
}
}
if (code == "cr" && token != null && captcha_url != null)
if (code == "cr" && token != null && captcha_url != null) {
if (url != null) {
Uri uri = new Uri (url);
captcha_url = new Uri (uri, captcha_url).ToString ();
} else if (!captcha_url.StartsWith ("https://")) {
captcha_url = "https://www.google.com/accounts/" + captcha_url;
}
throw new CaptchaException (url, token, captcha_url);
}
throw new UnauthorizedAccessException (String.Format ("Access to '{0}' is denied ({1})", url, code));
}