alqindiirsyam 2 anni fa
parent
commit
6424635874

+ 6 - 6
appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -864,7 +864,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = p_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -899,7 +899,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = p_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiInternal(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -935,8 +935,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = p_password
-            let md5HexNew = n_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordAdmin(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {
@@ -972,8 +972,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = p_password
-            let md5HexNew = n_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordInternal(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangeDeviceViewController.swift

@@ -221,7 +221,7 @@ public class ChangeDeviceViewController: UIViewController {
         }
         Nexilis.showLoader()
         DispatchQueue.global().async {
-            let md5Hex = password
+            let md5Hex = Utils.getMD5(string: password).map { String(format: "%02hhx", $0) }.joined()
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignIn(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "11" {
                     DispatchQueue.main.async {

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangeNamePassswordViewController.swift

@@ -147,7 +147,7 @@ public class ChangeNamePassswordViewController: UIViewController {
                         })
                     }
                 } else if resp.isOk() {
-                    let md5Hex = password
+                    let md5Hex = Utils.getMD5(string: password).map { String(format: "%02hhx", $0) }.joined()
                     let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: idMe)
                     tMessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = first
                     tMessage.mBodies[CoreMessage_TMessageKey.LAST_NAME] = last

+ 4 - 4
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangePasswordViewController.swift

@@ -46,14 +46,14 @@ class ChangePasswordViewController: UIViewController {
     }
     
     @objc func didTapNext(sender: Any) {
-        guard let odlPassword = oldPassField.text, !odlPassword.isEmpty else {
+        guard let oldPassword = oldPassField.text, !oldPassword.isEmpty else {
             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
             imageView.tintColor = .white
             let banner = FloatingNotificationBanner(title: "Old password can't be empty".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
             banner.show()
             return
         }
-        if odlPassword.count < 6 {
+        if oldPassword.count < 6 {
             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
             imageView.tintColor = .white
             let banner = FloatingNotificationBanner(title: "Old password min 6 character".localized(), subtitle: nil, titleFont: UIFont.systemFont(ofSize: 16), titleColor: nil, titleTextAlign: .left, subtitleFont: nil, subtitleColor: nil, subtitleTextAlign: nil, leftView: imageView, rightView: nil, style: .danger, colors: nil, iconPosition: .center)
@@ -84,8 +84,8 @@ class ChangePasswordViewController: UIViewController {
         let idMe = UserDefaults.standard.string(forKey: "me")!
         DispatchQueue.global().async {
             let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: idMe)
-            let md5HexOld = odlPassword
-            let md5HexNew = newPassword
+            let md5HexOld = Utils.getMD5(string: oldPassword).map { String(format: "%02hhx", $0) }.joined()
+            let md5HexNew = Utils.getMD5(string: newPassword).map { String(format: "%02hhx", $0) }.joined()
             tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = md5HexNew
             tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = md5HexOld
             if let resp = Nexilis.writeAndWait(message: tMessage){

+ 6 - 6
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/SettingTableViewController.swift

@@ -770,7 +770,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = p_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -805,7 +805,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = p_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiInternal(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -841,8 +841,8 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = p_password
-            let md5HexNew = n_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordAdmin(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {
@@ -878,8 +878,8 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = p_password
-            let md5HexNew = n_password
+            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordInternal(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/SignUpSignIn.swift

@@ -251,7 +251,7 @@ public class SignUpSignIn: UIViewController {
         }
         Nexilis.showLoader()
         DispatchQueue.global().async {
-            let md5Hex = password
+            let md5Hex = Utils.getMD5(string: password).map { String(format: "%02hhx", $0) }.joined()
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignUpSignInAPI(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "20" {
                     DispatchQueue.main.async {