Update HTML templates to indicate that we're calling a Google API, not a Classroom API and correct the routing. Fix OAuth URL to include login_hint and hd.

Change-Id: I8caf9e5593d736d9d33e836bb9d2e4b22c795f5f

Author: AndrewMBurke

flask/02-sign-in/templates/addon-discovery.html

@@ -30,7 +30,7 @@ <h3>Welcome to the home page!</h3>
     From here you can:
     <ul>
         <li>
-            <a href="{{url_for('test_api_request', request_type='courses')}}">Test a Classroom API request</a>
+            <a href="{{url_for('test_api_request', request_type='username')}}">Test a Google API request</a>
             <br>This will submit an API request and display a JSON response.
             <br>You should go through the authorization flow if there are no stored credentials.</li>
         <li><a href="{{ url_for('revoke') }}">Revoke credentials</a>

flask/03-query-parameters/main.py

@@ -199,10 +199,9 @@ def test_api_request(request_type="username"):
     save_user_credentials(credentials)
 
     # Render the results of the API call.
-    return flask.render_template(
-        "show-api-query-result.html",
-        data=json.dumps(fetched_data, indent=2),
-        data_title=request_type)
+    return flask.render_template("show-api-query-result.html",
+                                 data=json.dumps(fetched_data, indent=2),
+                                 data_title=request_type)
 
 
 @app.route("/authorize")
@@ -213,7 +212,9 @@ def authorize():
 
     # Create flow instance to manage the OAuth 2.0 Authorization Grant Flow steps.
     flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
-        CLIENT_SECRETS_FILE, scopes=SCOPES)
+        CLIENT_SECRETS_FILE,
+        scopes=SCOPES,
+    )
 
     # The URI created here must exactly match one of the authorized redirect URIs
     # for the OAuth 2.0 client, which you configured in the API Console. If this
@@ -226,7 +227,12 @@ def authorize():
         # re-prompting the user for permission. Recommended for web server apps.
         access_type="offline",
         # Enable incremental authorization. Recommended as a best practice.
-        include_granted_scopes="true")
+        include_granted_scopes="true",
+        # The user will automatically be selected if we have the login_hint.
+        login_hint=flask.session.get("login_hint"),
+        # If we don't have login_hint, passing hd will reduce the list of
+        # accounts in the account chooser to only those with the same domain.
+        hd=flask.session.get("hd"))
 
     # Store the state so the callback can verify the auth server response.
     flask.session["state"] = state
@@ -258,7 +264,7 @@ def callback():
     credentials = flow.credentials
     flask.session["credentials"] = credentials_to_dict(credentials)
 
-    # The flow is complete! We'll use the credentials to fetch the username.
+    # The flow is complete! We'll use the credentials to fetch the user's info.
     user_info_service = googleapiclient.discovery.build(
         serviceName="oauth2", version="v2", credentials=credentials)
 

flask/03-query-parameters/templates/addon-discovery.html

@@ -30,7 +30,7 @@ <h3>Welcome to the home page!</h3>
     From here you can:
     <ul>
         <li>
-            <a href="{{url_for('test_api_request', request_type='courses')}}">Test a Classroom API request</a>
+            <a href="{{url_for('test_api_request', request_type='username')}}">Test a Google API request</a>
             <br>This will submit an API request and display a JSON response.
             <br>You should go through the authorization flow if there are no stored credentials.</li>
         <li><a href="{{ url_for('revoke') }}">Revoke credentials</a>