diff --git a/MobileiaAuthenticationCore.podspec b/MobileiaAuthenticationCore.podspec index d8385af..de3b1cb 100644 --- a/MobileiaAuthenticationCore.podspec +++ b/MobileiaAuthenticationCore.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "MobileiaAuthenticationCore" - s.version = "0.0.5" + s.version = "0.0.6" s.swift_version = "4.0" s.summary = "Libreria Authentication Core para MobileIA" @@ -82,7 +82,7 @@ Esta la base para la creacion de servicios de autenticacion y librerias que son # Supports git, hg, bzr, svn and HTTP. # - s.source = { :git => "https://github.com/MobileIA/mia-authentication-ios.git", :tag => "0.0.5" } + s.source = { :git => "https://github.com/MobileIA/mia-authentication-ios.git", :tag => "0.0.6" } # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # diff --git a/MobileiaAuthenticationCore.xcodeproj/xcuserdata/matiascamiletti.xcuserdatad/xcschemes/xcschememanagement.plist b/MobileiaAuthenticationCore.xcodeproj/xcuserdata/matiascamiletti.xcuserdatad/xcschemes/xcschememanagement.plist index 2df9bc5..19b0ade 100644 --- a/MobileiaAuthenticationCore.xcodeproj/xcuserdata/matiascamiletti.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/MobileiaAuthenticationCore.xcodeproj/xcuserdata/matiascamiletti.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 0 + MobileiaAuthenticationCore.xcscheme_^#shared#^_ + + orderHint + 0 + diff --git a/MobileiaAuthenticationCore/Entity/MIAAccessToken.swift b/MobileiaAuthenticationCore/Entity/MIAAccessToken.swift index e8e76d2..377f4c0 100644 --- a/MobileiaAuthenticationCore/Entity/MIAAccessToken.swift +++ b/MobileiaAuthenticationCore/Entity/MIAAccessToken.swift @@ -21,27 +21,32 @@ open class MIAAccessToken : Object, Decodable { return "id" } - /*enum MIAAccessTokenEnum: String, CodingKey { + enum MIAAccessTokenEnum: String, CodingKey { case id case app_id case user_id case access_token } - required convenience init(from decoder: Decoder) throws { + public required convenience init(from decoder: Decoder) throws { self.init(); let container = try decoder.container(keyedBy: MIAAccessTokenEnum.self); - id = try container.decode(Int.self, forKey: .id) - app_id = try container.decode(Int.self, forKey: .app_id) - user_id = try container.decode(Int.self, forKey: .user_id) - access_token = try container.decode(String.self, forKey: .access_token) - - /*do{ - //CP_Link = try container.decode(String.self, forKey: .CP_Link) - }catch{} do{ - //CP_Barra = try container.decode(String.self, forKey: .CP_Barra) - }catch{}*/ - }*/ + id = try container.decode(Int.self, forKey: .id) + }catch{ + id = Int(try container.decode(String.self, forKey: .id))!; + } + do{ + app_id = try container.decode(Int.self, forKey: .app_id) + }catch{ + app_id = Int(try container.decode(String.self, forKey: .app_id))!; + } + do{ + user_id = try container.decode(Int.self, forKey: .user_id) + }catch{ + user_id = Int(try container.decode(String.self, forKey: .user_id))!; + } + access_token = try container.decode(String.self, forKey: .access_token) + } }