Running code with Justin Richer.

WilliamDenniss · Mar 27, 2017 · 463efbd · WilliamDenniss · Jun 2, 2020 · WilliamDenniss
1 parent 6ef07c7
commit 463efbd
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/Example-tvOS/Source/GTMAppAuthTVExampleViewController.m b/Example-tvOS/Source/GTMAppAuthTVExampleViewController.m
@@ -23,18 +23,19 @@
 
 #import "GTMSessionFetcher.h"
 #import "GTMSessionFetcherService.h"
+#import "GTMTVServiceConfiguration.h"
 
 /*! @brief The OAuth client ID.
     @discussion For Google, register your client at
         https://console.developers.google.com/apis/credentials?project=_
  */
-static NSString *const kClientID = @"YOUR_CLIENT.apps.googleusercontent.com";
+static NSString *const kClientID = @"deviceflow";
 
 /*! @brief The OAuth client secret.
     @discussion For Google, register your client at
         https://console.developers.google.com/apis/credentials?project=_
  */
-static NSString *const kClientSecret = @"YOUR_CLIENT_SECRET";
+static NSString *const kClientSecret = @"secret";
 
 /*! @brief NSCoding key for the authorization property.
  */
@@ -80,8 +81,19 @@ - (IBAction)signin:(id)sender {
     [self cancelSignIn:nil];
   }
 
+
+  NSURL *deviceAuthorizationEndpoint = [NSURL URLWithString:@"https://mitreid.org/devicecode"];
+  NSURL *tokenEndpoint = [NSURL URLWithString:@"https://mitreid.org/token"];
+
+
   // builds authentication request
-  GTMTVServiceConfiguration *configuration = [GTMTVAuthorizationService TVConfigurationForGoogle];
+  GTMTVServiceConfiguration *configuration =
+      [[GTMTVServiceConfiguration alloc] initWithAuthorizationEndpoint:deviceAuthorizationEndpoint
+                                               TVAuthorizationEndpoint:deviceAuthorizationEndpoint
+                                                         tokenEndpoint:tokenEndpoint];
+
+
+
   GTMTVAuthorizationRequest *request =
       [[GTMTVAuthorizationRequest alloc] initWithConfiguration:configuration
                                                       clientId:kClientID
@@ -143,12 +155,12 @@ - (void)saveState {
 /*! @brief Loads the @c GTMAppAuthFetcherAuthorization from @c NSUSerDefaults.
  */
 - (void)loadState {
-  GTMAppAuthFetcherAuthorization* authorization =
-      [GTMAppAuthFetcherAuthorization authorizationFromKeychainForName:kExampleAuthorizerKey];
-  [self setAuthorization:authorization];
-  if (authorization) {
-    [self logMessage:@"Authorization restored: %@", authorization];
-  }
+//  GTMAppAuthFetcherAuthorization* authorization =
+//      [GTMAppAuthFetcherAuthorization authorizationFromKeychainForName:kExampleAuthorizerKey];
+//  [self setAuthorization:authorization];
+//  if (authorization) {
+//    [self logMessage:@"Authorization restored: %@", authorization];
+//  }
 }
 
 /*! @brief Refreshes UI, typically called after the auth state changed.
@@ -176,7 +188,7 @@ - (IBAction)userinfo:(nullable id)sender {
   fetcherService.authorizer = self.authorization;
 
   // Creates a fetcher for the API call.
-  NSURL *userinfoEndpoint = [NSURL URLWithString:@"https://www.googleapis.com/oauth2/v3/userinfo"];
+  NSURL *userinfoEndpoint = [NSURL URLWithString:@"https://mitreid.org/userinfo"];
   GTMSessionFetcher *fetcher = [fetcherService fetcherWithURL:userinfoEndpoint];
   [fetcher beginFetchWithCompletionHandler:^(NSData *data, NSError *error) {
 

diff --git a/Source/GTMTVAuthorizationResponse.m b/Source/GTMTVAuthorizationResponse.m
@@ -24,12 +24,12 @@
 #import "OIDFieldMapping.h"
 #import "OIDTokenRequest.h"
 
-NSString *const GTMTVDeviceTokenGrantType = @"http://oauth.net/grant_type/device/1.0";
+NSString *const GTMTVDeviceTokenGrantType = @"urn:ietf:params:oauth:grant-type:device_code";
 
 /*! @brief The key for the @c verificationURL property in the incoming parameters and for
         @c NSSecureCoding.
  */
-static NSString *const kVerificationURLKey = @"verification_url";
+static NSString *const kVerificationURLKey = @"verification_uri";
 
 /*! @brief The key for the @c userCode property in the incoming parameters and for
         @c NSSecureCoding.
@@ -154,7 +154,7 @@ - (OIDTokenRequest *)tokenPollRequestWithAdditionalParameters:
                                               scopes:nil
                                         refreshToken:nil
                                         codeVerifier:nil
-                                additionalParameters:nil];
+                                additionalParameters:@{@"device_code": _deviceCode}];
   return pollRequest;
 }
 

diff --git a/Source/GTMTVAuthorizationService.m b/Source/GTMTVAuthorizationService.m
@@ -186,6 +186,10 @@ + (GTMTVAuthorizationCancelBlock)authorizeTVRequest:(GTMTVAuthorizationRequest *
     // Starting polling interval (may be increased if a slow down message is received).
     __block NSTimeInterval interval = [TVAuthorizationResponse.interval doubleValue];
 
+    interval = MAX(interval, 5);
+
+    // TODO: default interval
+
     // Polls the token endpoint until the authorization completes or expires.
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
       do {
@@ -196,6 +200,8 @@ + (GTMTVAuthorizationCancelBlock)authorizeTVRequest:(GTMTVAuthorizationRequest *
           break;
         }
 
+        NSLog(@"Poll request: %@", pollRequest);
+
         // Polls token endpoint.
         [OIDAuthorizationService performTokenRequest:pollRequest
                                             callback:^(OIDTokenResponse *_Nullable tokenResponse,