chore: use kReleaseMode to set prod config

gruprsvp · Nov 11, 2024 · 3640504 · 3640504
1 parent 073b85d
commit 3640504
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 15 deletions.
diff --git a/assets/env/local.json b/assets/env/local.json
@@ -0,0 +1,5 @@
+{
+  "supabaseConfigPath": "supabase/config/localhost.json",
+  "socialAuthWebClientId": "655087059227-32trs4upje1r6itvs3p1c1fs0m98m8ol.apps.googleusercontent.com",
+  "socialAuthIosClientId": "655087059227-o10vdnfsvnkl9ct8isg8db3j74s0rfur.apps.googleusercontent.com"
+}
diff --git a/assets/env/supabase.json b/assets/env/supabase.json
@@ -0,0 +1,5 @@
+{
+  "supabaseConfigPath": "supabase/config/supabase.json",
+  "socialAuthWebClientId": "655087059227-32trs4upje1r6itvs3p1c1fs0m98m8ol.apps.googleusercontent.com",
+  "socialAuthIosClientId": "655087059227-o10vdnfsvnkl9ct8isg8db3j74s0rfur.apps.googleusercontent.com"
+}
diff --git a/env/dev.json b/env/dev.json
diff --git a/env/local.json b/env/local.json
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -126,4 +126,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 569636ff5edb32636892b1c748f656de700236ae
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/lib/presentation/screens/auth.dart b/lib/presentation/screens/auth.dart
@@ -15,6 +15,7 @@ class AuthScreen extends StatelessWidget {
     onSuccess(session) => HomeScreenRoute().go(context);
 
     final config = ConfigService().config;
+
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.appName),

diff --git a/lib/util/config.dart b/lib/util/config.dart
@@ -1,6 +1,8 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
 import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'config.freezed.dart';
 part 'config.g.dart';
@@ -16,8 +18,8 @@ class ConfigService {
   }
 
   Future<void> initialize() async {
-    const env = String.fromEnvironment('ENV', defaultValue: 'local');
-    final envConfigFile = await rootBundle.loadString('env/$env.json');
+    const env = kReleaseMode ? 'supabase' : 'local';
+    final envConfigFile = await rootBundle.loadString('assets/env/$env.json');
     final config =
         Config.fromJson(json.decode(envConfigFile) as Map<String, dynamic>);
     this.config = config;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -162,7 +162,7 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/
-    - env/
+    - assets/env/
     - supabase/config/
 
   # An image asset can refer to one or more resolution-specific "variants", see

diff --git a/supabase/config/supabase_dev.json → supabase/config/supabase.json b/supabase/config/supabase_dev.json → supabase/config/supabase.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -126,4 +126,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 569636ff5edb32636892b1c748f656de700236ae

		COCOAPODS: 1.15.2
		COCOAPODS: 1.16.2