diff --git a/mobile/lib/interfaces/auth_api.interface.dart b/mobile/lib/interfaces/auth_api.interface.dart deleted file mode 100644 index bb9a8b5a2c..0000000000 --- a/mobile/lib/interfaces/auth_api.interface.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'package:immich_mobile/models/auth/login_response.model.dart'; - -abstract interface class IAuthApiRepository { - Future login(String email, String password); - - Future logout(); - - Future changePassword(String newPassword); - - Future unlockPinCode(String pinCode); - Future lockPinCode(); - - Future setupPinCode(String pinCode); -} diff --git a/mobile/lib/repositories/auth_api.repository.dart b/mobile/lib/repositories/auth_api.repository.dart index 4015ffd7bc..4b68867506 100644 --- a/mobile/lib/repositories/auth_api.repository.dart +++ b/mobile/lib/repositories/auth_api.repository.dart @@ -1,5 +1,4 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:immich_mobile/interfaces/auth_api.interface.dart'; import 'package:immich_mobile/models/auth/login_response.model.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:immich_mobile/repositories/api.repository.dart'; @@ -9,12 +8,11 @@ import 'package:openapi/api.dart'; final authApiRepositoryProvider = Provider((ref) => AuthApiRepository(ref.watch(apiServiceProvider))); -class AuthApiRepository extends ApiRepository implements IAuthApiRepository { +class AuthApiRepository extends ApiRepository { final ApiService _apiService; AuthApiRepository(this._apiService); - @override Future changePassword(String newPassword) async { await _apiService.usersApi.updateMyUser( UserUpdateMeDto( @@ -23,7 +21,6 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository { ); } - @override Future login(String email, String password) async { final loginResponseDto = await checkNull( _apiService.authenticationApi.login( @@ -37,7 +34,6 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository { return _mapLoginReponse(loginResponseDto); } - @override Future logout() async { await _apiService.authenticationApi .logout() @@ -56,7 +52,6 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository { ); } - @override Future unlockPinCode(String pinCode) async { try { await _apiService.authenticationApi @@ -67,13 +62,11 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository { } } - @override Future setupPinCode(String pinCode) { return _apiService.authenticationApi .setupPinCode(PinCodeSetupDto(pinCode: pinCode)); } - @override Future lockPinCode() { return _apiService.authenticationApi.lockAuthSession(); } diff --git a/mobile/lib/services/auth.service.dart b/mobile/lib/services/auth.service.dart index 6fda76e137..0eec253ee1 100644 --- a/mobile/lib/services/auth.service.dart +++ b/mobile/lib/services/auth.service.dart @@ -5,7 +5,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/models/store.model.dart'; import 'package:immich_mobile/domain/utils/background_sync.dart'; import 'package:immich_mobile/entities/store.entity.dart'; -import 'package:immich_mobile/interfaces/auth_api.interface.dart'; import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart'; import 'package:immich_mobile/models/auth/login_response.model.dart'; import 'package:immich_mobile/providers/api.provider.dart'; @@ -28,7 +27,7 @@ final authServiceProvider = Provider( ); class AuthService { - final IAuthApiRepository _authApiRepository; + final AuthApiRepository _authApiRepository; final AuthRepository _authRepository; final ApiService _apiService; final NetworkService _networkService; diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart index 0760f7bc7c..70876d8a3b 100644 --- a/mobile/test/repository.mocks.dart +++ b/mobile/test/repository.mocks.dart @@ -3,7 +3,6 @@ import 'package:immich_mobile/interfaces/album.interface.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart'; import 'package:immich_mobile/interfaces/asset_media.interface.dart'; -import 'package:immich_mobile/interfaces/auth_api.interface.dart'; import 'package:immich_mobile/repositories/partner_api.repository.dart'; import 'package:immich_mobile/repositories/album_media.repository.dart'; import 'package:immich_mobile/repositories/album_api.repository.dart'; @@ -13,6 +12,7 @@ import 'package:immich_mobile/repositories/local_files_manager.repository.dart'; import 'package:immich_mobile/repositories/file_media.repository.dart'; import 'package:immich_mobile/repositories/backup.repository.dart'; import 'package:immich_mobile/repositories/auth.repository.dart'; +import 'package:immich_mobile/repositories/auth_api.repository.dart'; import 'package:mocktail/mocktail.dart'; class MockAlbumRepository extends Mock implements IAlbumRepository {} @@ -37,7 +37,7 @@ class MockFileMediaRepository extends Mock implements FileMediaRepository {} class MockAlbumApiRepository extends Mock implements AlbumApiRepository {} -class MockAuthApiRepository extends Mock implements IAuthApiRepository {} +class MockAuthApiRepository extends Mock implements AuthApiRepository {} class MockAuthRepository extends Mock implements AuthRepository {}