Merge pull request #4 from fiji-flo/update-things

Update things

Author: fiji-flo

Cargo.lock

@@ -9,8 +9,8 @@ default = []
 nouid = []
 
 [dependencies]
-cis_client = { git = "https://github.com/fiji-flo/cis_client-rust", branch = "async", version = "0.1.0-beta.1" }
-cis_profile = { git = "https://github.com/fiji-flo/cis_profile-rust", branch = "ring-14", version = "0.0.3" }
+cis_client = { git = "https://github.com/fiji-flo/cis_client-rust", branch = "async-2", version = "0.1.0-beta.2" }
+cis_profile = { git = "https://github.com/fiji-flo/cis_profile-rust", branch = "0.1.0", version = "0.1.0" }
 oauth2 = "2.0.0-beta.2"
 url = "1.7.2"
 base64 = "0.10.1"

Cargo.toml

@@ -49,7 +49,7 @@ pub struct BugZillaUser {
 
 fn redirect(client: web::Data<Arc<BasicClient>>, session: Session) -> impl Responder {
     let (authorize_url, csrf_state) = client.authorize_url(CsrfToken::new_random);
-    println!("settting: {}", csrf_state.secret());
+    info!("settting: {}", csrf_state.secret());
     session
         .set("csrf_state", csrf_state.secret().clone())
         .map(|_| {

src/bugzilla/app.rs

@@ -63,7 +63,7 @@ fn id_to_username(id: web::Path<String>) -> impl Future<Item = HttpResponse, Err
         .send()
         .map_err(Into::into)
         .and_then(|mut res| {
-            println!("status: {}", res.status());
+            info!("status: {}", res.status());
             res.json::<GitHubUser>().map_err(Into::into)
         })
         .and_then(|user| {
@@ -75,7 +75,7 @@ fn id_to_username(id: web::Path<String>) -> impl Future<Item = HttpResponse, Err
 
 fn redirect(client: web::Data<Arc<BasicClient>>, session: Session) -> impl Responder {
     let (authorize_url, csrf_state) = client.authorize_url(CsrfToken::new_random);
-    println!("settting: {}", csrf_state.secret());
+    info!("settting: {}", csrf_state.secret());
     session
         .set("csrf_state", csrf_state.secret().clone())
         .map(|_| {
@@ -94,9 +94,9 @@ fn auth<T: AsyncCisClientTrait + 'static>(
 ) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
     let code = AuthorizationCode::new(query.code.clone());
     let state = CsrfToken::new(query.state.clone());
-    println!("remote: {}", state.secret());
+    info!("remote: {}", state.secret());
     if let Some(ref must_state) = session.get::<String>("csrf_state").unwrap() {
-        println!("session: {}", must_state);
+        info!("session: {}", must_state);
         if must_state != state.secret() {
             return Box::new(future::ok(
                 HttpResponse::Found()
@@ -124,11 +124,11 @@ fn auth<T: AsyncCisClientTrait + 'static>(
                 .send()
                 .map_err(Into::into)
                 .and_then(|mut res| {
-                    println!("status: {}", res.status());
+                    info!("status: {}", res.status());
                     res.json::<GitHubUser>().map_err(Into::into)
                 })
                 .and_then(move |j| {
-                    println!("login: {}, id: {}", j.login, j.node_id);
+                    info!("login: {}, id: {}", j.login, j.node_id);
                     get.get_user_by(&get_uid, &GetBy::UserId, None)
                         .and_then(move |profile: Profile| {
                             update_github(

src/github/app.rs

@@ -69,7 +69,7 @@ fn update_and_sign(
 ) -> Result<(), Error> {
     field.value = Some(value);
     if field.metadata.display.is_none() {
-        field.metadata.display = Some(Display::Private);
+        field.metadata.display = Some(Display::Staff);
     }
     field.metadata.last_modified = now.to_owned();
     field.signature.publisher.name = PublisherAuthority::Mozilliansorg;