Revert "[ VM / Service ] Temporarily disable VM service auth codes by default" This reverts commit 98fc8ac7ffc5c311ad85e5fa1ece79eeaa4cc201. Change-Id: I4f9c1da8f216039017d954931d141fd267d71508 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99761 Reviewed-by: Ben Konyi <bkonyi@google.com> Commit-Queue: Ben Konyi <bkonyi@google.com>
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc index d0916b9..2d09c17 100644 --- a/runtime/bin/main.cc +++ b/runtime/bin/main.cc
@@ -511,7 +511,7 @@ // Load embedder specific bits and return. if (!VmService::Setup( Options::vm_service_server_ip(), Options::vm_service_server_port(), - Options::vm_service_dev_mode(), !Options::vm_service_auth_enabled(), + Options::vm_service_dev_mode(), Options::vm_service_auth_disabled(), Options::trace_loading(), Options::deterministic())) { *error = strdup(VmService::GetErrorMessage()); return NULL;
diff --git a/runtime/bin/main_options.h b/runtime/bin/main_options.h index 414f309..8513fe3 100644 --- a/runtime/bin/main_options.h +++ b/runtime/bin/main_options.h
@@ -34,16 +34,12 @@ // As STRING_OPTIONS_LIST but for boolean valued options. The default value is // always false, and the presence of the flag switches the value to true. -// TODO(bkonyi): enable_service_auth_codes is a temporary flag and will be -// removed once auth codes are enabled by default. disable_service_auth_codes is -// a no-op for now. #define BOOL_OPTIONS_LIST(V) \ V(version, version_option) \ V(compile_all, compile_all) \ V(disable_service_origin_check, vm_service_dev_mode) \ V(disable_service_auth_codes, vm_service_auth_disabled) \ V(deterministic, deterministic) \ - V(enable_service_auth_codes, vm_service_auth_enabled) \ V(trace_loading, trace_loading) \ V(short_socket_read, short_socket_read) \ V(short_socket_write, short_socket_write) \
diff --git a/runtime/observatory/tests/service/test_helper.dart b/runtime/observatory/tests/service/test_helper.dart index f57bf4e..05c37a1 100644 --- a/runtime/observatory/tests/service/test_helper.dart +++ b/runtime/observatory/tests/service/test_helper.dart
@@ -132,8 +132,8 @@ if (pause_on_exit) { fullArgs.add('--pause-isolates-on-exit'); } - if (useAuthToken) { - fullArgs.add('--enable-service-auth-codes'); + if (!useAuthToken) { + fullArgs.add('--disable-service-auth-codes'); } if (pause_on_unhandled_exceptions) { fullArgs.add('--pause-isolates-on-unhandled-exceptions');