From 55bfa315fd7f107e48301139d19c3ae1aa81c363 Mon Sep 17 00:00:00 2001 From: Johannes Vedder Date: Wed, 5 Jul 2023 14:31:45 +0200 Subject: [PATCH] chore(#475): force supabase env values --- flutter_common/lib/src/utils/env_loader.dart | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/flutter_common/lib/src/utils/env_loader.dart b/flutter_common/lib/src/utils/env_loader.dart index da65843f3..f3cea2328 100644 --- a/flutter_common/lib/src/utils/env_loader.dart +++ b/flutter_common/lib/src/utils/env_loader.dart @@ -11,18 +11,20 @@ String envFilePath() { return env.isNotEmpty ? '$envsAssetPath/$env' : '$envsAssetPath/.env'; } +String? getEnv(String name) { + return dotenv.env[name] ?? (bool.hasEnvironment(name) ? String.fromEnvironment(name) : null); +} + Future loadEnv() async { await dotenv.load(fileName: envFilePath()); - final supabaseUrl = dotenv.env['STUDYU_SUPABASE_URL'] ?? const String.fromEnvironment('STUDYU_SUPABASE_URL'); - final supabaseAnonKey = - dotenv.env['STUDYU_SUPABASE_PUBLIC_ANON_KEY'] ?? const String.fromEnvironment('STUDYU_SUPABASE_PUBLIC_ANON_KEY'); - final envAppUrl = dotenv.env['STUDYU_APP_URL'] ?? const String.fromEnvironment('STUDYU_APP_URL'); - final envDesignerUrl = dotenv.env['STUDYU_DESIGNER_URL'] ?? const String.fromEnvironment('STUDYU_DESIGNER_URL'); - final envProjectGeneratorUrl = - dotenv.env['STUDYU_PROJECT_GENERATOR_URL'] ?? const String.fromEnvironment('STUDYU_PROJECT_GENERATOR_URL'); + final supabaseUrl = getEnv('STUDYU_SUPABASE_URL'); + final supabaseAnonKey = getEnv('STUDYU_SUPABASE_PUBLIC_ANON_KEY'); + final envAppUrl = getEnv('STUDYU_APP_URL'); + final envDesignerUrl = getEnv('STUDYU_DESIGNER_URL'); + final envProjectGeneratorUrl = getEnv('STUDYU_PROJECT_GENERATOR_URL'); await Supabase.initialize( - url: supabaseUrl, - anonKey: supabaseAnonKey, + url: supabaseUrl!, + anonKey: supabaseAnonKey!, authCallbackUrlHostname: kIsWeb ? null : 'designer.studyu.health', // optional debug: true, // optional