[identity] Rename google_auth_provider_rust -> google_auth_provider
Bug: 547
Testing: Unit tests, login e2e test
Change-Id: I6b452c93a5287c0232065cae25afc8b054e91236
diff --git a/src/identity/bin/BUILD.gn b/src/identity/bin/BUILD.gn
index d79fcd5..4c191c5 100644
--- a/src/identity/bin/BUILD.gn
+++ b/src/identity/bin/BUILD.gn
@@ -25,7 +25,7 @@
"account_manager:bin_test",
"dev_auth_provider:bin_test",
"dev_auth_provider_iotid:bin_test",
- "google_auth_provider_rust:bin_test",
+ "google_auth_provider:bin_test",
]
tests = [
@@ -46,7 +46,7 @@
environments = basic_envs
},
{
- name = "google_auth_provider_rust_bin_test"
+ name = "google_auth_provider_bin_test"
environments = basic_envs
},
]
diff --git a/src/identity/bin/account_manager/BUILD.gn b/src/identity/bin/account_manager/BUILD.gn
index 22eaddd..3507b64 100644
--- a/src/identity/bin/account_manager/BUILD.gn
+++ b/src/identity/bin/account_manager/BUILD.gn
@@ -54,6 +54,6 @@
group("account_manager_auth_providers") {
public_deps = [
- "../google_auth_provider_rust",
+ "../google_auth_provider",
]
}
diff --git a/src/identity/bin/account_manager/src/main.rs b/src/identity/bin/account_manager/src/main.rs
index 8ea65d9..b2c27ff 100644
--- a/src/identity/bin/account_manager/src/main.rs
+++ b/src/identity/bin/account_manager/src/main.rs
@@ -44,7 +44,7 @@
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_rust").to_string(),
+ url: fuchsia_single_component_package_url!("google_auth_provider").to_string(),
params: None
}]
};
diff --git a/src/identity/bin/google_auth_provider_rust/BUILD.gn b/src/identity/bin/google_auth_provider/BUILD.gn
similarity index 85%
rename from src/identity/bin/google_auth_provider_rust/BUILD.gn
rename to src/identity/bin/google_auth_provider/BUILD.gn
index ac5b3e3..15dd1e7e4 100644
--- a/src/identity/bin/google_auth_provider_rust/BUILD.gn
+++ b/src/identity/bin/google_auth_provider/BUILD.gn
@@ -6,7 +6,7 @@
import("//build/rust/rustc_binary.gni")
rustc_binary("bin") {
- name = "google_auth_provider_rust"
+ name = "google_auth_provider"
with_unit_tests = true
edition = "2018"
@@ -35,17 +35,17 @@
]
}
-package("google_auth_provider_rust") {
+package("google_auth_provider") {
deps = [
":bin",
]
- binary = "google_auth_provider_rust"
+ binary = "google_auth_provider"
meta = [
{
- path = rebase_path("meta/google_auth_provider_rust.cmx")
- dest = "google_auth_provider_rust.cmx"
+ path = rebase_path("meta/google_auth_provider.cmx")
+ dest = "google_auth_provider.cmx"
},
]
}
diff --git a/src/identity/bin/google_auth_provider_rust/meta/google_auth_provider_rust.cmx b/src/identity/bin/google_auth_provider/meta/google_auth_provider.cmx
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/meta/google_auth_provider_rust.cmx
rename to src/identity/bin/google_auth_provider/meta/google_auth_provider.cmx
diff --git a/src/identity/bin/google_auth_provider_rust/src/auth_provider.rs b/src/identity/bin/google_auth_provider/src/auth_provider.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/auth_provider.rs
rename to src/identity/bin/google_auth_provider/src/auth_provider.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/auth_provider_factory.rs b/src/identity/bin/google_auth_provider/src/auth_provider_factory.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/auth_provider_factory.rs
rename to src/identity/bin/google_auth_provider/src/auth_provider_factory.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/constants.rs b/src/identity/bin/google_auth_provider/src/constants.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/constants.rs
rename to src/identity/bin/google_auth_provider/src/constants.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/error.rs b/src/identity/bin/google_auth_provider/src/error.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/error.rs
rename to src/identity/bin/google_auth_provider/src/error.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/firebase.rs b/src/identity/bin/google_auth_provider/src/firebase.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/firebase.rs
rename to src/identity/bin/google_auth_provider/src/firebase.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/http.rs b/src/identity/bin/google_auth_provider/src/http.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/http.rs
rename to src/identity/bin/google_auth_provider/src/http.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/main.rs b/src/identity/bin/google_auth_provider/src/main.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/main.rs
rename to src/identity/bin/google_auth_provider/src/main.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/oauth.rs b/src/identity/bin/google_auth_provider/src/oauth.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/oauth.rs
rename to src/identity/bin/google_auth_provider/src/oauth.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/openid.rs b/src/identity/bin/google_auth_provider/src/openid.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/openid.rs
rename to src/identity/bin/google_auth_provider/src/openid.rs
diff --git a/src/identity/bin/google_auth_provider_rust/src/web.rs b/src/identity/bin/google_auth_provider/src/web.rs
similarity index 100%
rename from src/identity/bin/google_auth_provider_rust/src/web.rs
rename to src/identity/bin/google_auth_provider/src/web.rs
diff --git a/src/identity/bin/meta/google_auth_provider_bin_test.cmx b/src/identity/bin/meta/google_auth_provider_bin_test.cmx
new file mode 100644
index 0000000..159b9ac
--- /dev/null
+++ b/src/identity/bin/meta/google_auth_provider_bin_test.cmx
@@ -0,0 +1,8 @@
+{
+ "program": {
+ "binary": "test/google_auth_provider_bin_test"
+ },
+ "sandbox": {
+ "services": []
+ }
+}
diff --git a/src/identity/bin/meta/google_auth_provider_rust_bin_test.cmx b/src/identity/bin/meta/google_auth_provider_rust_bin_test.cmx
deleted file mode 100644
index 833d19b..0000000
--- a/src/identity/bin/meta/google_auth_provider_rust_bin_test.cmx
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "program": {
- "binary": "test/google_auth_provider_rust_bin_test"
- },
- "sandbox": {
- "services": []
- }
-}
diff --git a/src/identity/tests/google_signin_e2e/BUILD.gn b/src/identity/tests/google_signin_e2e/BUILD.gn
index 3e37e42..dba3c47 100644
--- a/src/identity/tests/google_signin_e2e/BUILD.gn
+++ b/src/identity/tests/google_signin_e2e/BUILD.gn
@@ -20,7 +20,6 @@
deps = [
"//sdk/fidl/fuchsia.auth",
"//sdk/fidl/fuchsia.ui.views",
- "//third_party/dart-pkg/pub/args",
"//topaz/lib/settings:lib.settings",
"//topaz/public/dart/fidl",
"//topaz/public/dart/fuchsia_inspect",
diff --git a/src/identity/tests/google_signin_e2e/lib/main.dart b/src/identity/tests/google_signin_e2e/lib/main.dart
index a67c0d0..645d9cb 100644
--- a/src/identity/tests/google_signin_e2e/lib/main.dart
+++ b/src/identity/tests/google_signin_e2e/lib/main.dart
@@ -1,6 +1,5 @@
import 'dart:async';
-import 'package:args/args.dart';
import 'package:fidl_fuchsia_auth/fidl_async.dart';
import 'package:fidl_fuchsia_sys/fidl_async.dart';
import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
@@ -21,15 +20,12 @@
const String googleAuthProviderType = 'Google';
const String googleAuthProviderUrl =
'fuchsia-pkg://fuchsia.com/google_auth_provider#meta/google_auth_provider.cmx';
-const String googleAuthProviderRustUrl =
- 'fuchsia-pkg://fuchsia.com/google_auth_provider_rust#meta/google_auth_provider_rust.cmx';
const List<String> accessTokenScopes = [
'https://www.googleapis.com/auth/plus.login'
];
const String glifFlag = 'glif';
const String dedicatedEndpointFlag = 'dedicated-endpoint';
-const String rustFlag = 'rust';
const String authStatusField = 'auth-status';
const String successAuthStatus = 'success';
@@ -43,18 +39,9 @@
/// Thin app used for invoking token manager
void main(List<String> args) {
- final parser = ArgParser()
- ..addFlag(glifFlag)
- ..addFlag(dedicatedEndpointFlag)
- ..addFlag(rustFlag);
- final argResults = parser.parse(args);
-
setupLogger();
- final model = GoogleLoginTesterModel(inspect.Inspect().root)
- ..glif = argResults[glifFlag]
- ..dedicatedEndpoint = argResults[dedicatedEndpointFlag]
- ..rust = argResults[rustFlag];
+ final model = GoogleLoginTesterModel(inspect.Inspect().root);
final app = ScopedModel(
model: model,
@@ -73,12 +60,6 @@
final TokenManagerProxy tokenManager = TokenManagerProxy();
final ComponentControllerProxy controller = ComponentControllerProxy();
- // Whether to request the glif or redcarpet UI.
- bool glif = false;
- // Whether to request the dedicated or normal endpoint.
- bool dedicatedEndpoint = false;
- // Whether to use the Rust or C++ GoogleAuthProvider.
- bool rust = false;
// Inspect node used to report if the authentication flow has succeeded.
final inspect.Node _inspectNode;
@@ -102,15 +83,11 @@
}
List<AuthProviderConfig> _buildAuthProviderConfigs() {
- var params = <String>[]
- ..add(glif ? '--glif' : '--redcarpet')
- ..add(dedicatedEndpoint ? '--fuchsiaendpoint' : '--oauthendpoint');
-
return [
AuthProviderConfig(
authProviderType: googleAuthProviderType,
- url: rust ? googleAuthProviderRustUrl : googleAuthProviderUrl,
- params: params)
+ url: googleAuthProviderUrl,
+ params: <String>[])
];
}
