setup ENV done

crossknot-community · Jul 20, 2022 · f7536b7 · f7536b7
1 parent 73fa11b
commit f7536b7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 15 deletions.
diff --git a/lib/di/get_it_dependencies.dart b/lib/di/get_it_dependencies.dart
@@ -1,7 +1,7 @@
 import 'package:appwrite/appwrite.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get_it/get_it.dart';
-import 'package:secret_dms/constants/secrets.dart';
 import 'package:secret_dms/models/user.dart';
 import 'package:secret_dms/services/auth_service.dart';
 import 'package:secret_dms/services/local/base_storage.dart';
@@ -12,11 +12,15 @@ final GetIt getIt = GetIt.instance;
 void setupDependencies() {
   getIt.registerSingleton<FlutterSecureStorage>(const FlutterSecureStorage());
   getIt.registerSingleton<Client>(
-    Client(endPoint: AppSecrets.apiEndPoint)..setProject(AppSecrets.projectId),
+    Client(
+        endPoint: dotenv.env['ENV'] == 'production'
+            ? dotenv.env['PROD_API_END_POINT']!
+            : dotenv.env['LOCAL_API_END_POINT']!)
+      ..setProject(dotenv.env['PROJECT_ID']),
   );
   getIt.registerSingleton<Databases>(Databases(
     client,
-    databaseId: AppSecrets.databaseId,
+    databaseId: dotenv.get('DATABASE_ID'),
   ));
   getIt.registerSingleton<Account>(Account(client));
   getIt.registerSingleton<BaseStorage<AppUser>>(

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,19 +1,28 @@
+import 'dart:async';
+
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:secret_dms/di/di.dart';
 import 'package:secret_dms/ui/app_widget.dart';
 import 'package:secret_dms/utils/provider_logger.dart';
 
-void main() {
-  WidgetsFlutterBinding.ensureInitialized();
-  setupDependencies();
+Future<void> main() async {
+  runZonedGuarded(() async {
+    WidgetsFlutterBinding.ensureInitialized();
+    await dotenv.load();
+    print('Dot Env loaded');
+    setupDependencies();
 
-  runApp(
-    ProviderScope(
-      observers: [Logger()],
-      child: const MyApp(),
-    ),
-  );
+    runApp(
+      ProviderScope(
+        observers: [Logger()],
+        child: const MyApp(),
+      ),
+    );
+  }, (error, stack) {
+    print('$error');
+  });
 }
 
 class MyApp extends StatelessWidget {

diff --git a/lib/services/auth_service.dart b/lib/services/auth_service.dart
@@ -3,8 +3,8 @@ import 'dart:io';
 import 'package:appwrite/appwrite.dart';
 import 'package:appwrite/models.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:fpdart/fpdart.dart';
-import 'package:secret_dms/constants/secrets.dart';
 import 'package:secret_dms/models/failure.dart';
 import 'package:secret_dms/models/user.dart';
 import 'package:secret_dms/services/local/base_storage.dart';
@@ -72,7 +72,7 @@ class AuthService extends BaseAuthService {
   }) async {
     try {
       final results = await database.listDocuments(
-        collectionId: AppSecrets.collectionId,
+        collectionId: dotenv.env['COLLECTION_ID']!,
         queries: [
           Query.equal('username', appUser.username),
         ],
@@ -82,7 +82,7 @@ class AuthService extends BaseAuthService {
       }
 
       await database.createDocument(
-        collectionId: AppSecrets.collectionId,
+        collectionId: dotenv.env['COLLECTION_ID']!,
         documentId: appUser.id,
         data: appUser.toMap(),
       );

diff --git a/pubspec.lock b/pubspec.lock
@@ -244,6 +244,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_dotenv:
+    dependency: "direct main"
+    description:
+      name: flutter_dotenv
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.0.2"
   flutter_lints:
     dependency: "direct dev"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -22,6 +22,7 @@ dependencies:
   flutter_svg: ^1.1.1+1
   iconsax: ^0.0.8
   uni_links: ^0.5.1
+  flutter_dotenv: ^5.0.2
 
 dev_dependencies:
   flutter_test:
@@ -35,6 +36,7 @@ flutter:
 
   # Images used in the app
   assets:
+    - .env
     - assets/images/
 
   # Fonts used in the app