refactor(frontend): Use origin as api address when running in prod mode

Grohden · Aug 5, 2020 · 7c4839f · 7c4839f
1 parent 2376797
commit 7c4839f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/frontend/lib/main.dart b/frontend/lib/main.dart
@@ -5,14 +5,29 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 import 'api/tagger/repository_tagger_client.dart';
-import 'generated_env.dart';
 import 'router.dart';
 import 'ui/organisms/adaptive_dialog.dart';
 import 'ui/pages/home/home_page.dart' show HomeBinding, HomePage;
-import 'ui/pages/login/login_page.dart' show LoginBinding, LoginPage;
+import 'ui/pages/login/login_page.dart' show LoginPage;
 import 'ui/pages/repository_details/repository_details_page.dart';
 import 'ui/pages/splash/splash_page.dart';
 import 'ui/pages/tag_repositories/tag_repositories_page.dart';
+import 'ui/utils/browser.dart';
+
+bool get _isInDebugMode {
+  var inDebugMode = false;
+  // Dart removes asserts on prod/release mode.
+  assert(inDebugMode = true);
+  return inDebugMode;
+}
+
+String getTaggerUrl() {
+  if (_isInDebugMode) {
+    return 'http://localhost:8080/api';
+  } else {
+    return '${getOriginUrl()}/api';
+  }
+}
 
 void main() {
   runApp(TaggerApp());
@@ -54,7 +69,10 @@ class TaggerApp extends StatelessWidget {
       }))
       ..interceptors.add(LogInterceptor(responseBody: false));
 
-    final tagger = Get.put(RepositoryTaggerClient(dio, baseUrl: taggerUrl));
+    final tagger = Get.put(RepositoryTaggerClient(
+      dio,
+      baseUrl: getTaggerUrl(),
+    ));
 
     return TaggerApp._(
       dio: dio,

diff --git a/frontend/lib/ui/pages/login/login_page.dart b/frontend/lib/ui/pages/login/login_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:repo_tagger/ui/utils/browser.dart';
 
-import '../../../generated_env.dart';
+import '../../../main.dart';
 import '../../templates/page_body.dart';
+import '../../utils/browser.dart';
 
 class LoginPage extends StatelessWidget {
   @override
@@ -29,6 +29,6 @@ class LoginPage extends StatelessWidget {
   }
 
   void _openOAuth() {
-    replaceUrl('$taggerUrl/oauth');
+    replaceUrl('${getTaggerUrl()}/oauth');
   }
 }
diff --git a/frontend/lib/ui/utils/browser.dart b/frontend/lib/ui/utils/browser.dart
@@ -6,4 +6,8 @@ void replaceUrl(String url) {
 
 void openUrlInNewTab(String url) {
   html.window.open(url, '_blank');
-}
+}
+
+String getOriginUrl() {
+  return html.window.location.origin;
+}
diff --git a/frontend/tools/env_generator.dart b/frontend/tools/env_generator.dart