Provide default value for 'identity_data' (#58)

* Provide default value for 'identity_data'

* Fix tests

* Remove macCatalyst test

* Run CI on latest version

Author: Guilherme Souza

.github/workflows/ci.yml

@@ -14,34 +14,17 @@ concurrency:
 
 jobs:
   library:
-    runs-on: macos-12
-    strategy:
-      matrix:
-        xcode: ["14.1"]
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Run tests
         run: make test-library
 
   example:
-    runs-on: macos-12
-    strategy:
-      matrix:
-        xcode: ["14.1"]
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Copy Secrets file
         run: cp Examples/Shared/Sources/_Secrets.swift Examples/Shared/Sources/Secrets.swift
       - name: Build example
         run: make build-example
-
-  # examples:
-  #   runs-on: macos-12
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Run tests
-  #       run: make test-examples

Makefile

@@ -5,7 +5,7 @@ PLATFORM_TVOS = tvOS Simulator,name=Apple TV
 PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 7 (45mm)
 
 test-library:
-	for platform in "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_MAC_CATALYST)" "$(PLATFORM_TVOS)" "$(PLATFORM_WATCHOS)"; do \
+	for platform in "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_TVOS)" "$(PLATFORM_WATCHOS)"; do \
 		xcodebuild test \
 			-workspace GoTrue.xcworkspace \
 			-scheme GoTrue \

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/GoTrue/Types.swift

@@ -278,6 +278,17 @@ public struct UserIdentity: Codable, Hashable, Identifiable {
     case lastSignInAt = "last_sign_in_at"
     case updatedAt = "updated_at"
   }
+
+  public init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    self.id = try container.decode(String.self, forKey: .id)
+    self.userID = try container.decode(UUID.self, forKey: .userID)
+    self.identityData = try container.decodeIfPresent([String : AnyJSON].self, forKey: .identityData) ?? [:]
+    self.provider = try container.decode(String.self, forKey: .provider)
+    self.createdAt = try container.decode(Date.self, forKey: .createdAt)
+    self.lastSignInAt = try container.decode(Date.self, forKey: .lastSignInAt)
+    self.updatedAt = try container.decode(Date.self, forKey: .updatedAt)
+  }
 }
 
 public enum Provider: String, Codable, CaseIterable {

Tests/GoTrueTests/GoTrueTests.swift

@@ -90,7 +90,7 @@ final class GoTrueTests: XCTestCase {
     )!
 
     var mock = Mock.get(path: "user", json: "user")
-    mock.onRequestHandler = OnRequestHandler { request in
+    mock.onRequestHandler = OnRequestHandler(httpBodyType: Session?.self) { request, _ in
       let authorizationHeader = request.allHTTPHeaderFields?["Authorization"]
       XCTAssertEqual(authorizationHeader, "bearer accesstoken")
     }