feat(mbuild): use of oauth2::Scheme

That way, we improved our API, reduced code bloat, and are very clear
about the what we do for Authorization.

Author: Byron

gen/groupsmigration1/src/cmn.rs

@@ -6,6 +6,7 @@ use std;
 
 use mime::{Mime, TopLevel, SubLevel, Attr, Value};
 use oauth2;
+use oauth2::TokenType;
 use hyper;
 use hyper::header::{ContentType, ContentLength, Headers, UserAgent, Authorization};
 use hyper::http::LINE_ENDING;
@@ -368,7 +369,7 @@ pub struct ResumableUploadHelper<'a, NC: 'a, A: 'a> {
     pub delegate: &'a mut Delegate,
     pub auth: &'a mut A,
     pub user_agent: &'a str,
-    pub auth_token: String,
+    pub auth_header: Authorization<oauth2::Scheme>,
     pub url: &'a str,
     pub reader: &'a mut ReadSeek,
     pub media_type: Mime,
@@ -382,7 +383,7 @@ impl<'a, NC, A> ResumableUploadHelper<'a, NC, A>
     fn query_transfer_status(&'a mut self) -> (u64, hyper::HttpResult<hyper::client::Response>) {
         self.client.post(self.url)
             .header(UserAgent(self.user_agent.to_string()))
-            .header(Authorization("Bearer ".to_string() + &self.auth_token));
+            .header(self.auth_header.clone());
         (0, Err(hyper::error::HttpError::HttpStatusError))
     }
 

gen/groupsmigration1/src/lib.rs

@@ -517,7 +517,7 @@ impl<'a, C, NC, A> ArchiveInsertCall<'a, C, NC, A> where NC: hyper::net::Network
 
 
         let mut should_ask_dlg_for_url = false;
-        let mut upload_url_from_server = true;
+        let mut upload_url_from_server;
         let mut upload_url: Option<String> = None;
 
         loop {
@@ -529,7 +529,8 @@ impl<'a, C, NC, A> ArchiveInsertCall<'a, C, NC, A> where NC: hyper::net::Network
                 dlg.finished(false);
                 return Result::MissingToken
             }
-            let auth_header = Authorization("Bearer ".to_string() + &token.unwrap().access_token);
+            let auth_header = Authorization(oauth2::Scheme { token_type: oauth2::TokenType::Bearer,
+                                                             access_token: token.unwrap().access_token });
             let mut req_result = {
                 if should_ask_dlg_for_url && (upload_url = dlg.upload_url()) == () && upload_url.is_some() {
                     should_ask_dlg_for_url = false;
@@ -608,7 +609,7 @@ impl<'a, C, NC, A> ArchiveInsertCall<'a, C, NC, A> where NC: hyper::net::Network
                                 delegate: dlg,
                                 auth: &mut *self.hub.auth.borrow_mut(),
                                 user_agent: &self.hub._user_agent,
-                                auth_token: auth_header.0.clone(),
+                                auth_header: auth_header.clone(),
                                 url: url,
                                 reader: &mut reader,
                                 media_type: reader_mime_type.clone(),

src/mako/lib/mbuild.mako

@@ -657,7 +657,7 @@ else {
 
         % if resumable_media_param:
         let mut should_ask_dlg_for_url = false;
-        let mut upload_url_from_server = true;
+        let mut upload_url_from_server;
         let mut upload_url: Option<String> = None;
         % endif
 
@@ -671,7 +671,8 @@ else {
                 ${delegate_finish}(false);
                 return Result::MissingToken
             }
-            let auth_header = Authorization("Bearer ".to_string() + &token.unwrap().access_token);
+            let auth_header = Authorization(oauth2::Scheme { token_type: oauth2::TokenType::Bearer,
+                                                             access_token: token.unwrap().access_token });
             % endif
             % if request_value:
             request_value_reader.seek(io::SeekFrom::Start(0)).unwrap();
@@ -786,7 +787,7 @@ else {
                                 delegate: dlg,
                                 auth: &mut *self.hub.auth.borrow_mut(),
                                 user_agent: &self.hub._user_agent,
-                                auth_token: auth_header.0.clone(),
+                                auth_header: auth_header.clone(),
                                 url: url,
                                 reader: &mut reader,
                                 media_type: reader_mime_type.clone(),

src/rust/cmn.rs

@@ -4,6 +4,7 @@ use std;
 
 use mime::{Mime, TopLevel, SubLevel, Attr, Value};
 use oauth2;
+use oauth2::TokenType;
 use hyper;
 use hyper::header::{ContentType, ContentLength, Headers, UserAgent, Authorization};
 use hyper::http::LINE_ENDING;
@@ -366,7 +367,7 @@ pub struct ResumableUploadHelper<'a, NC: 'a, A: 'a> {
     pub delegate: &'a mut Delegate,
     pub auth: &'a mut A,
     pub user_agent: &'a str,
-    pub auth_token: String,
+    pub auth_header: Authorization<oauth2::Scheme>,
     pub url: &'a str,
     pub reader: &'a mut ReadSeek,
     pub media_type: Mime,
@@ -380,7 +381,7 @@ impl<'a, NC, A> ResumableUploadHelper<'a, NC, A>
     fn query_transfer_status(&'a mut self) -> (u64, hyper::HttpResult<hyper::client::Response>) {
         self.client.post(self.url)
             .header(UserAgent(self.user_agent.to_string()))
-            .header(Authorization("Bearer ".to_string() + &self.auth_token));
+            .header(self.auth_header.clone());
         (0, Err(hyper::error::HttpError::HttpStatusError))
     }