Add scope delimiter option #17

thosakwe · 2017-01-12T22:12:21Z

Fixes the following issues:

oauth2 package - pass in scope delimiter character, default to 'a single space dart-lang/tools#308

nex3 · 2017-01-12T22:31:24Z

lib/src/authorization_code_grant.dart

-          this.tokenEndpoint,
-          {this.secret, bool basicAuth: true, http.Client httpClient})
+      this.identifier, this.authorizationEndpoint, this.tokenEndpoint,
+      {this.secret, bool basicAuth: true, http.Client httpClient})


Please don't include unrelated formatting changes.

Ok, I won't. Sorry, didn't know.

nex3 · 2017-01-12T22:32:29Z

lib/src/authorization_code_grant.dart

-  Uri getAuthorizationUrl(Uri redirect, {Iterable<String> scopes,
-      String state}) {
+  Uri getAuthorizationUrl(Uri redirect,
+      {Iterable<String> scopes, String state, String delimiter: ' '}) {


Document the delimiter parameter, and assign the default in the body rather than in the parameter list (putting it in the parameter list makes it impossible for users to express "use the default" without explicitly encoding that default).

This reverts commit f993e07.

thosakwe · 2017-03-11T13:57:44Z

@nex3 Sorry for not updating this in a long time, but I've now made the requested changes.

nex3 · 2017-05-15T19:02:32Z

One more thing (sorry I didn't catch this in the first review!): I think for AuthorizationCodeGrant and Credentials, the delimiter should be set in the constructor rather than in the method. A given endpoint is always going to want the same delimiter, and for Credentials in particular you need the Client to be able to call refresh() without any extra knowledge of the quirks of the endpoint's API.

thosakwe · 2017-05-16T05:06:05Z

Okay, that works. I'll update it tomorrow, thanks!

googlebot · 2017-06-01T06:28:11Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

thosakwe · 2017-06-01T06:30:09Z

Not really sure why the CLA thing went away, but I've signed it before.

nex3 · 2017-06-01T20:38:21Z

It looks like GitHub thinks that dd57b59 has an invalid author email. Did you commit with a different email than you normally use?

thosakwe · 2017-06-01T22:23:25Z

No, it's the same one; however, I recently bought a new computer, so maybe that has something to do with it.

It's times like these when I realize how little I actually know about Git, haha.

nex3 · 2017-06-01T22:49:08Z

Looking at the commits locally, it looks like your most recent one has your email as the committer name, and Dh6743tyre08 as your email address. This doc should say how to fix that.

googlebot · 2017-06-01T23:19:45Z

CLAs look good, thanks!

thosakwe · 2017-06-01T23:20:21Z

Okay, so I was able to change my credentials locally. Had to rewrite the commit history and change my e-mail as well. CLA approval is back, woohoo!

nex3 · 2017-06-02T00:37:22Z

lib/src/authorization_code_grant.dart

+  /// The scope strings will be separated by the provided [delimiter]. This
+  /// defaults to `" "`, the OAuth2 standard, but some APIs (such as Facebook's)
+  /// use non-standard delimiters.
+  final String delimiter;


This should be private, and the constructor parameter should be documented independently.

nex3 · 2017-06-02T00:39:13Z

lib/src/authorization_code_grant.dart

@@ -148,7 +153,7 @@ class AuthorizationCodeGrant {
    };

    if (state != null) parameters['state'] = state;
-    if (!scopes.isEmpty) parameters['scope'] = scopes.join(' ');
+    if (!scopes.isEmpty) parameters['scope'] = scopes.join(delimiter ?? ' ');


It would simplify the data model to assign the field to ' ' if the parameter isn't passed, rather than checking on every use.

nex3 · 2017-06-02T00:40:07Z

lib/src/handle_access_token_response.dart

 Credentials handleAccessTokenResponse(
    http.Response response,
    Uri tokenEndpoint,
    DateTime startTime,
-    List<String> scopes) {
+    List<String> scopes,
+    {String delimiter}) {


It's not worth making this optional since it's only called internally.

nex3 · 2017-06-02T00:40:38Z

lib/src/resource_owner_password_grant.dart

@@ -56,13 +61,13 @@ Future<Client> resourceOwnerPasswordGrant(
    }
  }

-  if (scopes != null && !scopes.isEmpty) body['scope'] = scopes.join(' ');
+  if (scopes != null && !scopes.isEmpty) body['scope'] = scopes.join(delimiter ?? ' ');


Similarly to the above, just do delimiter ??= ' ' at the top of the function.

Okay, just pushed commits to correct these. Let me know if they're up to your expectations!

# Conflicts: # lib/src/authorization_code_grant.dart

googlebot · 2017-06-02T01:28:16Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

thosakwe · 2017-06-02T01:29:29Z

Made the changes, but I'm an idiot and keep running into the CLA thing. Give me 2 minutes to fix it. Hopefully I'll have it done by the time you see this.

googlebot · 2017-06-02T01:30:53Z

CLAs look good, thanks!

nex3 · 2017-06-02T01:38:07Z

The code looks good! Can you add tests?

thosakwe · 2017-06-02T01:38:45Z

Sure. Which tests?

nex3 · 2017-06-02T01:49:24Z

We should test every place the scope parameter escapes the package.

thosakwe · 2017-06-02T14:17:03Z

All right, I'll add some, and then just let me know if I'm missing anything!

googlebot · 2017-06-02T14:59:59Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

googlebot · 2017-06-02T15:02:20Z

CLAs look good, thanks!

nex3 · 2017-06-02T21:21:09Z

Looks good, thanks for iterating on this!

thosakwe · 2017-06-02T21:57:19Z

Awesome, thanks for the merge! This should fix dart-lang/tools#308. Now I'll get started on dart-lang/tools#303.

Fixed Facebook-related issues

f993e07

googlebot added the cla: yes label Jan 12, 2017

nex3 suggested changes Jan 12, 2017

View reviewed changes

thosakwe added 2 commits March 11, 2017 08:42

Revert "Fixed Facebook-related issues"

b67c9be

This reverts commit f993e07.

Applied changes WITHOUT formatting changes

c5c82b9

thosakwe mentioned this pull request Mar 11, 2017

oauth2 package - pass in scope delimiter character, default to 'a single space dart-lang/tools#308

Closed

thosakwe changed the title ~~Fixed Facebook-related issues~~ Add scope delimiter option Mar 11, 2017

Tweak delimiter documentation.

30e3552

thosakwe added 2 commits June 1, 2017 02:28

Moved delimiter to two constructors

e36e4fd

Moved delimiter to two constructors

316dd33

googlebot added cla: no and removed cla: yes labels Jun 1, 2017

thosakwe mentioned this pull request Jun 1, 2017

Add delimiter option angel-dart-archive/auth_oauth2#3

Closed

thosakwe added 2 commits June 1, 2017 19:14

Updated auth

2686c65

Updated auth

a5ae947

googlebot added cla: yes and removed cla: no labels Jun 1, 2017

Merge remote-tracking branch 'origin/master'

9dbf6f7

nex3 suggested changes Jun 2, 2017

View reviewed changes

Simplified data model, documented constructor params

22d98d7

thosakwe added 3 commits June 1, 2017 21:26

Removed redundant null-checks

ba12cc8

Merge remote-tracking branch 'origin/master'

c6eb6dc

# Conflicts: # lib/src/authorization_code_grant.dart

Removed redundant null-checks

dead0aa

googlebot added cla: no and removed cla: yes labels Jun 2, 2017

googlebot added cla: yes and removed cla: no labels Jun 2, 2017

thosakwe added 3 commits June 2, 2017 10:43

AuthCodeGrant test - ensure correct delimiter is used

8ce0a94

Added delimiter tests in multiple files

0f27fe7

Merge remote-tracking branch 'origin/master'

435f056

googlebot added cla: no and removed cla: yes labels Jun 2, 2017

googlebot added cla: yes and removed cla: no labels Jun 2, 2017

Style changes.

e28aeb4

nex3 approved these changes Jun 2, 2017

View reviewed changes

Pubspec and changelog.

04c1d4b

nex3 merged commit 9b462af into dart-archive:master Jun 2, 2017

mosuem pushed a commit to dart-lang/tools that referenced this pull request Aug 21, 2024

Add scope delimiter option (dart-archive/oauth2#17)

009c201

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add scope delimiter option #17

Add scope delimiter option #17

thosakwe commented Jan 12, 2017 •

edited

Loading

nex3 Jan 12, 2017

thosakwe Jan 12, 2017

nex3 Jan 12, 2017

thosakwe Jan 12, 2017

thosakwe commented Mar 11, 2017

nex3 commented May 15, 2017

thosakwe commented May 16, 2017

googlebot commented Jun 1, 2017

thosakwe commented Jun 1, 2017

nex3 commented Jun 1, 2017

thosakwe commented Jun 1, 2017

nex3 commented Jun 1, 2017

googlebot commented Jun 1, 2017

thosakwe commented Jun 1, 2017

nex3 Jun 2, 2017

nex3 Jun 2, 2017

nex3 Jun 2, 2017

nex3 Jun 2, 2017

thosakwe Jun 2, 2017

googlebot commented Jun 2, 2017

thosakwe commented Jun 2, 2017

googlebot commented Jun 2, 2017

nex3 commented Jun 2, 2017

thosakwe commented Jun 2, 2017

nex3 commented Jun 2, 2017

thosakwe commented Jun 2, 2017

googlebot commented Jun 2, 2017

googlebot commented Jun 2, 2017

nex3 commented Jun 2, 2017

thosakwe commented Jun 2, 2017

Add scope delimiter option #17

Add scope delimiter option #17

Conversation

thosakwe commented Jan 12, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thosakwe commented Mar 11, 2017

nex3 commented May 15, 2017

thosakwe commented May 16, 2017

googlebot commented Jun 1, 2017

thosakwe commented Jun 1, 2017

nex3 commented Jun 1, 2017

thosakwe commented Jun 1, 2017

nex3 commented Jun 1, 2017

googlebot commented Jun 1, 2017

thosakwe commented Jun 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

googlebot commented Jun 2, 2017

thosakwe commented Jun 2, 2017

googlebot commented Jun 2, 2017

nex3 commented Jun 2, 2017

thosakwe commented Jun 2, 2017

nex3 commented Jun 2, 2017

thosakwe commented Jun 2, 2017

googlebot commented Jun 2, 2017

googlebot commented Jun 2, 2017

nex3 commented Jun 2, 2017

thosakwe commented Jun 2, 2017

thosakwe commented Jan 12, 2017 •

edited

Loading