From e9cb1e43ebede74ebdeb481f74315d4d18d263a3 Mon Sep 17 00:00:00 2001
From: Federico Cergol <fec@bendingspoons.com>
Date: Wed, 9 Mar 2022 18:31:10 +0100
Subject: [PATCH] fix: service_account feature flag placement

---
 src/authenticator.rs   | 7 ++++++-
 src/authorized_user.rs | 2 +-
 src/helper.rs          | 6 ++++--
 src/lib.rs             | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/authenticator.rs b/src/authenticator.rs
index bfba7c9..6092ded 100644
--- a/src/authenticator.rs
+++ b/src/authenticator.rs
@@ -386,7 +386,12 @@ impl AuthorizedUserAuthenticator {
         authorized_user_secret: AuthorizedUserSecret,
         client: C,
     ) -> AuthenticatorBuilder<C, AuthorizedUserFlow> {
-        AuthenticatorBuilder::new(AuthorizedUserFlow { secret: authorized_user_secret }, client)
+        AuthenticatorBuilder::new(
+            AuthorizedUserFlow {
+                secret: authorized_user_secret,
+            },
+            client,
+        )
     }
 }
 
diff --git a/src/authorized_user.rs b/src/authorized_user.rs
index b0e5116..c9de258 100644
--- a/src/authorized_user.rs
+++ b/src/authorized_user.rs
@@ -66,4 +66,4 @@ impl AuthorizedUserFlow {
         log::debug!("received response; head: {:?}, body: {:?}", head, body);
         TokenInfo::from_json(&body)
     }
-}
\ No newline at end of file
+}
diff --git a/src/helper.rs b/src/helper.rs
index b826eaa..00efa4e 100644
--- a/src/helper.rs
+++ b/src/helper.rs
@@ -4,9 +4,11 @@
 // Copyright (c) 2016 Google Inc (lewinb@google.com).
 //
 // Refer to the project root for licensing information.
-#[cfg(feature = "service_account")]
+use crate::authorized_user::AuthorizedUserSecret;
 use crate::types::{ApplicationSecret, ConsoleApplicationSecret};
-use crate::{authorized_user::AuthorizedUserSecret, service_account::ServiceAccountKey};
+
+#[cfg(feature = "service_account")]
+use crate::service_account::ServiceAccountKey;
 
 use std::io;
 use std::path::Path;
diff --git a/src/lib.rs b/src/lib.rs
index 9feb87e..c6c0997 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -91,13 +91,13 @@ pub mod storage;
 
 mod types;
 
+#[cfg(feature = "service_account")]
+pub use crate::authenticator::ServiceAccountAuthenticator;
 #[doc(inline)]
 pub use crate::authenticator::{
     ApplicationDefaultCredentialsAuthenticator, AuthorizedUserAuthenticator,
-    DeviceFlowAuthenticator, InstalledFlowAuthenticator
+    DeviceFlowAuthenticator, InstalledFlowAuthenticator,
 };
-#[cfg(feature = "service_account")]
-pub use crate::authenticator::ServiceAccountAuthenticator;
 
 pub use crate::helper::*;
 pub use crate::installed::InstalledFlowReturnMethod;