From ba76623433dc401eb51acd8584e03bc9e6f23611 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 2 Oct 2019 22:11:57 -0600
Subject: [PATCH] Revert "Always persist/read the access token when a keyring
 isn't available"

This reverts commit 48c7f7a17e14be300a7c51d1aab7039df36cf2b6.
---
 pantalaimon/daemon.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pantalaimon/daemon.py b/pantalaimon/daemon.py
index 22ac776..10c2deb 100755
--- a/pantalaimon/daemon.py
+++ b/pantalaimon/daemon.py
@@ -101,7 +101,6 @@ class ProxyDaemon:
         accounts = self.store.load_users(self.name)
 
         for user_id, device_id in accounts:
-            token = False
             if self.conf.keyring:
                 try:
                     token = keyring.get_password(
@@ -109,7 +108,7 @@ class ProxyDaemon:
                     )
                 except RuntimeError as e:
                     logger.error(e)
-            if not token:
+            else:
                 token = self.store.load_access_token(user_id, device_id)
 
             if not token:
@@ -571,7 +570,6 @@ class ProxyDaemon:
 
         self.pan_clients[user_id] = pan_client
 
-        token_stored = False
         if self.conf.keyring:
             try:
                 keyring.set_password(
@@ -579,10 +577,9 @@ class ProxyDaemon:
                     f"{user_id}-{pan_client.device_id}-token",
                     pan_client.access_token,
                 )
-                token_stored = True
             except RuntimeError as e:
                 logger.error(e)
-        if not token_stored:
+        else:
             self.store.save_access_token(
                 user_id, pan_client.device_id, pan_client.access_token
             )