automatically fetch the github username from the API

src/github.rs

@@ -1,5 +1,5 @@
 use failure::{Error, ResultExt};
-use reqwest::header::USER_AGENT;
+use reqwest::header::{AUTHORIZATION, USER_AGENT};
 use reqwest::Error as HttpError;
 use reqwest::{Client, RequestBuilder, Response};
 
@@ -9,6 +9,13 @@ pub struct User {
 }
 
 impl User {
+    pub fn current(client: &GithubClient) -> Result<Self, Error> {
+        Ok(client
+            .get("https://api.github.com/user")
+            .send_req()?
+            .json()?)
+    }
+
     pub fn is_team_member(&self, client: &GithubClient) -> Result<bool, Error> {
         let client = client.raw();
         let url = format!("{}/teams.json", rust_team_data::v1::BASE_URL);
@@ -150,7 +157,7 @@ trait RequestSend: Sized {
 impl RequestSend for RequestBuilder {
     fn configure(self, g: &GithubClient) -> RequestBuilder {
         self.header(USER_AGENT, "rust-lang-triagebot")
-            .basic_auth(&g.username, Some(&g.token))
+            .header(AUTHORIZATION, format!("token {}", g.token))
     }
 
     fn send_req(self) -> Result<Response, HttpError> {
@@ -163,28 +170,19 @@ impl RequestSend for RequestBuilder {
 
 #[derive(Clone)]
 pub struct GithubClient {
-    username: String,
     token: String,
     client: Client,
 }
 
 impl GithubClient {
-    pub fn new(c: Client, token: String, username: String) -> Self {
-        GithubClient {
-            client: c,
-            token,
-            username,
-        }
+    pub fn new(client: Client, token: String) -> Self {
+        GithubClient { client, token }
     }
 
     pub fn raw(&self) -> &Client {
         &self.client
     }
 
-    pub fn username(&self) -> &str {
-        self.username.as_str()
-    }
-
     fn get(&self, url: &str) -> RequestBuilder {
         log::trace!("get {:?}", url);
         self.client.get(url).configure(self)

src/handlers.rs

@@ -1,13 +1,15 @@
 use crate::github::GithubClient;
 use crate::registry::HandleRegistry;
+use std::sync::Arc;
 
 //mod assign;
 mod label;
 //mod tracking_issue;
 
-pub fn register_all(registry: &mut HandleRegistry, client: GithubClient) {
+pub fn register_all(registry: &mut HandleRegistry, client: GithubClient, username: Arc<String>) {
     registry.register(label::LabelHandler {
         client: client.clone(),
+        username: username.clone(),
     });
     //registry.register(assign::AssignmentHandler {
     //    client: client.clone(),

src/handlers/label.rs

@@ -16,9 +16,11 @@ use crate::{
 use failure::Error;
 use parser::command::label::{LabelCommand, LabelDelta};
 use parser::command::{Command, Input};
+use std::sync::Arc;
 
 pub struct LabelHandler {
     pub client: GithubClient,
+    pub username: Arc<String>,
 }
 
 impl Handler for LabelHandler {
@@ -33,7 +35,7 @@ impl Handler for LabelHandler {
 
         let mut issue_labels = event.issue.labels().to_owned();
 
-        let mut input = Input::new(&event.comment.body, self.client.username());
+        let mut input = Input::new(&event.comment.body, &self.username);
         let deltas = match input.parse_command() {
             Command::Label(Ok(LabelCommand(deltas))) => deltas,
             Command::Label(Err(err)) => {

src/main.rs

@@ -9,6 +9,7 @@ use rocket::request;
 use rocket::State;
 use rocket::{http::Status, Outcome, Request};
 use std::env;
+use std::sync::Arc;
 
 mod handlers;
 mod registry;
@@ -18,7 +19,7 @@ mod interactions;
 mod payload;
 mod team;
 
-use github::{Comment, GithubClient, Issue};
+use github::{Comment, GithubClient, Issue, User};
 use payload::SignedPayload;
 use registry::HandleRegistry;
 
@@ -108,13 +109,10 @@ fn not_found(_: &Request) -> &'static str {
 fn main() {
     dotenv::dotenv().ok();
     let client = Client::new();
-    let gh = GithubClient::new(
-        client.clone(),
-        env::var("GITHUB_API_TOKEN").unwrap(),
-        env::var("GITHUB_USERNAME").unwrap(),
-    );
+    let gh = GithubClient::new(client.clone(), env::var("GITHUB_API_TOKEN").unwrap());
+    let username = Arc::new(User::current(&gh).unwrap().login);
     let mut registry = HandleRegistry::new();
-    handlers::register_all(&mut registry, gh.clone());
+    handlers::register_all(&mut registry, gh.clone(), username);
     rocket::ignite()
         .manage(gh)
         .manage(registry)