Move JWTDecode into Lib

Expose credentials init
auth0 · Dec 15, 2016 · 78efd47 · 78efd47
1 parent df3823c
commit 78efd47
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/Auth0.xcodeproj/project.pbxproj b/Auth0.xcodeproj/project.pbxproj
@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5BA968F41DEE31A00012E862 /* JWTDecode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BA968F31DEE31A00012E862 /* JWTDecode.framework */; };
+		5B30EC4B1E02D5EC00126F82 /* JWTDecode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BA968F31DEE31A00012E862 /* JWTDecode.framework */; };
+		5B30EC4F1E02D79D00126F82 /* JWTDecode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B30EC4E1E02D79D00126F82 /* JWTDecode.framework */; };
 		5BD4A9CE1DEC6EFA00D6D7AE /* ResponseType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4A9CD1DEC6EFA00D6D7AE /* ResponseType.swift */; };
 		5F06DDA51CC451540011842B /* Auth0.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F06DD781CC448B10011842B /* Auth0.framework */; };
 		5F06DDB41CC451700011842B /* Auth0.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F06DD851CC448C90011842B /* Auth0.framework */; };
@@ -285,6 +286,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		5B30EC4E1E02D79D00126F82 /* JWTDecode.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JWTDecode.framework; path = Carthage/Build/Mac/JWTDecode.framework; sourceTree = "<group>"; };
 		5BA968F31DEE31A00012E862 /* JWTDecode.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JWTDecode.framework; path = Carthage/Build/iOS/JWTDecode.framework; sourceTree = "<group>"; };
 		5BD4A9CD1DEC6EFA00D6D7AE /* ResponseType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ResponseType.swift; path = Auth0/ResponseType.swift; sourceTree = SOURCE_ROOT; };
 		5F049B6C1CB42C29006F6C05 /* Auth0.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Auth0.h; path = Auth0/Auth0.h; sourceTree = "<group>"; };
@@ -393,13 +395,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5B30EC4B1E02D5EC00126F82 /* JWTDecode.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		5F06DD811CC448C90011842B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5B30EC4F1E02D79D00126F82 /* JWTDecode.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -454,7 +458,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5BA968F41DEE31A00012E862 /* JWTDecode.framework in Frameworks */,
 				5F53F5D11CFD19A400476A46 /* Auth0.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -537,6 +540,7 @@
 		5F06DDC21CC5712F0011842B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				5B30EC4E1E02D79D00126F82 /* JWTDecode.framework */,
 				5F331B111D4BB8D700AE4382 /* tvOS */,
 				5F06DDC31CC571480011842B /* iOS */,
 				5F06DDC41CC5714F0011842B /* OSX */,
@@ -850,6 +854,7 @@
 				5F06DD731CC448B10011842B /* Sources */,
 				5F06DD741CC448B10011842B /* Frameworks */,
 				5F06DD751CC448B10011842B /* Headers */,
+				5B30EC4D1E02D68800126F82 /* ShellScript */,
 				5F06DD761CC448B10011842B /* Resources */,
 			);
 			buildRules = (
@@ -868,6 +873,7 @@
 				5F06DD801CC448C90011842B /* Sources */,
 				5F06DD811CC448C90011842B /* Frameworks */,
 				5F06DD821CC448C90011842B /* Headers */,
+				5B30EC501E02D7A300126F82 /* ShellScript */,
 				5F06DD831CC448C90011842B /* Resources */,
 			);
 			buildRules = (
@@ -943,6 +949,7 @@
 				5F23E6F11D4B87F000C3F2D9 /* Sources */,
 				5F23E6F21D4B87F000C3F2D9 /* Frameworks */,
 				5F23E6F31D4B87F000C3F2D9 /* Headers */,
+				5B30EC511E02D81000126F82 /* ShellScript */,
 				5F23E6F41D4B87F000C3F2D9 /* Resources */,
 			);
 			buildRules = (
@@ -980,7 +987,6 @@
 				5F3965C31CF67DD800CDE7C0 /* Sources */,
 				5F3965C41CF67DD800CDE7C0 /* Frameworks */,
 				5F3965C51CF67DD800CDE7C0 /* Resources */,
-				5BA968F61DEE33190012E862 /* Carthage */,
 				5F53F5CB1CFCDC2500476A46 /* Auth0 */,
 			);
 			buildRules = (
@@ -1133,15 +1139,42 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		5BA968F61DEE33190012E862 /* Carthage */ = {
+		5B30EC4D1E02D68800126F82 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(SRCROOT)/Carthage/Build/iOS/JWTDecode.framework",
 			);
-			name = Carthage;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/usr/local/bin/carthage copy-frameworks";
+		};
+		5B30EC501E02D7A300126F82 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/Mac/JWTDecode.framework",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/usr/local/bin/carthage copy-frameworks";
+		};
+		5B30EC511E02D81000126F82 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/tvOS/JWTDecode.framework",
+			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Auth0/Credentials.swift b/Auth0/Credentials.swift
@@ -33,7 +33,7 @@ public class Credentials: NSObject, JSONObjectPayload {
     public let idToken: String?
     public let refreshToken: String?
 
-    init(accessToken: String? = nil, tokenType: String? = nil, idToken: String? = nil, refreshToken: String? = nil) {
+    public init(accessToken: String? = nil, tokenType: String? = nil, idToken: String? = nil, refreshToken: String? = nil) {
         self.accessToken = accessToken
         self.tokenType = tokenType
         self.idToken = idToken