Merge pull request #2772 from adafruit/dhalbert-patch-8

PyPortal_Google_Calendar: update to settings.toml

Author: dhalbert

PyPortal/PyPortal_Google_Calendar/authenticator/code.py

@@ -1,21 +1,14 @@
 # SPDX-FileCopyrightText: 2021 Brent Rubell, written for Adafruit Industries
 #
 # SPDX-License-Identifier: Unlicense
+
+import os
+
 from adafruit_display_text.label import Label
 from adafruit_bitmap_font import bitmap_font
 from adafruit_oauth2 import OAuth2
 from adafruit_pyportal import Network, Graphics
 
-# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
-# "password" keys with your WiFi credentials. DO NOT share that file or commit it into Git or other
-# source control.
-# pylint: disable=no-name-in-module,wrong-import-order
-try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
-    raise
-
 network = Network()
 network.connect()
 
@@ -50,8 +43,8 @@
 # Initialize an oauth2 object
 google_auth = OAuth2(
     network.requests,
-    secrets["google_client_id"],
-    secrets["google_client_secret"],
+    os.getenv("GOOGLE_CLIENT_ID"),
+    os.getenv("GOOGLE_CLIENT_SECRET"),
     scopes,
 )
 
@@ -87,18 +80,18 @@
 
 print("Successfully Authenticated with Google!")
 
-# print formatted keys for adding to secrets.py
-print("Add the following lines to your secrets.py file:")
-print("\t'google_access_token' " + ":" + " '%s'," % google_auth.access_token)
-print("\t'google_refresh_token' " + ":" + " '%s'" % google_auth.refresh_token)
+# print formatted keys for adding to settings.toml
+print("Add the following lines to your settings.toml file:")
+print(f'GOOGLE_ACCESS_TOKEN = "{google_auth.access_token}"')
+print(f'GOOGLE_REFRESH_TOKEN = "{google_auth.refresh_token}"')
 # Remove QR code and code/verification labels
 graphics.splash.pop()
 graphics.splash.pop()
 graphics.splash.pop()
 
 label_overview_text.text = "Successfully Authenticated!"
 label_verification_url.text = (
-    "Check the REPL for tokens to add\n\tto your secrets.py file"
+    "Check the REPL for tokens to add\n\tto your settings.toml file"
 )
 
 # prevent exit

PyPortal/PyPortal_Google_Calendar/code.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2021 Brent Rubell, written for Adafruit Industries
 #
 # SPDX-License-Identifier: Unlicense
+import os
 import time
 from adafruit_oauth2 import OAuth2
 from adafruit_display_shapes.line import Line
@@ -42,16 +43,6 @@
     6: "Sunday",
 }
 
-# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
-# "password" keys with your WiFi credentials. DO NOT share that file or commit it into Git or other
-# source control.
-# pylint: disable=no-name-in-module,wrong-import-order
-try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
-    raise
-
 # Create the PyPortal object
 pyportal = PyPortal()
 r = rtc.RTC()
@@ -63,18 +54,18 @@
 scopes = ["https://www.googleapis.com/auth/calendar.readonly"]
 google_auth = OAuth2(
     pyportal.network.requests,
-    secrets["google_client_id"],
-    secrets["google_client_secret"],
+    os.getenv("GOOGLE_CLIENT_ID"),
+    os.getenv("GOOGLE_CLIENT_SECRET"),
     scopes,
-    secrets["google_access_token"],
-    secrets["google_refresh_token"],
+    os.getenv("GOOGLE_ACCESS_TOKEN"),
+    os.getenv("GOOGLE_REFRESH_TOKEN"),
 )
 
 
 def get_current_time(time_max=False):
     """Gets local time from Adafruit IO and converts to RFC3339 timestamp."""
     # Get local time from Adafruit IO
-    pyportal.get_local_time(secrets["timezone"])
+    pyportal.get_local_time(os.getenv("TIMEZONE"))
     # Format as RFC339 timestamp
     cur_time = r.datetime
     if time_max:  # maximum time to fetch events is midnight (4:59:59UTC)