Merge pull request 'Optional' (#5) from feature/LCECryptoKit into main

Reviewed-on: #5

Package.resolved

@@ -0,0 +1,15 @@
+{
+  "originHash" : "33e7d52ad13cf774717778548edb365d33ff62d766d0049165bc8970f19a23ef",
+  "pins" : [
+    {
+      "identity" : "lcecryptokitbinary",
+      "kind" : "localSourceControl",
+      "location" : "/Users/loverde_co/Documents/Loverde_JOBs/Producao/Loverde Co/GIT/XCODE/Repositorios/LCECryptoKit/PrivateLib/LCECryptoKitBinary",
+      "state" : {
+        "revision" : "2c5c47cebef40a8adc5557d071a35be405c05e30",
+        "version" : "1.0.2"
+      }
+    }
+  ],
+  "version" : 3
+}

Package.swift

@@ -1,16 +1,43 @@
 // swift-tools-version: 6.0
 import PackageDescription
+import Foundation
+
+let isLocalDevelopment = FileManager.default.fileExists(atPath: "../LCECryptoKit/PrivateLib/LCECryptoKitBinary")
+let enableCryptoBinary = ProcessInfo.processInfo.environment["LCE_ENABLE_CRYPTO_BINARY"] != "0"
+
+let cryptoPackageURL = isLocalDevelopment
+    ? "../LCECryptoKit/PrivateLib/LCECryptoKitBinary"
+    : "https://60c260c85d3a2fe840411b0ff98f521b5eca3c56@git.loverde.com.br/Loverde-Company-LTDA/LCECryptoKitBinary.git"
+
+let packageDependencies: [Package.Dependency] = enableCryptoBinary
+    ? [
+        .package(url: cryptoPackageURL, exact: "1.0.2")
+      ]
+    : []
+
+let targetDependencies: [Target.Dependency] = enableCryptoBinary
+    ? [
+        .product(name: "LCECryptoKit", package: "lcecryptokitbinary")
+      ]
+    : []
 
 let package = Package(
     name: "LCEssentials",
+    platforms: [
+        .iOS(.v13),
+        .macOS(.v10_15),
+        .tvOS(.v13),
+        .watchOS(.v6)
+    ],
     products: [
         .library(
             name: "LCEssentials",
             targets: ["LCEssentials"]),
     ],
+    dependencies: packageDependencies,
     targets: [
         .target(
-            name: "LCEssentials"),
+            name: "LCEssentials",
-
+            dependencies: targetDependencies),
     ]
 )

README.md

@@ -17,14 +17,14 @@ Installation
 #### Swift Package  Manager (SPM)
 ``` swift
 dependencies: [
-    .package(url: "http://git.loverde.com.br:3000/git/LCEssentials.git", .upToNextMajor(from: "1.0.0"))
+    .package(url: "https://git.loverde.com.br/Loverde-Company-LTDA/LCEssentials", .upToNextMajor(from: "1.0.0"))
 ]
 ```
 
 You can also add it via XCode SPM editor with URL: 
 
 ``` swift
-http://git.loverde.com.br:3000/git/LCEssentials.git
+https://git.loverde.com.br/Loverde-Company-LTDA/LCEssentials
 ```
 
 ## Usage example

Sources/LCEssentials/Classes/GifHelper.swift

@@ -5,8 +5,10 @@
 //  Created by iOSDevCenters on 11/12/15.
 //  Copyright © 2016 iOSDevCenters. All rights reserved.
 //
+#if canImport(UIKit)
 import UIKit
-#if os(iOS) || os(macOS)
+#endif
+#if canImport(UIKit)
 import ImageIO
 
 //let jeremyGif = UIImage.gifWithName("jeremy")

Sources/LCEssentials/Classes/LCECrypto.swift

@@ -0,0 +1,96 @@
+//  
+// Copyright (c) 2025 Loverde Co.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+ 
+
+import Foundation
+
+#if canImport(LCECryptoKit)
+import LCECryptoKit
+
+public final class LCECryptoKitManager {
+    
+    private let hashKey: String
+    
+    public init() {
+        self.hashKey = ""
+    }
+    
+    public init(privateKey: String){
+        self.hashKey = privateKey
+    }
+    
+    public static func generateKey() -> String {
+        LCECryptoKit.generateRandomAESKeyString()
+    }
+    
+    public func encodeTP(email: String, password: String) -> String? {
+        return LCECryptoKit.encodeSeed(email: email, password: password)
+    }
+    
+    public func decodeOTP(_ otpHash: String) -> String? {
+        return LCECryptoKit.decodeSeed(otpKey: otpHash)
+    }
+    
+    // MARK: Need hashKey to decode
+    
+    public func encodeOTPWithKey(email: String, password: String) -> String? {
+        return LCECryptoKit.encodeSeed(email: email, password: password, hashKey: self.hashKey)
+    }
+    
+    public func decodeOTPWithKey(_ otpHash: String) -> Bool {
+        LCECryptoKit.decodeSeed(otpKey: otpHash, hashKey: self.hashKey)
+    }
+}
+#else
+
+public final class LCECryptoKitManager {
+
+    private let hashKey: String
+
+    public init() {
+        self.hashKey = ""
+    }
+
+    public init(privateKey: String){
+        self.hashKey = privateKey
+    }
+
+    public static func generateKey() -> String {
+        ""
+    }
+
+    public func encodeTP(email: String, password: String) -> String? {
+        nil
+    }
+
+    public func decodeOTP(_ otpHash: String) -> String? {
+        nil
+    }
+
+    public func encodeOTPWithKey(email: String, password: String) -> String? {
+        nil
+    }
+
+    public func decodeOTPWithKey(_ otpHash: String) -> Bool {
+        false
+    }
+}
+#endif

Sources/LCEssentials/Classes/LCEssentials+API.swift

@@ -26,8 +26,10 @@ import Foundation
 import Security
 #endif
 #if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
 #endif
+#endif
 
 /// A generic `Result` enumeration to represent either a success `Value` or a failure `Error`.
 public enum Result<Value, Error: Swift.Error> {
@@ -129,15 +131,26 @@ public struct API {
                     // Add the file
                     let fileName = fileURL.lastPathComponent
                     let mimeType = mimeTypeForPath(path: fileName)
+                    printInfo(title: "Body size before", msg: "\(body.count) bytes")
+                    
+                    let fileData: Data
+                    do {
+                        fileData = try Data(contentsOf: fileURL)
+                        printInfo(title: "Body size after", msg: "\(body.count) bytes")
+                    } catch {
+                        printError(title: "Upload File", msg: error.localizedDescription)
+                        throw error
+                    }
+                    
                     do {
-                        let fileData = try Data(contentsOf: fileURL)
                         body.append("--\(boundary)\r\n".data(using: .utf8)!)
                         body.append("Content-Disposition: form-data; name=\"file\"; filename=\"\(fileName)\"\r\n".data(using: .utf8)!)
                         body.append("Content-Type: \(mimeType)\r\n\r\n".data(using: .utf8)!)
-                        body.append(fileData)
+                        let fileDataCopy = Data(fileData)
-                        body.append("\r\n".data(using: .utf8)!)
+                        body.append(fileDataCopy)
-                    } catch {
+                        let dataUTF8 = "\r\n".data(using: .utf8)!
-                        printError(title: "Upload File", msg: error.localizedDescription)
+                        body.append(dataUTF8)
+                        printInfo(title: "Body size after", msg: "\(body.count) bytes")
                     }
                     
                     // Finalize the request body

Sources/LCEssentials/Classes/LCEssentials.swift

@@ -21,8 +21,12 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
+#if canImport(AVFoundation)
 import AVFoundation
+#endif
 #if os(watchOS)
 import WatchKit
 #endif
@@ -155,7 +159,7 @@ public struct LCEssentials {
             diskPath: "file_cache"
         )
     
-    #if os(iOS) || os(macOS)
+    #if canImport(UIKit)
     /// Extract the file name from the file path
     ///
     /// - Parameter filePath: Full file path in bundle
@@ -266,7 +270,11 @@ public struct LCEssentials {
     /// - LoverdeCo: Check if app is running in debug mode.
     @MainActor
     public static var isInDebuggingMode: Bool {
+        #if canImport(UIKit)
         return UIApplication.inferredEnvironment == .debug
+        #else
+        return false
+        #endif
     }
     
     #if !os(macOS)
@@ -416,7 +424,7 @@ public struct LCEssentials {
 // MARK: - Methods
 public extension LCEssentials {
     
-    #if os(iOS) || os(macOS)
+    #if canImport(UIKit)
     /// - LoverdeCo: Share link with message
     ///
     /// - Parameters:

Sources/LCEssentials/Classes/LCSingleton.swift

@@ -20,7 +20,9 @@
 // THE SOFTWARE.
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
 @objc public protocol LCESingletonDelegate: AnyObject {
     @objc optional func singleton(object: Any?, withData: Any)

Sources/LCEssentials/Extensions/LCEssentials+Array.swift

@@ -21,7 +21,9 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
 // MARK: - Methods (Equatable)
 public extension Array where Element: Equatable {
@@ -148,6 +150,7 @@ public extension Array where Element: Equatable {
     }
 }
 
+#if canImport(UIKit)
 extension Array where Element == NSLayoutConstraint {
 
     @MainActor
@@ -169,3 +172,5 @@ extension Array where Element == NSLayoutConstraint {
         }
     }
 }
+
+#endif

Sources/LCEssentials/Extensions/LCEssentials+Data.swift

@@ -21,8 +21,12 @@
  
 
 import Foundation
+#if canImport(CryptoKit)
 import CryptoKit
+#endif
+#if canImport(CommonCrypto)
 import CommonCrypto
+#endif
 
 
 public extension Data {
@@ -68,20 +72,28 @@ public extension Data {
         
         self = data
     }
-    
+
     @available(iOS 13.0, *)
     func HMACSHA512(key: Data) -> Data {
+#if canImport(CryptoKit)
         var hmac = HMAC<SHA512>.init(key: SymmetricKey(data: key))
         hmac.update(data: self)
         return Data(hmac.finalize())
+#else
+        return Data()
+#endif
     }
     
     func SHA512() -> Data {
+#if canImport(CommonCrypto)
         var digest = [UInt8](repeating: 0, count: Int(CC_SHA512_DIGEST_LENGTH))
         self.withUnsafeBytes {
             _ = CC_SHA512($0.baseAddress, CC_LONG(self.count), &digest)
         }
         return Data(digest)
+#else
+        return Data()
+#endif
     }
     
     func XOR(with other: Data) -> Data {
@@ -89,11 +101,15 @@ public extension Data {
     }
     
     func SHA256() -> Data {
+#if canImport(CommonCrypto)
         var digest = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
         self.withUnsafeBytes {
             _ = CC_SHA256($0.baseAddress, CC_LONG(self.count), &digest)
         }
         return Data(digest)
+#else
+        return Data()
+#endif
     }
     
     func object<T: Codable>() -> T? {
@@ -124,9 +140,13 @@ public extension Data {
     ///print("md5Hex: \(md5Hex)")
     @available(iOS 13.0, *)
     static func MD5(string: String) -> Data {
+#if canImport(CryptoKit)
         let messageData = string.data(using: .utf8)!
         let digestData = Insecure.MD5.hash (data: messageData)
         let digestHex = String(digestData.map { String(format: "%02hhx", $0) }.joined().prefix(32))
         return Data(digestHex.utf8)
+#else
+        return Data()
+#endif
     }
 }

Sources/LCEssentials/Extensions/LCEssentials+Dictionary.swift

@@ -21,7 +21,9 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension Dictionary {
     

Sources/LCEssentials/Extensions/LCEssentials+FileManager.swift

@@ -21,7 +21,9 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension FileManager {
     
@@ -54,7 +56,7 @@ public extension FileManager {
         }
     }
     
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
     func saveImageToDirectory( _ imageWithPath : String, imagem : UIImage ) -> Bool {
         
         let data = imagem.pngData()

Sources/LCEssentials/Extensions/LCEssentials+NSLayoutConstraints.swift

@@ -21,8 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
+#if canImport(UIKit)
 extension NSLayoutConstraint {
     
     func constraintWithMultiplier(_ multiplier: CGFloat) -> NSLayoutConstraint {
@@ -72,3 +75,4 @@ extension NSLayoutConstraint {
         return false
     }
 }
+#endif

Sources/LCEssentials/Extensions/LCEssentials+NSMutableAttributedString.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension NSMutableAttributedString {
     @discardableResult func customize(_ text: String,

Sources/LCEssentials/Extensions/LCEssentials+Optional.swift

@@ -20,7 +20,9 @@
 // THE SOFTWARE.
  
 
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension Optional {
     /// Get self of default value (if self is nil).

Sources/LCEssentials/Extensions/LCEssentials+String.swift

@@ -21,7 +21,9 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 #if canImport(CommonCrypto)
 import CommonCrypto
 #endif
@@ -48,10 +50,14 @@ public extension String {
     }
     
     var convertToHTML: NSAttributedString? {
+        #if canImport(UIKit)
         return convertHtmlToAttributedStringWithCSS(font: nil,
                                                     csscolor: "",
                                                     lineheight: 0,
                                                     csstextalign: "")
+        #else
+        return convertHtmlToNSAttributedString
+        #endif
     }
     
     /// Check if string is a valid URL.
@@ -646,7 +652,7 @@ public extension String {
         return strDate?.date(withCurrFormatt: newFormatt, localeIdentifier: localeIdentifier, timeZone: timeZone)
     }
 
-    #if os(iOS) || os(macOS)
+    #if canImport(UIKit)
     func height(withConstrainedWidth width: CGFloat, font: UIFont) -> CGFloat {
         let constraintRect = CGSize(width: width, height: .greatestFiniteMagnitude)
         let boundingBox = self.boundingRect(with: constraintRect, options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font: font], context: nil)
@@ -757,7 +763,7 @@ public extension String {
         }
         return self
     }
-    
+#if canImport(UIKit)
     /// Converte String para HTML com CSS.
     ///
     /// - Parameters:
@@ -801,7 +807,8 @@ public extension String {
             return nil
         }
     }
-    
+#endif
+
     /// Float value from string (if applicable).
     ///
     /// - Parameter locale: Locale (default is Locale.current)

Sources/LCEssentials/Extensions/LCEssentials+UIApplication.swift

@@ -19,8 +19,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
  
-#if canImport(UIKit) && os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension UIApplication {
     /// Application running environment.

Sources/LCEssentials/Extensions/LCEssentials+UIButton.swift

@@ -21,9 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 // MARK: - Properties
 public extension UIButton {
     

Sources/LCEssentials/Extensions/LCEssentials+UICollectionView.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension UICollectionView {
     

Sources/LCEssentials/Extensions/LCEssentials+UIColor.swift

@@ -21,9 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 public extension UIColor {
     
     var redValue: CGFloat{ return CIColor(color: self).red }

Sources/LCEssentials/Extensions/LCEssentials+UIDevice.swift

@@ -21,9 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 public extension UIDevice {
     
     static var topNotch: CGFloat {

Sources/LCEssentials/Extensions/LCEssentials+UIImage.swift

@@ -21,9 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 public extension UIImage {
     //Extension Required by RoundedButton to create UIImage from UIColor
     func imageWithColor(color: UIColor) -> UIImage {

Sources/LCEssentials/Extensions/LCEssentials+UIImageView.swift

@@ -21,9 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 @MainActor
 public extension UIImageView {
     

Sources/LCEssentials/Extensions/LCEssentials+UILabel.swift

@@ -21,9 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 public extension UILabel {
 
     func lineNumbers() -> Int{

Sources/LCEssentials/Extensions/LCEssentials+UINavigationController.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 import QuartzCore
 
 public extension UINavigationController {

Sources/LCEssentials/Extensions/LCEssentials+UIResponder.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension UIResponder {
     

Sources/LCEssentials/Extensions/LCEssentials+UIScrollView.swift

@@ -21,7 +21,9 @@
  
 
 #if canImport(UIKit) && !os(watchOS)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 // MARK: - Methods
 public extension UIScrollView {

Sources/LCEssentials/Extensions/LCEssentials+UIStackView.swift

@@ -21,7 +21,9 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 #if os(iOS)
 
 // MARK: - Initializers

Sources/LCEssentials/Extensions/LCEssentials+UITabBarController.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public class CustomTabBadge: UILabel {
     

Sources/LCEssentials/Extensions/LCEssentials+UITableView.swift

@@ -21,9 +21,11 @@
  
 
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 //MARK: - UITableView Animation Cell
 public typealias UITableViewCellAnimation = (UITableViewCell, IndexPath, UITableView) -> Void
 

Sources/LCEssentials/Extensions/LCEssentials+UITapGestureRecognizer.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if canImport(UIKit) && os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension UITapGestureRecognizer {
     

Sources/LCEssentials/Extensions/LCEssentials+UITextField.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 public extension UITextField {
 

Sources/LCEssentials/Extensions/LCEssentials+UIView.swift

@@ -21,8 +21,10 @@
  
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 
 typealias GradientPoints = (startPoint: CGPoint, endPoint: CGPoint)
 

Sources/LCEssentials/Extensions/LCEssentials+UIViewController.swift

@@ -22,8 +22,10 @@
 
 import Foundation
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 import QuartzCore
 
 public enum ToastPosition {

Sources/LCEssentials/ImagePicker/ImagePickerController.swift

@@ -20,8 +20,10 @@
 // THE SOFTWARE.
  
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
+#if canImport(UIKit)
 import UIKit
+#endif
 import AVFoundation
 import Photos
 

Sources/LCEssentials/ImageZoom/ImageZoom.swift

@@ -19,9 +19,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
  
+#if canImport(UIKit)
 import UIKit
+#endif
 
-#if os(iOS) || os(macOS)
+#if canImport(UIKit)
 /// A protocol for delegates of `ImageZoomController` to provide callbacks for zoom and close events.
 @objc public protocol ImageZoomControllerDelegate {
     /// Called when the image in the controller is zoomed.

Sources/LCEssentials/Message/LCSnackBarView.swift

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 
 // MARK: - Framework headers
+#if canImport(UIKit)
+import Foundation
 import UIKit
 
 // MARK: - Protocols
@@ -512,3 +514,5 @@ public extension LCSnackBarView {
         }
     }
 }
+
+#endif

Sources/LCEssentials/SwiftUI/LCENavigationView.swift

@@ -18,7 +18,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if canImport(SwiftUI)
+#if canImport(SwiftUI) && os(iOS)
 import SwiftUI
 
 /// `LCENavigationState` is an `ObservableObject` that manages the state for `LCENavigationView`.