From bb4bde858c252c9f9e80c8a1f38ae48f2d69f0dd Mon Sep 17 00:00:00 2001
From: Jody Sankey <jsankey@google.com>
Date: Tue, 23 Apr 2019 17:58:37 +0000
Subject: [PATCH] [identity] Switch to fuchsia.git google_auth_provider.
This is step 2 of 4 in a soft transition to migrate the Auth Provider
between repos.
Change-Id: I7056d5d23e81943a71c5c3ae42e057b75354de3d
---
garnet/bin/auth/account_manager/src/main.rs | 2 +-
garnet/bin/sl4f/src/auth/facade.rs | 3 ++-
garnet/packages/prod/BUILD.gn | 1 +
peridot/bin/basemgr/user_provider_impl.cc | 14 +++++++-------
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/garnet/bin/auth/account_manager/src/main.rs b/garnet/bin/auth/account_manager/src/main.rs
index a2c1d1ab5a3..2035658b144 100644
--- a/garnet/bin/auth/account_manager/src/main.rs
+++ b/garnet/bin/auth/account_manager/src/main.rs
@@ -44,7 +44,7 @@ lazy_static! {
static ref DEFAULT_AUTH_PROVIDER_CONFIG: Vec<AuthProviderConfig> = {
vec![AuthProviderConfig {
auth_provider_type: "google".to_string(),
- url: fuchsia_single_component_package_url!("google_auth_provider").to_string(),
+ url: fuchsia_single_component_package_url!("google_auth_provider_2").to_string(),
params: None
}]
};
diff --git a/garnet/bin/sl4f/src/auth/facade.rs b/garnet/bin/sl4f/src/auth/facade.rs
index c910ad03cff..4f146e5dcf8 100644
--- a/garnet/bin/sl4f/src/auth/facade.rs
+++ b/garnet/bin/sl4f/src/auth/facade.rs
@@ -50,7 +50,8 @@ impl AuthFacade {
fn discover_injection_service(
&self,
) -> Result<Option<LegacyAuthCredentialInjectorSynchronousProxy>, Error> {
- let glob_path = "/hub/c/google_auth_provider.cmx/*/out/debug/LegacyAuthCredentialInjector";
+ let glob_path =
+ "/hub/c/google_auth_provider_2.cmx/*/out/debug/LegacyAuthCredentialInjector";
let found_path = glob(glob_path)?.filter_map(|entry| entry.ok()).next();
match found_path {
Some(path) => {
diff --git a/garnet/packages/prod/BUILD.gn b/garnet/packages/prod/BUILD.gn
index 79c62788846..ca969c64a3d 100644
--- a/garnet/packages/prod/BUILD.gn
+++ b/garnet/packages/prod/BUILD.gn
@@ -134,6 +134,7 @@ group("auth") {
"//garnet/bin/auth:account_handler",
"//garnet/bin/auth:account_manager",
"//garnet/bin/auth:token_manager_factory",
+ "//src/identity/bin/google_auth_provider:google_auth_provider_2",
]
}
diff --git a/peridot/bin/basemgr/user_provider_impl.cc b/peridot/bin/basemgr/user_provider_impl.cc
index df7a260770f..0d12a9ed8af 100644
--- a/peridot/bin/basemgr/user_provider_impl.cc
+++ b/peridot/bin/basemgr/user_provider_impl.cc
@@ -4,18 +4,18 @@
#include "peridot/bin/basemgr/user_provider_impl.h"
-#include <utility>
-
#include <lib/fit/function.h>
#include <src/lib/fxl/strings/string_printf.h>
#include <zircon/status.h>
-#include "src/lib/files/directory.h"
-#include "src/lib/files/file.h"
-#include "src/lib/files/path.h"
+
+#include <utility>
#include "peridot/bin/basemgr/users_generated.h"
#include "peridot/lib/fidl/clone.h"
#include "peridot/lib/fidl/json_xdr.h"
+#include "src/lib/files/directory.h"
+#include "src/lib/files/file.h"
+#include "src/lib/files/path.h"
namespace modular {
@@ -35,8 +35,8 @@ constexpr char kDevAuthProviderUrl[] =
// Google auth provider configuration
constexpr char kGoogleAuthProviderType[] = "google";
constexpr char kGoogleAuthProviderUrl[] =
- "fuchsia-pkg://fuchsia.com/google_auth_provider#meta/"
- "google_auth_provider.cmx";
+ "fuchsia-pkg://fuchsia.com/google_auth_provider_2#meta/"
+ "google_auth_provider_2.cmx";
fuchsia::modular::auth::AccountPtr Convert(
const fuchsia::modular::UserStorage* const user) {
--
GitLab