Merge remote-tracking branch 'origin/feature/openfoodfacts#798' into …

…feature/openfoodfacts#798
monsieurtanuki · Jan 3, 2022 · 0dac0b9 · 0dac0b9
2 parents bdf5557 + 5761357
commit 0dac0b9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 122 deletions.
diff --git a/packages/smooth_app/lib/cards/data_cards/image_upload_card.dart b/packages/smooth_app/lib/cards/data_cards/image_upload_card.dart
@@ -63,14 +63,11 @@ class _ImageUploadCardState extends State<ImageUploadCard> {
           imageUri: croppedImageFile.uri,
         );
 
-        // a registered user login for https://world.openfoodfacts.org/ is required
-        //ToDo: Add user
-        const User myUser =
-            User(userId: 'smoothie-app', password: 'strawberrybanana');
-
         // query the OpenFoodFacts API
-        final Status result =
-            await OpenFoodAPIClient.addProductImage(myUser, image);
+        final Status result = await OpenFoodAPIClient.addProductImage(
+          ProductQuery.getUser(),
+          image,
+        );
 
         if (result.status != 'status ok') {
           throw Exception(

diff --git a/packages/smooth_app/lib/database/keywords_product_query.dart b/packages/smooth_app/lib/database/keywords_product_query.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:openfoodfacts/model/parameter/SearchTerms.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
 import 'package:smooth_app/data_models/product_list.dart';
@@ -16,7 +17,7 @@ class KeywordsProductQuery implements ProductQuery {
   @override
   Future<SearchResult> getSearchResult() async =>
       OpenFoodAPIClient.searchProducts(
-        ProductQuery.SMOOTH_USER,
+        ProductQuery.getUser(),
         ProductSearchQueryConfiguration(
           fields: ProductQuery.fields,
           parametersList: <Parameter>[

diff --git a/packages/smooth_app/lib/database/product_query.dart b/packages/smooth_app/lib/database/product_query.dart
@@ -31,11 +31,13 @@ abstract class ProductQuery {
   static void setCountry(final String? isoCode) =>
       OpenFoodAPIConfiguration.globalCountry = CountryHelper.fromJson(isoCode);
 
-  static const User SMOOTH_USER = User(
-    userId: 'project-smoothie',
-    password: 'smoothie',
-    comment: 'Test user for project smoothie',
-  );
+  static User getUser() =>
+      OpenFoodAPIConfiguration.globalUser ??
+      const User(
+        userId: 'smoothie-app',
+        password: 'strawberrybanana',
+        comment: 'Test user for project smoothie',
+      );
 
   static List<ProductField> get fields => <ProductField>[
         ProductField.NAME,

diff --git a/packages/smooth_app/lib/pages/smooth_it_page.dart b/packages/smooth_app/lib/pages/smooth_it_page.dart
diff --git a/packages/smooth_app/lib/pages/tracking_page.dart b/packages/smooth_app/lib/pages/tracking_page.dart