chore(ml-opensource#80): Remove the new folder

nivisi · Jan 5, 2023 · a7100fb · a7100fb
1 parent e75b5a3
commit a7100fb
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/...uth_token_storage/auth_token_storage.dart → ...uth_token_storage/auth_token_storage.dart b/...uth_token_storage/auth_token_storage.dart → ...uth_token_storage/auth_token_storage.dart
diff --git a/...en_storage/secure_auth_token_storage.dart → ...en_storage/secure_auth_token_storage.dart b/...en_storage/secure_auth_token_storage.dart → ...en_storage/secure_auth_token_storage.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:flutter_template/data/api/new/auth_token_storage/auth_token_storage.dart';
+import 'package:flutter_template/data/api/auth_token_storage/auth_token_storage.dart';
 import 'package:flutter_template/data/model/auth/auth_tokens.dart';
 import 'package:injectable/injectable.dart';
 

diff --git a/.../api/new/authenticator/authenticator.dart → ...data/api/authenticator/authenticator.dart b/.../api/new/authenticator/authenticator.dart → ...data/api/authenticator/authenticator.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:dio/dio.dart';
 import 'package:flutter_template/data/api/api_config.dart';
+import 'package:flutter_template/data/api/auth_token_storage/auth_token_storage.dart';
 import 'package:flutter_template/data/api/exceptions/authenticator_exception.dart';
-import 'package:flutter_template/data/api/new/auth_token_storage/auth_token_storage.dart';
-import 'package:flutter_template/data/api/new/interceptor/api_auth_interceptor.dart';
-import 'package:flutter_template/data/interceptor/meta_interceptor.dart';
+import 'package:flutter_template/data/api/interceptors/api_auth_interceptor.dart';
+import 'package:flutter_template/data/api/interceptors/meta_interceptor.dart';
 import 'package:flutter_template/data/model/auth/auth_tokens.dart';
 import 'package:flutter_template/data/services/http_client/dio_http_client.dart';
 import 'package:flutter_template/data/services/response_objects/tokens_response.dart';

diff --git a/lib/data/api/exceptions/token_unauthorized_exception.dart b/lib/data/api/exceptions/token_unauthorized_exception.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_template/data/api/new/interceptor/api_auth_interceptor.dart';
+import 'package:flutter_template/data/api/interceptors/api_auth_interceptor.dart';
 
 /// An exception indicating that token was invalid even after reauthentication.
 /// See [ApiAuthInterceptor].

diff --git a/...new/interceptor/api_auth_interceptor.dart → ...pi/interceptors/api_auth_interceptor.dart b/...new/interceptor/api_auth_interceptor.dart → ...pi/interceptors/api_auth_interceptor.dart
@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
+import 'package:flutter_template/data/api/authenticator/authenticator.dart';
 import 'package:flutter_template/data/api/exceptions/token_unauthorized_exception.dart';
-import 'package:flutter_template/data/api/new/authenticator/authenticator.dart';
 import 'package:flutter_template/injection/network_module.dart';
 import 'package:injectable/injectable.dart';
 

diff --git a/lib/data/interceptor/meta_interceptor.dart → ...ta/api/interceptors/meta_interceptor.dart b/lib/data/interceptor/meta_interceptor.dart → ...ta/api/interceptors/meta_interceptor.dart
diff --git a/lib/injection/network_module.dart b/lib/injection/network_module.dart
@@ -1,8 +1,8 @@
 import 'package:dio/adapter.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter_template/data/api/api_config.dart';
-import 'package:flutter_template/data/api/new/authenticator/authenticator.dart';
-import 'package:flutter_template/data/api/new/interceptor/api_auth_interceptor.dart';
+import 'package:flutter_template/data/api/authenticator/authenticator.dart';
+import 'package:flutter_template/data/api/interceptors/api_auth_interceptor.dart';
 import 'package:flutter_template/data/services/http_client/dio_http_client.dart';
 import 'package:flutter_template/injection/injector.dart';
 import 'package:injectable/injectable.dart';

diff --git a/test/data/api/auth_token_storage/secure_auth_token_storage_test.dart b/test/data/api/auth_token_storage/secure_auth_token_storage_test.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:flutter_template/data/api/new/auth_token_storage/secure_auth_token_storage.dart';
+import 'package:flutter_template/data/api/auth_token_storage/secure_auth_token_storage.dart';
 import 'package:flutter_template/data/model/auth/auth_tokens.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';

diff --git a/test/data/api/authenticator/authenticator_test.dart b/test/data/api/authenticator/authenticator_test.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:dio/dio.dart';
 import 'package:flutter_template/data/api/api_config.dart';
+import 'package:flutter_template/data/api/auth_token_storage/auth_token_storage.dart';
+import 'package:flutter_template/data/api/authenticator/authenticator.dart';
 import 'package:flutter_template/data/api/exceptions/authenticator_exception.dart';
-import 'package:flutter_template/data/api/new/auth_token_storage/auth_token_storage.dart';
-import 'package:flutter_template/data/api/new/authenticator/authenticator.dart';
-import 'package:flutter_template/data/interceptor/meta_interceptor.dart';
+import 'package:flutter_template/data/api/interceptors/meta_interceptor.dart';
 import 'package:flutter_template/data/model/auth/auth_tokens.dart';
 import 'package:flutter_template/data/services/http_client/dio_http_client.dart';
 import 'package:flutter_template/presentation/app_flavor.dart';

diff --git a/test/data/api/interceptors/api_auth_interceptor_test.dart b/test/data/api/interceptors/api_auth_interceptor_test.dart
@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
+import 'package:flutter_template/data/api/authenticator/authenticator.dart';
 import 'package:flutter_template/data/api/exceptions/token_unauthorized_exception.dart';
-import 'package:flutter_template/data/api/new/authenticator/authenticator.dart';
-import 'package:flutter_template/data/api/new/interceptor/api_auth_interceptor.dart';
+import 'package:flutter_template/data/api/interceptors/api_auth_interceptor.dart';
 import 'package:flutter_template/data/model/auth/auth_tokens.dart';
 import 'package:flutter_test/flutter_test.dart';
 // import 'package:husl/data/preferences/auth_preferences.dart';