Merge branch 'refs/heads/master' into master-Api2.0

# Conflicts:
#	lib/classes/consts.dart

lib/api/api_client.dart

@@ -16,15 +16,11 @@ class APIError {
   int? errorCode;
   int? errorType;
   String? errorMessage;
-  int?    errorStatusCode;
+  int? errorStatusCode;
+
   APIError(this.errorCode, this.errorMessage, this.errorType, this.errorStatusCode);
 
-  Map<String, dynamic> toJson() => {
-        'errorCode': errorCode,
-        'errorMessage': errorMessage,
-        'errorType': errorType,
-        'ErrorStatusCode':  errorStatusCode
-      };
+  Map<String, dynamic> toJson() => {'errorCode': errorCode, 'errorMessage': errorMessage, 'errorType': errorType, 'ErrorStatusCode': errorStatusCode};
 
   @override
   String toString() {
@@ -46,7 +42,7 @@ APIException _throwAPIException(Response response) {
       APIError? apiError;
       if (response.body != null && response.body.isNotEmpty) {
         var jsonError = jsonDecode(response.body);
-        apiError = APIError(jsonError['ErrorCode'], jsonError['ErrorMessage'], jsonError['ErrorType'],jsonError['ErrorStatusCode']);
+        apiError = APIError(jsonError['ErrorCode'], jsonError['ErrorMessage'], jsonError['ErrorType'], jsonError['ErrorStatusCode']);
       }
       return APIException(APIException.BAD_REQUEST, error: apiError);
     case 401:
@@ -73,7 +69,7 @@ class ApiClient {
   factory ApiClient() => _instance;
 
   Future<U> postJsonForObject<T, U>(FactoryConstructor<U> factoryConstructor, String url, T jsonObject,
-      {String? token, Map<String, dynamic>? queryParameters, Map<String, String>? headers, int retryTimes = 0, bool isFormData = false}) async {
+      {String? token, Map<String, dynamic>? queryParameters, Map<String, String>? headers, int retryTimes = 0, bool isFormData = false, bool returnJsonData = true}) async {
     var _headers = {'Accept': 'application/json'};
     if (headers != null && headers.isNotEmpty) {
       _headers.addAll(headers);
@@ -84,29 +80,29 @@ class ApiClient {
       print("body:$bodyJson");
     }
     var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData);
-    try {
-      if (!kReleaseMode) {
-        logger.i("res: " + response.body);
-      }
+    // try {
+    if (!kReleaseMode) {
+      logger.i("res: " + response.body);
+    }
 
-      var jsonData = jsonDecode(response.body);
-      if (jsonData["IsAuthenticated"] != null) {
-        AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
-      }
-      if (jsonData["ErrorMessage"] == null) {
-        return factoryConstructor(jsonData);
-      } else {
-        APIError? apiError;
-        apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage'], jsonData['ErrorType'] ?? 0, jsonData['ErrorStatusCode']);
-        throw APIException(APIException.BAD_REQUEST, error: apiError);
-      }
-    } catch (ex) {
-      if (ex is APIException) {
-        rethrow;
-      } else {
-        throw APIException(APIException.BAD_RESPONSE_FORMAT, arguments: ex);
-      }
+    var jsonData = jsonDecode(response.body);
+    if (jsonData["IsAuthenticated"] != null) {
+      AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
     }
+    if (jsonData["ErrorMessage"] == null) {
+      return factoryConstructor(returnJsonData ? jsonData["Data"] : jsonData);
+    } else {
+      APIError? apiError;
+      apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage'], jsonData['ErrorType'] ?? 0, jsonData['ErrorStatusCode']);
+      throw APIException(APIException.BAD_REQUEST, error: apiError);
+    }
+    // } catch (ex) {
+    //   if (ex is APIException) {
+    //     rethrow;
+    //   } else {
+    //     throw APIException(APIException.BAD_RESPONSE_FORMAT, arguments: ex);
+    //   }
+    // }
   }
 
   Future<Response> postJsonForResponse<T>(String url, T jsonObject,
@@ -147,7 +143,7 @@ class ApiClient {
       }
       var response = await _post(Uri.parse(url), body: requestBody, headers: _headers).timeout(Duration(seconds: 120));
 
-      if (response. statusCode >= 200 && response.statusCode < 300) {
+      if (response.statusCode >= 200 && response.statusCode < 300) {
         return response;
       } else {
         throw _throwAPIException(response);

lib/api/dashboard_api_client.dart

@@ -107,7 +107,7 @@ class DashboardApiClient {
 
   //Mark Attendance
   Future<GenericResponseModel?> markAttendance({String lat = "0", String? long = "0", required int pointType, String nfcValue = "", bool isGpsRequired = false, String QRValue = "", String payrollCode = ""}) async {
-    String url = "${ApiConsts.swpRest}AuthenticateAndSwipeUserSupportNFC";
+    String url = "${ApiConsts.erpRest}AuthenticateAndSwipeUserSupportNFC";
     var uuid = Uuid();
     // Generate a v4 (random) id
 
@@ -132,7 +132,7 @@ class DashboardApiClient {
 
   //Mark Fake Location
   Future<GenericResponseModel?> markFakeLocation({String lat = "0", String? long = "0", required String sourceName}) async {
-    String url = "${ApiConsts.swpRest}CreateIssueInfo";
+    String url = "${ApiConsts.erpRest}CreateIssueInfo";
     var uuid = Uuid();
     // Generate a v4 (random) id
 

lib/api/login_api_client.dart

@@ -17,7 +17,7 @@ class LoginApiClient {
   factory LoginApiClient() => _instance;
 
   Future<GetMobileLoginInfoListModel?> getMobileLoginInfoNEW(String deviceToken, String deviceType) async {
-    String url = "${ApiConsts.erpRest}Mohemm_GetMobileLoginInfo_NEW";
+    String url = "${ApiConsts.authRest}Mohemm_GetMobileLoginInfo_NEW";
     Map<String, dynamic> postParams = {};
     postParams["DeviceToken"] = deviceToken;
     postParams["DeviceType"] = deviceType;
@@ -29,7 +29,7 @@ class LoginApiClient {
 
   Future<GenericResponseModel?> insertMobileLoginInfoNEW(
       String email, int sessionId, String employeeName, int loginType, String mobileNumber, String userName, String deviceToken, String deviceType) async {
-    String url = "${ApiConsts.erpRest}Mohemm_InsertMobileLoginInfo";
+    String url = "${ApiConsts.authRest}Mohemm_InsertMobileLoginInfo";
     Map<String, dynamic> postParams = {
       "MobileNumber": mobileNumber,
       "P_USER_NAME": userName,
@@ -52,33 +52,41 @@ class LoginApiClient {
   }
 
   Future<CheckMobileAppVersionModel> checkMobileAppVersion() async {
-    String url = "${ApiConsts.utilitiesRest}CheckMobileAppVersion";
+    String url = "${ApiConsts.authRest}CheckMobileAppVersion";
     Map<String, dynamic> postParams = {};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) => CheckMobileAppVersionModel.fromJson(json), url, postParams);
+    return await ApiClient().postJsonForObject((json) => CheckMobileAppVersionModel.fromJson(json), url, postParams,returnJsonData: false);
   }
 
   Future<MemberLoginListModel?> memberLogin(String username, String password) async {
-    String url = "${ApiConsts.erpRest}MemberLogin";
+    String url = "${ApiConsts.authRest}MemberLogin";
     Map<String, dynamic> postParams = {"P_APP_VERSION": "CS", "P_LANGUAGE": "US", "P_PASSWORD": password, "P_USER_NAME": username};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
       AppState().postParamsObject?.setLogInTokenID = responseData.logInTokenID;
+      print("setLogInTokenID:${AppState().postParamsObject?.logInTokenID}");
       return responseData.memberLoginList;
     }, url, postParams);
   }
 
   Future<BasicMemberInformationModel?> mohemmSendActivationCodeByOTPNotificationType(int isMobileFingerPrint, String? mobileNumber, int optSendType, String? pUserName) async {
-    String url = "${ApiConsts.erpRest}Mohemm_SendActivationCodebyOTPNotificationType";
+    String url = "${ApiConsts.authRest}Mohemm_SendActivationCodebyOTPNotificationType";
     Map<String, dynamic> postParams = {"IsMobileFingerPrint": isMobileFingerPrint, "MobileNumber": mobileNumber, "OTP_SendType": optSendType, "P_USER_NAME": pUserName};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) => GenericResponseModel.fromJson(json).basicMemberInformation, url, postParams);
+    postParams["LogInTokenID"]=AppState().postParamsObject?.logInTokenID;
+    print(postParams);
+    return await ApiClient().postJsonForObject((json) {
+      AppState().postParamsObject?.setLogInTokenID = json["LogInTokenID"];
+
+      return BasicMemberInformationModel.fromJson(json);
+     // GenericResponseModel.fromJson(json).basicMemberInformation;
+    }, url, postParams);
   }
 
   Future<GenericResponseModel?> checkActivationCode(bool isDeviceNFC, String? mobileNumber, String activationCode, String? pUserName) async {
-    String url = "${ApiConsts.erpRest}CheckActivationCode";
-    Map<String, dynamic> postParams = {"IsDeviceNFC": isDeviceNFC, "MobileNumber": mobileNumber, "activationCode": activationCode, "P_USER_NAME": pUserName};
+    String url = "${ApiConsts.authRest}CheckActivationCode";
+    Map<String, dynamic> postParams = {"IsDeviceNFC": isDeviceNFC, "MobileNumber": mobileNumber, "ActivationCode": activationCode, "P_USER_NAME": pUserName};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
@@ -97,14 +105,14 @@ class LoginApiClient {
   }
 
   Future<BasicMemberInformationModel?> getBasicUserInformation(String pAppVersion, String pUsername) async {
-    String url = "${ApiConsts.erpRest}Get_BasicUserInformation";
+    String url = "${ApiConsts.authRest}Get_BasicUserInformation";
     Map<String, dynamic> postParams = {"P_APP_VERSION": pAppVersion, "P_USER_NAME": pUsername};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) => GenericResponseModel.fromJson(json).basicMemberInformation, url, postParams);
   }
 
   Future<GenericResponseModel?> sendPublicActivationCode(String? mobileNumber, String? pUsername) async {
-    String url = "${ApiConsts.erpRest}SendPublicActivationCode";
+    String url = "${ApiConsts.erpRest}SendPublicActivationCode"; // todo @zahoor,  not found in swagger
     Map<String, dynamic> postParams = {"MobileNumber": mobileNumber, "P_MOBILE_NUMBER": mobileNumber, "P_USER_NAME": pUsername};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
@@ -115,7 +123,7 @@ class LoginApiClient {
   }
 
   Future<GenericResponseModel?> checkPublicActivationCode(String activationCode, String? pUserName) async {
-    String url = "${ApiConsts.erpRest}checkPublicActivationCode";
+    String url = "${ApiConsts.erpRest}checkPublicActivationCode"; // todo @zahoor,  not found in swagger
     Map<String, dynamic> postParams = {"activationCode": activationCode, "P_USER_NAME": pUserName};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
@@ -126,7 +134,7 @@ class LoginApiClient {
   }
 
   Future<GenericResponseModel?> changePasswordForget(String forgetPasswordTokenID, String pNewPassword, String pConfirmNewPassword, String? pUserName) async {
-    String url = "${ApiConsts.erpRest}ChangePassword_Forget";
+    String url = "${ApiConsts.erpRest}ChangePassword_Forget"; // todo @zahoor,  not found in swagger
     Map<String, dynamic> postParams = {"P_USER_NAME": pUserName, "ForgetPasswordTokenID": forgetPasswordTokenID, "P_Confirm_NEW_PASSWORD": pConfirmNewPassword, "P_NEW_PASSWORD": pNewPassword};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
@@ -147,7 +155,7 @@ class LoginApiClient {
   }
 
   Future<GenericResponseModel> changePasswordFromActiveDirectorySession(String password, String email) async {
-    String url = "${ApiConsts.authenticationRest}SetPassword";
+    String url = "${ApiConsts.authenticationRest}SetPassword"; // todo @zahoor,  not found in swagger
     Map<String, dynamic> postParams = {"EmailAddress": email, "Password": password, "generalid": "Cs2020@2016\$2958"};
     postParams.addAll(AppState().postParamsJson);
     postParams["LogInTokenID"] = "@acT!V3D!r3Ct0rY"; // hard code token for active directory

lib/classes/consts.dart

@@ -9,23 +9,36 @@ class ApiConsts {
  //  static String baseUrl = "https://webservices.hmg.com"; // PreProd
  //  static String baseUrl = "https://hmgwebservices.com"; // Live server
 
-  static String baseUrl = "https://mohemm.hmg.com"; // New Live server
-  //
+  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+
   // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+  static String baseUrl = "https://ms.hmg.com"; // Api 2.0
+
+
+  // https://ms.hmg.com/mohem/api/Auth/MemberLogin
  // static String baseUrl = "http://10.20.200.111:1010/";
 
   // static String baseUrl = "https://webservices.hmg.com"; // PreProd
   // static String baseUrl = "https://mohemm.hmg.com";
   // static String baseUrl = "https://hmgwebservices.com"; // Live server
 
-  static String baseUrlServices = baseUrl + "/Services/"; // server
+  // static String baseUrlServices = baseUrl + "/Services/"; // server
+  static String baseUrlServices = baseUrl + "/mohem/api/"; // baseUrlServices Api 2.0
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
   static String authenticationRest = baseUrlServices + "Authentication.svc/REST/";
-  static String erpRest = baseUrlServices + "ERP.svc/REST/";
-  static String swpRest = baseUrlServices + "SWP.svc/REST/";
-  static String user = baseUrlServices + "api/User/";
-  static String cocRest = baseUrlServices + "COCWS.svc/REST/";
+  // static String erpRest = baseUrlServices + "ERP.svc/REST/";
+
+  // static String swpRest = baseUrlServices + "SWP.svc/REST/";
+  // static String user = baseUrlServices + "api/User/";
+  // static String cocRest = baseUrlServices + "COCWS.svc/REST/";
+
+  // Api 2.0 --------------------------------------------
+  static String authRest = baseUrlServices + "Auth/";
+  static String cocRest = baseUrlServices + "COCWS/";
+  static String erpRest = baseUrlServices + "ERP/";
+  static String perfRest = baseUrlServices + "Perf/";
+
 
   //Chat
   static String chatServerBaseUrl = "https://apiderichat.hmg.com/";

lib/models/generic_response_model.dart

@@ -659,6 +659,7 @@ class GenericResponseModel {
       this.isSMSSent});
 
   GenericResponseModel.fromJson(Map<String, dynamic> json) {
+    print("json:$json");
     date = json['Date'];
     languageID = json['LanguageID'];
     serviceName = json['ServiceName'];

lib/ui/login/verify_login_screen.dart

@@ -619,7 +619,7 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
         int.tryParse(AppState().memberLoginList?.pMOBILENUMBER ?? ""),
         (value, TextEditingController _pinPutController) async {
           Utils.showLoading(context);
-          try {
+          //try {
             GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(true, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().getUserName);
             GenericResponseModel? genericResponseModel1 = await LoginApiClient().insertMobileLoginInfoNEW(
                 AppState().memberLoginList?.pEMAILADDRESS ?? "",
@@ -648,22 +648,22 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
             Utils.hideLoading(context);
             Navigator.pop(context);
             Navigator.pushNamedAndRemoveUntil(context, AppRoutes.dashboard, (Route<dynamic> route) => false);
-          } catch (ex) {
-            print(ex);
-            _pinPutController.clear();
-            otpFieldClear.value = "";
-            Utils.hideLoading(context);
-            Utils.handleException(ex, context, null);
-            dynamic errorCode = ex;
-            if(errorCode.error.errorStatusCode ==699){
-              Future.delayed(const Duration(seconds: 2), ()
-              {
-                Navigator.pop(context);
-                Navigator.pushNamedAndRemoveUntil(
-                    context, AppRoutes.login, (Route<dynamic> route) => false);
-              });
-            }
-          }
+          // } catch (ex) {
+          //   print(ex);
+          //   _pinPutController.clear();
+          //   otpFieldClear.value = "";
+          //   Utils.hideLoading(context);
+          //   Utils.handleException(ex, context, null);
+          //   dynamic errorCode = ex;
+          //   if(errorCode.error.errorStatusCode ==699){
+          //     Future.delayed(const Duration(seconds: 2), ()
+          //     {
+          //       Navigator.pop(context);
+          //       Navigator.pushNamedAndRemoveUntil(
+          //           context, AppRoutes.login, (Route<dynamic> route) => false);
+          //     });
+          //   }
+          // }
         },
         () => {
           Navigator.pop(context),