Start feature/errorManagment

Author: Dahkenangnon

CHANGELOG.md

@@ -1,3 +1,4 @@
+## 2.0.3-dev
 ## 2.0.2-dev
 ## 2.0.1-dev
 ## 2.0.0-dev

lib/flutter_feathersjs.dart

@@ -1,9 +1,23 @@
 /// Communicate with your feathers js (https://feathersjs.com/) server from flutter app.
+///
+/// Documentation at: https://dahkenangnon.github.io/flutter_feathersjs.dart/
+///
+/// Repository at: https://github.com/Dahkenangnon/flutter_feathersjs.dart
+///
+/// Pub.dev: https://pub.dev/packages/flutter_feathersjs/
+///
+/// Demo api at: https://flutter-feathersjs.herokuapp.com/
+///
+/// Demo app's repo at: https://github.com/Dahkenangnon/flutter_feathersjs_demo
+///
+///
+///
+/// Happy hacking
 library flutter_feathersjs;
 
-import 'package:flutter_feathersjs/src/constants.dart';
 import 'package:flutter_feathersjs/src/rest_client.dart';
 import 'package:flutter_feathersjs/src/scketio_client.dart';
+import 'package:flutter_feathersjs/src/utils.dart';
 import 'package:meta/meta.dart';
 //import 'package:flutter/foundation.dart' as Foundation;
 
@@ -22,7 +36,7 @@ import 'package:meta/meta.dart';
 ///
 /// Authentification is processed by:
 ///
-///     // Global auth (Rest and Socketio)
+///      //Global auth (Rest and Socketio)
 ///     var rep = await flutterFeathersjs
 ///     .authenticate(userName: user["email"], password: user["password"]);
 ///
@@ -36,9 +50,6 @@ class FlutterFeathersjs {
   //SocketioClient
   SocketioClient scketio;
 
-  // For debug purpose
-  bool dev = false;
-
   ///Using singleton
   static final FlutterFeathersjs _flutterFeathersjs =
       FlutterFeathersjs._internal();
@@ -67,65 +78,65 @@ class FlutterFeathersjs {
       @required String userName,
       @required String password,
       String userNameFieldName = "email"}) async {
-    //Hold global auth infos
-    Map<String, dynamic> authResponse = {
-      "error": true,
-      "error_zone": "UNKNOWN",
-      "message": "An error occured either on rest or socketio auth",
-      "restResponse": {},
-      "scketResponse": {}
-    };
+    try {
+      //Auth with rest to refresh or create accessToken
+      var restAuthResponse = await rest.authenticate(
+          strategy: strategy,
+          userName: userName,
+          userNameFieldName: userNameFieldName,
+          password: password);
 
-    //Auth with rest to refresh or create accessToken
-    Map<String, dynamic> restAuthResponse = await rest.authenticate(
-        strategy: strategy,
-        userName: userName,
-        userNameFieldName: userNameFieldName,
-        password: password);
-    //Then auth with jwt socketio
-    Map<String, dynamic> socketioAuthResponse = await scketio.authWithJWT();
+      try {
+        //Then auth with jwt socketio
+        bool isAuthenticated = await scketio.authWithJWT();
 
-    //Finally send response
-    if (!restAuthResponse["error"] && !socketioAuthResponse["error"]) {
-      authResponse = restAuthResponse;
-    } else {
-      authResponse["restResponse"] = restAuthResponse;
-      authResponse["scketResponse"] = socketioAuthResponse;
+        // Check wether both client are authenticated or not
+        if (restAuthResponse != null && isAuthenticated == true) {
+          return restAuthResponse;
+        } else {
+          // Both failed
+          throw new FeatherJsError(
+              type: FeatherJsErrorType.IS_AUTH_FAILED_ERROR,
+              error: "Auth failed with unknown reason");
+        }
+      } on FeatherJsError catch (e) {
+        // Socketio failed
+        throw new FeatherJsError(type: e.type, error: e);
+      }
+    } on FeatherJsError catch (e) {
+      // Rest failed
+      throw new FeatherJsError(type: e.type, error: e);
     }
-    return authResponse;
   }
 
-  /// Authenticate rest and scketio clients so you can use both of them
+  /// ReAuthenticate rest and scketio clients
   ///
   ///___________________________________________________________________
-  Future<Map<String, dynamic>> reAuthenticate() async {
-    //Hold global auth infos
-    Map<String, dynamic> authResponse = {
-      "error": true,
-      "error_zone": Constants.UNKNOWN_ERROR,
-      "message": "An error occured either on rest or socketio auth",
-      "restResponse": {},
-      "scketResponse": {}
-    };
+  Future<dynamic> reAuthenticate() async {
+    try {
+      //Auth with rest to refresh or create accessToken
+      bool isRestAuthenticated = await rest.reAuthenticate();
 
-    //Auth with rest to refresh or create accessToken
-    Map<String, dynamic> restAuthResponse = await rest.reAuthenticate();
-    //Then auth with jwt socketio
-    Map<String, dynamic> socketioAuthResponse = await scketio.authWithJWT();
+      try {
+        //Then auth with jwt socketio
+        bool isSocketioAuthenticated = await scketio.authWithJWT();
 
-    //Finally send response
-    if (!restAuthResponse["error"] && !socketioAuthResponse["error"]) {
-      authResponse["error"] = false;
-      authResponse["error_zone"] = Constants.BOTH_CLIENT_AUTHED;
-      authResponse["message"] = socketioAuthResponse["message"];
-    } else {
-      authResponse["error"] = true;
-      authResponse["error_zone"] = Constants.ONE_OR_BOTH_CLIENT_NOT_AUTHED;
-      authResponse["message"] =
-          "One or both client is(are) not authed. Please checkout restResponse field or scketResponse field for more infos.";
-      authResponse["restResponse"] = restAuthResponse;
-      authResponse["scketResponse"] = socketioAuthResponse;
+        // Check wether both client are authenticated or not
+        if (isRestAuthenticated == true && isSocketioAuthenticated == true) {
+          return true;
+        } else {
+          // Both failed
+          throw new FeatherJsError(
+              type: FeatherJsErrorType.IS_AUTH_FAILED_ERROR,
+              error: "Auth failed with unknown reason");
+        }
+      } on FeatherJsError catch (e) {
+        // Socketio failed
+        throw new FeatherJsError(type: e.type, error: e);
+      }
+    } on FeatherJsError catch (e) {
+      // Rest failed
+      throw new FeatherJsError(type: e.type, error: e);
     }
-    return authResponse;
   }
 }

lib/src/constants.dart

@@ -1,23 +1,6 @@
 import 'package:meta/meta.dart';
 
-class Constants {
-  static const String INVALID_CREDENTIALS = "INVALID_CREDENTIALS";
-  static const String JWT_EXPIRED_ERROR = "JWT_EXPIRED_ERROR";
-  static const String NO_ERROR = "NO_ERROR";
-  static const String UNKNOWN_ERROR = "UNKNOWN_ERROR";
-  static const String JWT_ERROR = "JWT_ERROR";
-  static const String JWT_NOT_FOUND = "JWT_NOT_FOUND";
-  static const String INVALID_STRATEGY = "INVALID_STRATEGY";
-  static const String DIO_ERROR = "DIO_ERROR";
-
-  static const String AUTH_WITH_JWT_SUCCEED = "AUTH_WITH_JWT_SUCCEED";
-  static const String AUTH_WITH_JWT_FAILED = "AUTH_WITH_JWT_FAILED";
-
-  static const String BOTH_CLIENT_AUTHED = "BOTH_CLIENT_AUTHED";
-  static const String ONE_OR_BOTH_CLIENT_NOT_AUTHED =
-      "ONE_OR_BOTH_CLIENT_NOT_AUTHED";
-  static const String FEATHERSJS_ACCESS_TOKEN = "FEATHERSJS_ACCESS_TOKEN";
-}
+const String FEATHERSJS_ACCESS_TOKEN = "FEATHERSJS_ACCESS_TOKEN";
 
 class Connected {}