Merge pull request #138 from sommersoft/git_token_fix

Switch To New GitHub API Authentication Scheme

Author: siddacious

README.rst

@@ -115,7 +115,7 @@ Applying Patches To All CircuitPython Libraries
 ================================================
 To apply a patch to all CircuitPython libraries (only guaranteed for files shared
 among all libraries, such as those included in the cookiecutter (e.g. README.rst,
-.travis.yml, etc), do the following:
+ etc), do the following:
 
 1. Apply your update(s) to any library as normal, using ``git commit``. It is recommended to
 give a short, detailed description of the patch. This description will be used by the next

adabot/github_requests.py

@@ -35,6 +35,8 @@
 import time
 import traceback
 
+from base64 import b64encode
+
 TIMEOUT = 60
 
 def _fix_url(url):
@@ -52,11 +54,12 @@ def _fix_kwargs(kwargs):
     else:
         kwargs["headers"] = {"Accept": "application/vnd.github.hellcat-preview+json"}
     if "ADABOT_GITHUB_ACCESS_TOKEN" in os.environ and "auth" not in kwargs:
+        user = os.environ.get("ADABOT_GITHUB_USER", "")
         access_token = os.environ["ADABOT_GITHUB_ACCESS_TOKEN"]
-        if "params" in kwargs:
-            kwargs["params"]["access_token"] = access_token
-        else:
-            kwargs["params"] = {"access_token": access_token}
+        basic_encoded = b64encode(str(user + ":" + access_token).encode()).decode()
+        auth_header = "Basic {}".format(basic_encoded)
+
+        kwargs["headers"]["Authorization"] = auth_header
 
     return kwargs
 

template-env.sh

@@ -2,11 +2,6 @@
 #  https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/
 # KEEP THIS TOKEN SECRET AND SAFE! Anyone with access to the token has FULL CONTROL of your GitHub account!
 export ADABOT_GITHUB_ACCESS_TOKEN=<your personal access token>
-# Go here to generate a travis access token:
-#  https://blog.travis-ci.com/2013-01-28-token-token-token
-# Note you want the 'Travis Token' (third option) and NOT the 'Access Token'.  Use the ruby gem mentioned to generate.
-# KEEP THIS TOKEN SECRET AND SAFE! Although it is unclear what access the token grants (Travis seems to imply it's less
-# risk to share), always assume secrets like these are dangerous to expose to others.
-# Note 2: since all CircuitPython repositories have been migragted to travis-ci.com, be sure to use an access token
-# from '.com', not '.org'. These tokens are not interchangeable.
-export ADABOT_TRAVIS_ACCESS_TOKEN=<your Travis token>
+
+# This is the username associated with the access token.
+export ADABOT_GITHUB_USER=<username>