Merge pull request #6 from edewit/ios-http-update

updated to version 0.2.0
aerogear-attic · Feb 16, 2015 · 9e7cafd · 9e7cafd
2 parents 0edf595 + 982a060
commit 9e7cafd
Show file tree

Hide file tree

Showing 23 changed files with 611 additions and 316 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -85,26 +85,28 @@
         </dict>
       </array>
     </config-file>
-    <source-file src="src/ios/AeroGearHttp.h" />
-    <source-file src="src/ios/AccountManager.swift" />
-    <source-file src="src/ios/AuthzModule.swift" />
-    <source-file src="src/ios/Config.swift" />
-    <source-file src="src/ios/DateUtils.swift" />
-    <source-file src="src/ios/FacebookOAuth2Module.swift" />
-    <source-file src="src/ios/Http.swift" />
-    <source-file src="src/ios/HttpRequestSerializer.swift" />
-    <source-file src="src/ios/JsonRequestSerializer.swift" />
-    <source-file src="src/ios/JsonResponseSerializer.swift" />
-    <source-file src="src/ios/KeycloakOAuth2Module.swift" />
-    <source-file src="src/ios/MultiPartData.swift" />
-    <source-file src="src/ios/OAuth2Module.swift" />
-    <source-file src="src/ios/OAuth2Session.swift" />
-    <source-file src="src/ios/RequestSerializer.swift" />
-    <source-file src="src/ios/ResponseSerializer.swift" />
-    <source-file src="src/ios/StringResponseSerializer.swift" />
-    <source-file src="src/ios/TrustedPersistantOAuth2Session.swift" />
-    <source-file src="src/ios/UntrustedMemoryOAuth2Session.swift" />
-    <source-file src="src/ios/Utils.swift" />
+
+    <source-file src="src/ios/http-0.2.0/AuthzModule.swift" />
+    <source-file src="src/ios/http-0.2.0/Http.swift" />
+    <source-file src="src/ios/http-0.2.0/HttpRequestSerializer.swift" />
+    <source-file src="src/ios/http-0.2.0/JsonRequestSerializer.swift" />
+    <source-file src="src/ios/http-0.2.0/JsonResponseSerializer.swift" />
+    <source-file src="src/ios/http-0.2.0/MultiPartData.swift" />
+    <source-file src="src/ios/http-0.2.0/RequestSerializer.swift" />
+    <source-file src="src/ios/http-0.2.0/ResponseSerializer.swift" />
+    <source-file src="src/ios/http-0.2.0/StringResponseSerializer.swift" />
+    <source-file src="src/ios/http-0.2.0/Utils.swift" />
+
+    <source-file src="src/ios/oauth-0.2.0/AccountManager.swift" />
+    <source-file src="src/ios/oauth-0.2.0/Config.swift" />
+    <source-file src="src/ios/oauth-0.2.0/DateUtils.swift" />
+    <source-file src="src/ios/oauth-0.2.0/FacebookOAuth2Module.swift" />
+    <source-file src="src/ios/oauth-0.2.0/KeycloakOAuth2Module.swift" />
+    <source-file src="src/ios/oauth-0.2.0/OAuth2Module.swift" />
+    <source-file src="src/ios/oauth-0.2.0/OAuth2Session.swift" />
+    <source-file src="src/ios/oauth-0.2.0/OpenIDClaim.swift" />
+    <source-file src="src/ios/oauth-0.2.0/TrustedPersistantOAuth2Session.swift" />
+    <source-file src="src/ios/oauth-0.2.0/UntrustedMemoryOAuth2Session.swift" />
 
     <source-file src="src/ios/Bridging-Header.h" />
     <source-file src="src/ios/OAuth2Plugin.swift" />

diff --git a/src/ios/AeroGearHttp.h b/src/ios/AeroGearHttp.h
diff --git a/src/ios/AppDelegate+url.m b/src/ios/AppDelegate+url.m
@@ -16,7 +16,6 @@
  */
 
 #import "AppDelegate+url.h"
-#import "AeroGearHttp.h"
 #import <objc/runtime.h>
 
 @implementation AppDelegate (url)

diff --git a/src/ios/AuthzModule.swift → src/ios/http-0.2.0/AuthzModule.swift b/src/ios/AuthzModule.swift → src/ios/http-0.2.0/AuthzModule.swift
@@ -18,56 +18,56 @@
 import Foundation
 
 /**
-The protocol that authorization modules must adhere to
+The protocol that authorization modules must adhere to.
 */
 public protocol AuthzModule {
 
     /**
-    Gateway to request authorization access
+    Gateway to request authorization access.
     
     :param: completionHandler A block object to be executed when the request operation finishes.
     */
     func requestAccess(completionHandler: (AnyObject?, NSError?) -> Void)
 
     /**
-    Request an authorization code
+    Request an authorization code.
     
     :param: completionHandler A block object to be executed when the request operation finishes.
     */
     func requestAuthorizationCode(completionHandler: (AnyObject?, NSError?) -> Void)
 
     /**
-    Exchange an authorization code for an access token
+    Exchange an authorization code for an access token.
     
     :param: completionHandler A block object to be executed when the request operation finishes.
     */
     func exchangeAuthorizationCodeForAccessToken(code: String, completionHandler: (AnyObject?, NSError?) -> Void)
 
     /**
-    Request to refresh an access token
+    Request to refresh an access token.
     
     :param: completionHandler A block object to be executed when the request operation finishes.
     */
     func refreshAccessToken(completionHandler: (AnyObject?, NSError?) -> Void)
 
     /**
-    Request to revoke access
+    Request to revoke access.
     
     :param: completionHandler A block object to be executed when the request operation finishes.
     */
     func revokeAccess(completionHandler: (AnyObject?, NSError?) -> Void)
 
     /**
-    Return any authorization fields
+    Return any authorization fields.
     
-   :returns:  a dictionary filled with the authorization fields
+   :returns:  a dictionary filled with the authorization fields.
     */
     func authorizationFields() -> [String: String]?
 
     /**
-    Returns a boolean indicating whether authorization has been granted
+    Returns a boolean indicating whether authorization has been granted.
     
-    :returns: true if authorized, false otherwise
+    :returns: true if authorized, false otherwise.
     */
     func isAuthorized() -> Bool