Fix login request to using FormData() instead of raw JSON #115

VocaDB · Mar 4, 2021 · d8542f5 · d8542f5
1 parent 805fff8
commit d8542f5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/src/services/auth_service.dart b/lib/src/services/auth_service.dart
@@ -29,9 +29,11 @@ class AuthService extends GetxService {
   }
 
   Future<UserModel> getCurrent() async {
+    Map<String, String> data = {'fields': 'MainPicture'};
     try {
-      UserModel us = await httpService.get('/api/users/current',
-          {'fields': 'MainPicture'}).then((item) => UserModel.fromJson(item));
+      UserModel us = await httpService
+          .get('/api/users/current', data)
+          .then((item) => UserModel.fromJson(item));
       print('current user : $us');
       return us;
     } catch (e) {

diff --git a/lib/src/services/http_service.dart b/lib/src/services/http_service.dart
@@ -2,7 +2,7 @@ import 'package:cookie_jar/cookie_jar.dart';
 import 'package:dio/dio.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:dio_http_cache/dio_http_cache.dart';
-import 'package:get/get.dart';
+import 'package:get/get.dart' hide FormData;
 import 'package:vocadb_app/constants.dart';
 import 'package:vocadb_app/exceptions.dart';
 import 'package:vocadb_app/models.dart';
@@ -26,8 +26,7 @@ class HttpService extends GetxService {
   }
 
   Future<dynamic> get(String endpoint, Map<String, String> params) async {
-    params?.removeWhere((key, value) => value == null || value.isEmpty);
-
+    params?.removeWhere((key, value) => value == null || value == '');
     String url = Uri.https(authority, endpoint, params).toString();
     print('GET $url | $params');
     final response =
@@ -62,13 +61,16 @@ class HttpService extends GetxService {
 
   Future<UserCookie> login(String username, String password) async {
     String url = Uri.https(authority, '/User/Login').toString();
+    Map<String, dynamic> data = {
+      'UserName': username,
+      'Password': password,
+    };
     try {
-      await _dio.post(url, data: {'UserName': username, 'Password': password});
+      await _dio.post(url, data: FormData.fromMap(data));
       throw LoginFailedException();
     } catch (e) {
       if (e is DioError && e.response.statusCode == 302) {
         List<String> cookies = e.response.headers.map['set-cookie'];
-
         if (cookies != null) {
           return UserCookie(cookies: cookies);
         }