From e0234c12233903bd7faca96f2f4497fb876191f2 Mon Sep 17 00:00:00 2001
From: Erik Johnson <palehose@gmail.com>
Date: Sun, 12 Apr 2020 10:50:08 -0500
Subject: [PATCH] Update Github module to pass access token in request header
 (#777)

* Update Github module to pass access token in request header

Also update the status colors to match the current Github Status webpage
CSS.

* Fix indentation
---
 i3pystatus/github.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/i3pystatus/github.py b/i3pystatus/github.py
index 9f25610..00c21ca 100644
--- a/i3pystatus/github.py
+++ b/i3pystatus/github.py
@@ -19,8 +19,7 @@ except ImportError:
 API_METHODS_URL = 'https://www.githubstatus.com/api/v2/summary.json'
 STATUS_URL = 'https://www.githubstatus.com'
 NOTIFICATIONS_URL = 'https://github.com/notifications'
-ACCESS_TOKEN_AUTH_URL = 'https://api.github.com/notifications?access_token=%s'
-BASIC_AUTH_URL = 'https://api.github.com/notifications'
+AUTH_URL = 'https://api.github.com/notifications'
 
 
 class Github(IntervalModule):
@@ -230,10 +229,10 @@ class Github(IntervalModule):
         'critical': 'GitHub',
     }
     _default_colors = {
-        'none': '#2ecc71',
-        'minor': '#f1c40f',
-        'major': '#e67e22',
-        'critical': '#e74c3c',
+        'none': '#28a745',
+        'minor': '#dbab09',
+        'major': '#e36209',
+        'critical': '#dc3545',
     }
 
     # Module configurables
@@ -512,14 +511,21 @@ class Github(IntervalModule):
                 'access token' if self.access_token else 'username/password'
             )
 
-            old_unread_url = None
             if self.access_token:
-                unread_url = ACCESS_TOKEN_AUTH_URL % self.access_token
+                request_kwargs = {
+                    'headers': {
+                        'Authorization': 'token {}'.format(self.access_token),
+                    },
+                }
             else:
-                unread_url = BASIC_AUTH_URL
+                request_kwargs = {
+                    'auth': (self.username, self.password),
+                }
 
             self.current_unread = set()
             page_num = 0
+            old_unread_url = None
+            unread_url = AUTH_URL
             while old_unread_url != unread_url:
                 old_unread_url = unread_url
                 page_num += 1
@@ -528,13 +534,7 @@ class Github(IntervalModule):
                     page_num, unread_url
                 )
                 try:
-                    if self.access_token:
-                        response = requests.get(unread_url)
-                    else:
-                        response = requests.get(
-                            unread_url,
-                            auth=(self.username, self.password)
-                        )
+                    response = requests.get(unread_url, **request_kwargs)
                     self.logger.log(
                         5,
                         'Raw return from GitHub notification check: %s',