Support TOTP when requesting an OAuth token

mpalmer · May 27, 2020 · b39008a · b39008a
1 parent 6393491
commit b39008a
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/github-release.rb b/lib/github-release.rb
@@ -37,11 +37,17 @@ def get_new_token
 		pass = $stdin.noecho(&:gets).chomp
 		puts
 
+		headers = {}
+
 		api = Octokit::Client.new(:login => user, :password => pass)
 		begin
-			res = api.create_authorization(:scopes => [:repo], :note => "git release")
+			res = api.create_authorization(:scopes => [:repo], :note => "git release #{Time.now.strftime("%FT%TZ")}", :headers => headers)
+		rescue Octokit::OneTimePasswordRequired
+			print "OTP code: "
+			headers["X-GitHub-OTP"] = $stdin.gets.chomp
+			retry
 		rescue Octokit::Unauthorized
-			puts "Username or password incorrect.  Please try again."
+			puts "Credentials incorrect.  Please try again."
 			return get_new_token
 		end