Switch to bearer token

Author: timshadel

bin/compile

@@ -30,7 +30,7 @@ File.open "#{ENV['HOME']}/.curlrc", "w+", 0600 do |f|
   f.puts "--netrc-optional"
 end
 
-if valid_login?
+if valid_login? github_token
   puts "       Generated .netrc & .curlrc files (available only at build-time)"
 
   ##
@@ -42,7 +42,7 @@ if valid_login?
 
   ##
   # Print out user information
-  puts user_block(ENV['GITHUB_AUTH_TOKEN'])
+  puts user_block(github_token)
 else
   puts "       !!!! No valid Github user found with GITHUB_AUTH_TOKEN: '#{ENV['GITHUB_AUTH_TOKEN']}'"
   exit 1

lib/github.rb

@@ -1,36 +1,37 @@
 require 'json'
 
-def valid_login?
-  login != "error"
+def valid_login? token
+  login(token) != "error"
 end
 
-def login
-  @login ||= github_user_login
+def login token
+  @login ||= github_user_login(token)
 end
 
-def github_user_login
-  json = `curl -s https://api.github.com/user` rescue "{}"
+def github_user_login token
+  json = `curl -H "Authorization: Bearer #{token}" -s https://api.github.com/user` rescue "{}"
   user = JSON.parse json rescue {}
   user["login"] || "error"
 end
 
 def github_user_auth token
+  # This call must use .netrc user/pass combination
   json = `curl -s https://api.github.com/authorizations` rescue "[]"
   all = JSON.parse json rescue []
-  authz = all.select {|a| a["token"] =~ /#{token}/}.first
+  authz = all.select {|a| a["token"] =~ /#{token}/}.first || []
   "#{authz["note"]} (#{authz["scopes"].include?('repo') ? 'private repo access' : 'insufficient access'})"
 end
 
 def github_user_orgs
-  json = `curl -s https://api.github.com/user/orgs` rescue "[]"
+  json = `curl -H "Authorization: Bearer #{token}" -s https://api.github.com/user/orgs` rescue "[]"
   orgs = JSON.parse json rescue []
   orgs.map {|o| o["login"].downcase }.sort
 end
 
 def user_block token
   <<-USER
-       Github User:   #{login}
+       Github User:   #{login(token)}
        Authorization: #{github_user_auth(token)}
-       Organizations: #{github_user_orgs.join(", ")}
+       Organizations: #{github_user_orgs(token).join(", ")}
   USER
 end

support/netrc

@@ -1,4 +1 @@
-machine api.github.com login <%= github_token %> password x-oauth-basic
-machine code.github.com login <%= github_token %> password x-oauth-basic
-machine raw.github.com login <%= github_token %> password x-oauth-basic
 machine github.com login <%= github_token %> password x-oauth-basic