Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GoogleWebAuthorizationBroker and FileDataStore on NetStandard #962

Merged
merged 4 commits into from
Mar 30, 2017
Merged

GoogleWebAuthorizationBroker and FileDataStore on NetStandard #962

merged 4 commits into from
Mar 30, 2017

Conversation

chrisdunelm
Copy link
Contributor

Fixes #897

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Mar 29, 2017
@chrisdunelm
Copy link
Contributor Author

Integration tests pass on:

  • Window desktop
  • Windows core
  • MacOS core

I haven't tested on Linux Core yet, but will before merging.

chrisdunelm
chrisdunelm commented Mar 29, 2017
View reviewed changes
Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/LocalServerCodeReceiver.cs Outdated
{
var stream = client.GetStream();

var buffer = new byte[1];

This comment was marked as spam.

Sign in to view

@sguergachi
Copy link

Would this also fix #941 ?

jskeet
jskeet reviewed Mar 30, 2017
View reviewed changes
Copy link
Collaborator

@jskeet jskeet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly fine, but several comments :)

Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/GoogleWebAuthorizationBroker.cs
/// The reason that this is not 'private const' is that a user can change it and store the credentials in a
/// different location.
/// </remarks>
public static string Folder = "Google.Apis.Auth";

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/LocalServerCodeReceiver.cs
return redirectUri;
}

return redirectUri = string.Format(LoopbackCallback, GetRandomUnusedPort());

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/LocalServerCodeReceiver.cs Outdated
Port = ((IPEndPoint)_listener.LocalEndpoint).Port;
}

private TcpListener _listener;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/LocalServerCodeReceiver.cs Outdated
catch (ServerException e)
{
Logger.Warning("{0}", e.Message);
throw e;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/LocalServerCodeReceiver.cs Outdated
{
try
{
return await GetQueryParamsFromClientAsync(client, ct);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/LocalServerCodeReceiver.cs Outdated
throw new ServerException("Unexpected end of network stream waiting for headers.");
}
c0 = c1;
c1 = (char)b;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis.Auth.PlatformServices_Shared/OAuth2/LocalServerCodeReceiver.cs Outdated
// Looking for an empty line, terminated by \r\n
int byteCount = 0;
int lineLength = 0;
char c0 = (char)0;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis/Apis/Util/Store/FileDataStore.cs Outdated
/// </summary>
/// <param name="folder">Folder path.</param>
/// <param name="fullPath">
/// Defines weather the folder parameter is absolute or relative to

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis/Apis/Util/Store/FileDataStore.cs Outdated
string path =
Environment.GetEnvironmentVariable("APPDATA") ?? // Windows
Environment.GetEnvironmentVariable("HOME"); // Linux, MacOS
if (path == "")

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/GoogleApis/Apis/Util/Store/FileDataStore.cs Outdated
{
string path =
Environment.GetEnvironmentVariable("APPDATA") ?? // Windows
Environment.GetEnvironmentVariable("HOME"); // Linux, MacOS

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

jskeet
jskeet approved these changes Mar 30, 2017
View reviewed changes
Copy link
Collaborator

@jskeet jskeet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Further change to support ISO-8859-1 just in case coming, as discussed offline - otherwise fine.

@chrisdunelm chrisdunelm merged commit 12dbe82 into googleapis:master Mar 30, 2017
@chrisdunelm chrisdunelm deleted the webauth branch March 30, 2017 09:25
@chrisdunelm chrisdunelm mentioned this pull request Apr 2, 2017
Closed
@chrisdunelm
Copy link
Contributor Author

chrisdunelm commented Apr 7, 2017 •
edited
Loading

@sguergachi This partially fixes #941, in that there is now a FileDataStore available for netstandard and therefore UWP. However, if we decide to support UWP I would expect we'll provide an IDataStore implementation using Windows.Storage, which is more suitable for a UWP application.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jskeet jskeet jskeet approved these changes

Assignees

@jskeet jskeet

Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chrisdunelm @sguergachi @jskeet @googlebot