remove the buttons, limits the amount of keyz we can store. make the user press the screen instead

Author: brentru

PyPortal_TOTP_Friend/code.py

@@ -1,11 +1,11 @@
+# PyPortal TOTP Authenticator
 import time
 
-import board
-import busio
-from digitalio import DigitalInOut
-
 import adafruit_hashlib as hashlib
+import adafruit_imageload
 import adafruit_touchscreen
+import board
+import busio
 import displayio
 import neopixel
 import terminalio
@@ -18,6 +18,7 @@
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_ntp import NTP
 from adafruit_pyportal import PyPortal
+from digitalio import DigitalInOut
 
 # Background/Images
 BACKGROUND = 0x059ACE
@@ -33,7 +34,6 @@
     print("WiFi secrets are kept in secrets.py, please add them there!")
     raise
 
-
 # Initialize PyPortal Display
 display = board.DISPLAY
 
@@ -47,7 +47,6 @@
                                           ),
                                       size=(WIDTH, HEIGHT))
 
-
 # Create a SHA1 Object
 SHA1 = hashlib.sha1
 
@@ -60,7 +59,6 @@
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
 esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 
-
 # HMAC implementation, as hashlib/hmac wouldn't fit
 # From https://en.wikipedia.org/wiki/Hash-based_message_authentication_code
 def HMAC(k, m):
@@ -116,7 +114,6 @@ def int_to_bytestring(i, padding=8):
 
 # HMAC -> OTP generator, pretty much same as
 # https://github.com/pyotp/pyotp/blob/master/src/pyotp/otp.py
-
 def generate_otp(int_input, secret_key, digits=6):
     if int_input < 0:
         raise ValueError('input must be positive integer')
@@ -132,7 +129,6 @@ def generate_otp(int_input, secret_key, digits=6):
     str_code = str(code % 10 ** digits)
     while len(str_code) < digits:
         str_code = '0' + str_code
-
     return str_code
 
 
@@ -163,43 +159,33 @@ def generate_otp(int_input, secret_key, digits=6):
 
 splash.append(background)
 
-
 key_group = displayio.Group(scale=5)
 # We'll use a default text placeholder for this label
 label_key = Label(font, text="000 000")
 label_key.x = (display.width // 2) // 13
-label_key.y = 15
+label_key.y = 17
 key_group.append(label_key)
 
 label_title = Label(font, max_glyphs=14)
-label_title.x = (display.width // 2) // 10
+label_title.text = "loading.."
+label_title.x = (display.width // 2) // 13
 label_title.y = 5
 key_group.append(label_title)
 
 splash.append(key_group)
 
-# Create a label to monitor the status
-label_status = Label(font, max_glyphs=45)
-label_status.x = (display.width // 2) - 50
-label_status.y = 120
-splash.append(label_status)
-
 # Show the group
 display.show(splash)
 
-
 print("Connecting to AP...")
-label_status.text = "Connecting to AP..."
 while not esp.is_connected:
     try:
         esp.connect_AP(secrets['ssid'], secrets['password'])
     except RuntimeError as e:
         print("could not connect to AP, retrying: ", e)
-        label_status.text("Retrying...")
         continue
 
 print("Connected to SSID: ", secrets['ssid'])
-label_status.text = "Connected! Fetching NTP..."
 
 # Initialize the NTP object
 ntp = NTP(esp)
@@ -220,57 +206,46 @@ def generate_otp(int_input, secret_key, digits=6):
 mono_time = int(time.monotonic())
 print("Monotonic time", mono_time)
 
-# Clear the status label
-label_status.text = ""
 
-# Add buttons to the interface
-# TODO: Generate them like in https://learn.adafruit.com/pyportal-philips-hue-lighting-controller/code-walkthrough
-# TODO: Make these dynamically based on what is store in secrets.py 
-# TODO: Add icons to buttons instead of text
+def display_otp(unix_time, name, secret):
+    """Updates text objects to display the OTP and name.
 
-assert len(secrets['totp_keys']) < 8, "This code can only render 8 keys at a time"
+    :param int unix_time: Current unix time
+    :param str name: OTP name
+    :param str secret: OTP Secret
+    """
+    otp = generate_otp(unix_time // 30, secret)
+    print(name + " OTP output: ", otp)
+    # display the key's name
+    label_title.text = name
+    # format and display the OTP
+    label_key.text = "{} {}".format(str(otp)[0:3],str(otp)[3:6])
 
-buttons = []
+def get_unix_time():
+    """Calculate current time based on NTP + monotonic
 
-# generate buttons
-btn_x = 20
-for i in secrets['totp_keys']:
-    print(i)
-    button = Button(name=i[0], x=btn_x, y=130,
-                    width=60, height=60,
-                    label=i[0], label_font=font, label_color=0x0,
-                    fill_color=None, outline_color=None)
-    buttons.append(button)
-    btn_x+=60
-
-# append buttons to splash group
-for b in buttons:
-    splash.append(b.group)
+    """
+    unix_time = t - mono_time + int(time.monotonic())
+    return unix_time
 
+# how long to stay on if not in always_on mode
+countdown = ON_SECONDS
+cur_otp = 0
+max_otp = len(secrets['totp_keys'])
 
+display_otp(get_unix_time(), secrets['totp_keys'][cur_otp][0],
+            secrets['totp_keys'][cur_otp][1])
 
-countdown = ON_SECONDS  # how long to stay on if not in always_on mode
 while ALWAYS_ON or (countdown > 0):
-    # Calculate current time based on NTP + monotonic
-    unix_time = t - mono_time + int(time.monotonic())
     p = ts.touch_point
     if p:
-        for i, b in enumerate(buttons):
-            if b.contains(p):
-                b.selected = True
-                for name, secret in secrets['totp_keys']:
-                    if b.name == name:
-                        # generate OTP
-                        #print('Background color: ', background_color)
-                        otp = generate_otp(unix_time // 30, secret)
-                        print('{} selected: '.format(name))
-                        print(name + " OTP output: ", otp)
-                        # display the key's name
-                        label_title.text = name
-                        # format and display the OTP
-                        label_key.text = "{} {}".format(str(otp)[0:3],str(otp)[3:6])
-            else:
-                b.selected = False
+        if cur_otp < max_otp:
+            display_otp(get_unix_time(), secrets['totp_keys'][cur_otp][0],
+                        secrets['totp_keys'][cur_otp][1])
+            cur_otp+=1
+        else:
+            # reset the current otp display
+            cur_otp = 0
     # We'll update every 1/4 second, we can hash very fast so its no biggie!
     countdown -= 0.25
     time.sleep(0.25)