Remove Classroom API calls from Walkthrough 3.

Minor cleanup to main.py in W2 and W3.
Update W3 required modules.

Change-Id: I394fc7d60dc14428cd8fca8b2acf49016b7160fb

Author: AndrewMBurke

flask/02-sign-in/main.py

@@ -116,7 +116,7 @@ def test_api_request(request_type="username"):
     # Render the results of the API call.
     return flask.render_template(
         "show-api-query-result.html",
-        data=json.dumps(fetched_data, indent=2),  #flask.jsonify(courses),
+        data=json.dumps(fetched_data, indent=2),
         data_title=request_type)
 
 

flask/03-query-parameters/main.py

@@ -48,17 +48,8 @@
 # OAuth Consent Screen: https://console.cloud.google.com/apis/credentials/consent
 SCOPES = [
     "https://www.googleapis.com/auth/userinfo.profile",
-    "https://www.googleapis.com/auth/userinfo.email",
-    "https://www.googleapis.com/auth/classroom.courses.readonly",
-    "https://www.googleapis.com/auth/classroom.addons.student",
-    "https://www.googleapis.com/auth/classroom.addons.teacher",
+    "https://www.googleapis.com/auth/userinfo.email"
 ]
-CLASSROOM_API_SERVICE_NAME = "classroom"
-CLASSROOM_API_VERSION = "v1"
-
-# An API key in your GCP project's credentials:
-# https://console.cloud.google.com/apis/credentials.
-GOOGLE_API_KEY = os.environ.get("GOOGLE_API_KEY")
 
 # Point to a database file in the project root.
 DATABASE_FILE_NAME = os.path.join(os.path.abspath(os.path.dirname(__file__)),
@@ -180,7 +171,7 @@ def test_api_request(request_type="username"):
     Tests an API request, rendering the result in the "show-api-query-result.html" template.
 
     Args:
-        request_type: The type of API request to test. Can be "username" or "courses".
+        request_type: The type of API request to test. Currently only "username" is supported.
     """
 
     if "credentials" not in flask.session:
@@ -203,26 +194,14 @@ def test_api_request(request_type="username"):
 
         fetched_data = flask.session.get("username")
 
-    elif request_type == "courses":
-        classroom_service = googleapiclient.discovery.build(
-            CLASSROOM_API_SERVICE_NAME,
-            CLASSROOM_API_VERSION,
-            credentials=credentials,
-            discoveryServiceUrl=
-            f"https://classroom.googleapis.com/$discovery/rest?labels=ADD_ONS_ALPHA&key={GOOGLE_API_KEY}"
-        )
-
-        fetched_data = classroom_service.courses().list(
-            pageSize=10).execute().get("courses", [])
-
     # Save credentials in case access token was refreshed.
     flask.session["credentials"] = credentials_to_dict(credentials)
     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),  #flask.jsonify(courses),
+        data=json.dumps(fetched_data, indent=2),
         data_title=request_type)
 
 
@@ -384,6 +363,7 @@ def save_user_credentials(credentials=None, user_info=None):
 
     existing_user = get_credentials_from_storage(
         flask.session.get("login_hint"))
+
     if existing_user:
         if user_info:
             existing_user.id = user_info.get("id")

flask/03-query-parameters/requirements.txt

@@ -1,5 +1,6 @@
 Flask==2.0.2
-google_api_python_client==2.31.0
+Flask_SQLAlchemy==2.5.1
+google_api_python_client==2.33.0
 google_auth_oauthlib==0.4.6
 protobuf==3.19.1
 requests==2.26.0

flask/03-query-parameters/templates/navbar.html

@@ -22,9 +22,6 @@
         </li>
 
         {% if session['username'] %}
-        <li>
-            <a href="{{url_for('test_api_request', request_type='courses')}}">Get Courses</a>
-        </li>
         <li>
             <a href="{{url_for('test_api_request', request_type='username')}}">Get Username</a>
         </li>

flask/03-query-parameters/templates/signed-out.html

@@ -24,6 +24,6 @@
     <h2>Sign-out Complete!</h2>
     <hr>
     Your credentials have been cleared; you are logged out.
-    You will be redirected to the add-on landing page in 5 seconds.
+    You will be redirected to the authorization page in 5 seconds.
 </div>
 {% endblock %}