refactor(googleapis_auth): rename AuthProvider to AuthEndpoints

packages/shorebird_cli/lib/src/auth/auth.dart

@@ -8,7 +8,7 @@ import 'package:http/http.dart' as http;
 import 'package:jwt/jwt.dart';
 import 'package:path/path.dart' as p;
 import 'package:scoped/scoped.dart';
-import 'package:shorebird_cli/src/auth/providers/providers.dart';
+import 'package:shorebird_cli/src/auth/endpoints/endpoints.dart';
 import 'package:shorebird_cli/src/command.dart';
 import 'package:shorebird_cli/src/command_runner.dart';
 import 'package:shorebird_cli/src/http_client/http_client.dart';
@@ -30,15 +30,15 @@ const googleJwtIssuer = 'https://accounts.google.com';
 const microsoftJwtIssuerPrefix = 'https://login.microsoftonline.com/';
 
 typedef ObtainAccessCredentials = Future<oauth2.AccessCredentials> Function(
-  oauth2.AuthProvider authProvider,
+  oauth2.AuthEndpoints authEndpoints,
   oauth2.ClientId clientId,
   List<String> scopes,
   http.Client client,
   void Function(String) userPrompt,
 );
 
 typedef RefreshCredentials = Future<oauth2.AccessCredentials> Function(
-  oauth2.AuthProvider authProvider,
+  oauth2.AuthEndpoints authEndpoints,
   oauth2.ClientId clientId,
   oauth2.AccessCredentials credentials,
   http.Client client,
@@ -176,15 +176,15 @@ class Auth {
   }
 
   Future<AccessCredentials> loginCI(
-    oauth2.AuthProvider authProvider, {
+    oauth2.AuthEndpoints authEndpoints, {
     required void Function(String) prompt,
   }) async {
     final client = http.Client();
     try {
       final credentials = await _obtainAccessCredentials(
-        authProvider,
-        authProvider.clientId,
-        authProvider.scopes,
+        authEndpoints,
+        authEndpoints.clientId,
+        authEndpoints.scopes,
         client,
         prompt,
       );
@@ -206,7 +206,7 @@ class Auth {
   }
 
   Future<void> login(
-    oauth2.AuthProvider authProvider, {
+    oauth2.AuthEndpoints authEndpoints, {
     required void Function(String) prompt,
   }) async {
     if (_credentials != null) {
@@ -216,9 +216,9 @@ class Auth {
     final client = http.Client();
     try {
       _credentials = await _obtainAccessCredentials(
-        authProvider,
-        authProvider.clientId,
-        authProvider.scopes,
+        authEndpoints,
+        authEndpoints.clientId,
+        authEndpoints.scopes,
         client,
         prompt,
       );
@@ -327,21 +327,21 @@ class UserNotFoundException implements Exception {
 }
 
 extension OauthAuthProvider on Jwt {
-  oauth2.AuthProvider get authProvider {
+  oauth2.AuthEndpoints get authProvider {
     if (payload.iss == googleJwtIssuer) {
-      return oauth2.GoogleAuthProvider();
+      return oauth2.GoogleAuthEndpoints();
     } else if (payload.iss.startsWith(microsoftJwtIssuerPrefix)) {
-      return MicrosoftAuthProvider();
+      return MicrosoftAuthEndpoints();
     }
 
     throw Exception('Unknown jwt issuer: ${payload.iss}');
   }
 }
 
-extension OauthValues on oauth2.AuthProvider {
+extension OauthValues on oauth2.AuthEndpoints {
   oauth2.ClientId get clientId {
     switch (runtimeType) {
-      case oauth2.GoogleAuthProvider:
+      case oauth2.GoogleAuthEndpoints:
         return oauth2.ClientId(
           /// Shorebird CLI's OAuth 2.0 identifier for GCP,
           '''523302233293-eia5antm0tgvek240t46orctktiabrek.apps.googleusercontent.com''',
@@ -358,7 +358,7 @@ extension OauthValues on oauth2.AuthProvider {
           /// For more info see: https://developers.google.com/identity/protocols/oauth2/native-app
           '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',
         );
-      case MicrosoftAuthProvider:
+      case MicrosoftAuthEndpoints:
         return oauth2.ClientId(
           /// Shorebird CLI's OAuth 2.0 identifier for Azure/Entra.
           '0ff83897-ec85-4642-a250-48d5f595137c',
@@ -370,9 +370,9 @@ extension OauthValues on oauth2.AuthProvider {
 
   List<String> get scopes {
     switch (runtimeType) {
-      case oauth2.GoogleAuthProvider:
+      case oauth2.GoogleAuthEndpoints:
         return ['openid', 'https://www.googleapis.com/auth/userinfo.email'];
-      case MicrosoftAuthProvider:
+      case MicrosoftAuthEndpoints:
         return ['openid'];
     }
 

packages/shorebird_cli/lib/src/auth/endpoints/endpoints.dart

@@ -0,0 +1,2 @@
+export 'package:googleapis_auth/auth_io.dart' show GoogleAuthEndpoints;
+export 'microsoft_auth_endpoints.dart';

packages/shorebird_cli/lib/src/auth/providers/microsoft_auth_provider.dart → packages/shorebird_cli/lib/src/auth/endpoints/microsoft_auth_endpoints.dart

@@ -1,7 +1,7 @@
 import 'package:googleapis_auth/googleapis_auth.dart';
 
 /// Endpoints for OAuth authentication with Azure/Entra/Microsoft.
-class MicrosoftAuthProvider extends AuthProvider {
+class MicrosoftAuthEndpoints extends AuthEndpoints {
   @override
   Uri get authorizationEndpoint =>
       Uri.https('login.microsoftonline.com', 'common/oauth2/v2.0/authorize');

packages/shorebird_cli/lib/src/commands/login_ci_command.dart

@@ -20,7 +20,7 @@ class LoginCiCommand extends ShorebirdCommand {
     final AccessCredentials credentials;
 
     try {
-      credentials = await auth.loginCI(GoogleAuthProvider(), prompt: prompt);
+      credentials = await auth.loginCI(GoogleAuthEndpoints(), prompt: prompt);
     } on UserNotFoundException catch (error) {
       logger
         ..err(

packages/shorebird_cli/lib/src/commands/login_command.dart

@@ -1,6 +1,7 @@
 import 'package:googleapis_auth/auth_io.dart';
 import 'package:mason_logger/mason_logger.dart';
 import 'package:shorebird_cli/src/auth/auth.dart';
+import 'package:shorebird_cli/src/auth/endpoints/endpoints.dart';
 import 'package:shorebird_cli/src/command.dart';
 import 'package:shorebird_cli/src/logger.dart';
 
@@ -18,7 +19,7 @@ class LoginCommand extends ShorebirdCommand {
   @override
   Future<int> run() async {
     try {
-      await auth.login(GoogleAuthProvider(), prompt: prompt);
+      await auth.login(GoogleAuthEndpoints(), prompt: prompt);
     } on UserAlreadyLoggedInException catch (error) {
       logger
         ..info('You are already logged in as <${error.email}>.')

packages/shorebird_cli/test/src/auth/auth_test.dart

@@ -11,7 +11,7 @@ import 'package:path/path.dart' as p;
 import 'package:platform/platform.dart';
 import 'package:scoped/scoped.dart';
 import 'package:shorebird_cli/src/auth/auth.dart';
-import 'package:shorebird_cli/src/auth/providers/providers.dart';
+import 'package:shorebird_cli/src/auth/endpoints/endpoints.dart';
 import 'package:shorebird_cli/src/command_runner.dart';
 import 'package:shorebird_cli/src/http_client/http_client.dart';
 import 'package:shorebird_cli/src/logger.dart';
@@ -22,7 +22,7 @@ import 'package:test/test.dart';
 import '../fakes.dart';
 import '../mocks.dart';
 
-class FakeProvider extends oauth2.AuthProvider {
+class FakeProvider extends oauth2.AuthEndpoints {
   @override
   Uri get authorizationEndpoint => Uri.https('example.com');
 
@@ -106,7 +106,7 @@ void main() {
         });
 
         test('returns AuthProvider.microsoft', () {
-          expect(jwt.authProvider, isA<MicrosoftAuthProvider>());
+          expect(jwt.authProvider, isA<MicrosoftAuthEndpoints>());
         });
       });
 
@@ -116,7 +116,7 @@ void main() {
         });
 
         test('returns AuthProvider.google', () {
-          expect(jwt.authProvider, isA<GoogleAuthProvider>());
+          expect(jwt.authProvider, isA<GoogleAuthEndpoints>());
         });
       });
 
@@ -152,8 +152,8 @@ void main() {
     );
     const refreshToken = '';
     const scopes = <String>[];
-    final googleAuthProvider = GoogleAuthProvider();
-    final microsoftAuthProvider = MicrosoftAuthProvider();
+    final googleAuthProvider = GoogleAuthEndpoints();
+    final microsoftAuthProvider = MicrosoftAuthEndpoints();
     final accessToken = oauth2.AccessToken(
       'Bearer',
       'accessToken',

packages/shorebird_cli/test/src/auth/providers/microsoft_auth_provider_test.dart

@@ -1,10 +1,10 @@
-import 'package:shorebird_cli/src/auth/providers/providers.dart';
+import 'package:shorebird_cli/src/auth/endpoints/endpoints.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group(MicrosoftAuthProvider, () {
+  group(MicrosoftAuthEndpoints, () {
     test('has valid endpoints', () {
-      final provider = MicrosoftAuthProvider();
+      final provider = MicrosoftAuthEndpoints();
       expect(provider.authorizationEndpoint, isNotNull);
       expect(provider.tokenEndpoint, isNotNull);
     });

packages/shorebird_cli/test/src/commands/login_ci_command_test.dart

@@ -4,6 +4,7 @@ import 'package:mason_logger/mason_logger.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:scoped/scoped.dart';
 import 'package:shorebird_cli/src/auth/auth.dart';
+import 'package:shorebird_cli/src/auth/endpoints/endpoints.dart';
 import 'package:shorebird_cli/src/commands/commands.dart';
 import 'package:shorebird_cli/src/logger.dart';
 import 'package:test/test.dart';
@@ -30,7 +31,7 @@ void main() {
     }
 
     setUpAll(() {
-      registerFallbackValue(GoogleAuthProvider());
+      registerFallbackValue(GoogleAuthEndpoints());
     });
 
     setUp(() {

packages/shorebird_cli/test/src/commands/login_command_test.dart

@@ -7,6 +7,7 @@ import 'package:mocktail/mocktail.dart';
 import 'package:path/path.dart' as p;
 import 'package:scoped/scoped.dart';
 import 'package:shorebird_cli/src/auth/auth.dart';
+import 'package:shorebird_cli/src/auth/endpoints/endpoints.dart';
 import 'package:shorebird_cli/src/commands/login_command.dart';
 import 'package:shorebird_cli/src/logger.dart';
 import 'package:test/test.dart';
@@ -34,7 +35,7 @@ void main() {
     }
 
     setUpAll(() {
-      registerFallbackValue(GoogleAuthProvider());
+      registerFallbackValue(GoogleAuthEndpoints());
     });
 
     setUp(() {

third_party/googleapis_auth/lib/auth_io.dart

@@ -37,7 +37,7 @@ export 'src/typedefs.dart';
 /// {@macro googleapis_auth_not_close_the_baseClient}
 /// {@macro googleapis_auth_listen_port}
 Future<AutoRefreshingAuthClient> clientViaUserConsent(
-  AuthProvider authProvider,
+  AuthEndpoints authEndpoints,
   ClientId clientId,
   List<String> scopes,
   PromptUserForConsent userPrompt, {
@@ -52,7 +52,7 @@ Future<AutoRefreshingAuthClient> clientViaUserConsent(
   }
 
   final flow = AuthorizationCodeGrantServerFlow(
-    authProvider,
+    authEndpoints,
     clientId,
     scopes,
     baseClient,
@@ -73,7 +73,7 @@ Future<AutoRefreshingAuthClient> clientViaUserConsent(
   }
   return AutoRefreshingClient(
     baseClient,
-    authProvider,
+    authEndpoints,
     clientId,
     credentials,
     closeUnderlyingClient: closeUnderlyingClient,
@@ -96,7 +96,7 @@ Future<AutoRefreshingAuthClient> clientViaUserConsent(
 /// {@macro googleapis_auth_close_the_client}
 /// {@macro googleapis_auth_not_close_the_baseClient}
 Future<AutoRefreshingAuthClient> clientViaUserConsentManual(
-  AuthProvider authProvider,
+  AuthEndpoints authEndpoints,
   ClientId clientId,
   List<String> scopes,
   PromptUserForConsentManual userPrompt, {
@@ -110,7 +110,7 @@ Future<AutoRefreshingAuthClient> clientViaUserConsentManual(
   }
 
   final flow = AuthorizationCodeGrantManualFlow(
-    authProvider,
+    authEndpoints,
     clientId,
     scopes,
     baseClient,
@@ -131,7 +131,7 @@ Future<AutoRefreshingAuthClient> clientViaUserConsentManual(
 
   return AutoRefreshingClient(
     baseClient,
-    authProvider,
+    authEndpoints,
     clientId,
     credentials,
     closeUnderlyingClient: closeUnderlyingClient,
@@ -159,7 +159,7 @@ Future<AutoRefreshingAuthClient> clientViaUserConsentManual(
 /// on the Google Cloud console.
 /// {@endtemplate}
 Future<AccessCredentials> obtainAccessCredentialsViaUserConsent(
-  AuthProvider authProvider,
+  AuthEndpoints authEndpoints,
   ClientId clientId,
   List<String> scopes,
   Client client,
@@ -168,7 +168,7 @@ Future<AccessCredentials> obtainAccessCredentialsViaUserConsent(
   int listenPort = 0,
 }) =>
     AuthorizationCodeGrantServerFlow(
-      authProvider,
+      authEndpoints,
       clientId,
       scopes,
       client,
@@ -190,15 +190,15 @@ Future<AccessCredentials> obtainAccessCredentialsViaUserConsent(
 ///
 /// {@macro googleapis_auth_user_consent_return}
 Future<AccessCredentials> obtainAccessCredentialsViaUserConsentManual(
-  AuthProvider authProvider,
+  AuthEndpoints authEndpoints,
   ClientId clientId,
   List<String> scopes,
   Client client,
   PromptUserForConsentManual userPrompt, {
   String? hostedDomain,
 }) =>
     AuthorizationCodeGrantManualFlow(
-      authProvider,
+      authEndpoints,
       clientId,
       scopes,
       client,

third_party/googleapis_auth/lib/googleapis_auth.dart

@@ -27,7 +27,7 @@ library googleapis_auth;
 
 export 'src/auth_client.dart';
 export 'src/auth_functions.dart';
-export 'src/auth_provider.dart';
+export 'src/auth_endpoints.dart';
 export 'src/client_id.dart';
 export 'src/exceptions.dart';
 export 'src/response_type.dart';

third_party/googleapis_auth/lib/src/adc_utils.dart

@@ -13,7 +13,7 @@ import 'auth_http_utils.dart';
 
 Future<AutoRefreshingAuthClient> fromApplicationsCredentialsFile(
   File file,
-  AuthProvider authProvider,
+  AuthEndpoints authEndpoints,
   String fileSource,
   List<String> scopes,
   Client baseClient,
@@ -38,10 +38,10 @@ Future<AutoRefreshingAuthClient> fromApplicationsCredentialsFile(
     );
     return AutoRefreshingClient(
       baseClient,
-      authProvider,
+      authEndpoints,
       clientId,
       await refreshCredentials(
-        authProvider,
+        authEndpoints,
         clientId,
         AccessCredentials(
           // Hack: Create empty credentials that have expired.

third_party/googleapis_auth/lib/src/auth_provider.dart → third_party/googleapis_auth/lib/src/auth_endpoints.dart

@@ -1,11 +1,11 @@
 import 'known_uris.dart';
 
-abstract class AuthProvider {
+abstract class AuthEndpoints {
   Uri get authorizationEndpoint;
   Uri get tokenEndpoint;
 }
 
-class GoogleAuthProvider extends AuthProvider {
+class GoogleAuthEndpoints extends AuthEndpoints {
   @override
   Uri get authorizationEndpoint => googleOauth2AuthorizationEndpoint;