OAuth2 support

.gitignore

@@ -1,6 +1,7 @@
 # Xcode
 .DS_Store
 */build/*
+_build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -16,6 +17,8 @@ DerivedData
 .idea/
 *.hmap
 *.xccheckout
+*.pyc
+xcshareddata/
 
 #CocoaPods
 Pods

OCCommunicationLib/OCCommunicationLib/OCCapabilities.h

@@ -27,7 +27,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface OCCapabilities : NSObject
+@interface OCCapabilities : NSObject <NSCopying>
 
 /*VERSION*/
 @property (nonatomic) NSInteger versionMajor;
@@ -76,6 +76,7 @@
 @property (nonatomic) BOOL isFileUndeleteEnabled;
 @property (nonatomic) BOOL isFileVersioningEnabled;
 
-
+- (void)encodeWithCoder:(NSCoder *)aCoder;
+- (id)initWithCoder:(NSCoder *)aDecoder;
 
 @end

OCCommunicationLib/OCCommunicationLib/OCCapabilities.m

@@ -44,6 +44,125 @@ - (id)init {
     return self;
 }
 
+#pragma mark - NSCopying
 
+-(id) copyWithZone:(NSZone *)zone {
+    OCCapabilities *capCopy = [[OCCapabilities alloc]init];
+    capCopy.versionMajor = self.versionMajor;
+    capCopy.versionMinor = self.versionMinor;
+    capCopy.versionMicro = self.versionMicro;
+    capCopy.versionString = self.versionString;
+    capCopy.versionEdition = self.versionEdition;
+
+    capCopy.corePollInterval = self.corePollInterval;
+
+    capCopy.isFilesSharingAPIEnabled = self.isFilesSharingAPIEnabled;
+
+    capCopy.isFilesSharingShareLinkEnabled = self.isFilesSharingShareLinkEnabled;
+
+    capCopy.isFilesSharingPasswordEnforcedEnabled = self.isFilesSharingPasswordEnforcedEnabled;
+
+    capCopy.isFilesSharingExpireDateByDefaultEnabled = self.isFilesSharingExpireDateByDefaultEnabled;
+    capCopy.isFilesSharingExpireDateEnforceEnabled = self.isFilesSharingExpireDateEnforceEnabled;
+    capCopy.filesSharingExpireDateDaysNumber = self.filesSharingExpireDateDaysNumber;
+
+    capCopy.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled = self.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled;
+    capCopy.isFilesSharingAllowPublicUploadsEnabled = self.isFilesSharingAllowPublicUploadsEnabled;
+    capCopy.isFilesSharingSupportsUploadOnlyEnabled = self.isFilesSharingSupportsUploadOnlyEnabled;
+    capCopy.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled = self.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled;
+
+    capCopy.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled = self.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled;
+    capCopy.isFilesSharingReSharingEnabled = self.isFilesSharingReSharingEnabled;
+
+    capCopy.isFilesSharingAllowUserSendSharesToOtherServersEnabled = self.isFilesSharingAllowUserSendSharesToOtherServersEnabled;
+    capCopy.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled = self.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled;
+
+    capCopy.isFileBigFileChunkingEnabled = self.isFileBigFileChunkingEnabled;
+    capCopy.isFileUndeleteEnabled = self.isFileUndeleteEnabled;
+    capCopy.isFileVersioningEnabled = self.isFileVersioningEnabled;
+
+    return capCopy;
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+    [aCoder encodeInteger:self.versionMajor forKey:@"versionMajor"];
+    [aCoder encodeInteger:self.versionMinor forKey:@"versionMinor"];
+    [aCoder encodeInteger:self.versionMicro forKey:@"versionMicro"];
+    [aCoder encodeObject:self.versionString forKey:@"versionString"];
+    [aCoder encodeObject:self.versionEdition forKey:@"versionEdition"];
+
+    [aCoder encodeInteger:self.corePollInterval forKey:@"corePollInterval"];
+
+    [aCoder encodeBool:self.isFilesSharingAPIEnabled forKey:@"isFilesSharingAPIEnabled"];
+
+    [aCoder encodeBool:self.isFilesSharingShareLinkEnabled forKey:@"isFilesSharingShareLinkEnabled"];
+
+    [aCoder encodeBool:self.isFilesSharingPasswordEnforcedEnabled forKey:@"isFilesSharingPasswordEnforcedEnabled"];
+
+    [aCoder encodeBool:self.isFilesSharingExpireDateByDefaultEnabled forKey:@"isFilesSharingExpireDateByDefaultEnabled"];
+    [aCoder encodeBool:self.isFilesSharingExpireDateEnforceEnabled forKey:@"isFilesSharingExpireDateEnforceEnabled"];
+    [aCoder encodeInteger:self.filesSharingExpireDateDaysNumber forKey:@"filesSharingExpireDateDaysNumber"];
+
+    [aCoder encodeBool:self.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled forKey:@"isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled"];
+    [aCoder encodeBool:self.isFilesSharingAllowPublicUploadsEnabled forKey:@"isFilesSharingAllowPublicUploadsEnabled"];
+    [aCoder encodeBool:self.isFilesSharingSupportsUploadOnlyEnabled forKey:@"isFilesSharingSupportsUploadOnlyEnabled"];
+    [aCoder encodeBool:self.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled forKey:@"isFilesSharingAllowUserCreateMultiplePublicLinksEnabled"];
+
+    [aCoder encodeBool:self.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled forKey:@"isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled"];
+    [aCoder encodeBool:self.isFilesSharingReSharingEnabled forKey:@"isFilesSharingReSharingEnabled"];
+
+    [aCoder encodeBool:self.isFilesSharingAllowUserSendSharesToOtherServersEnabled forKey:@"isFilesSharingAllowUserSendSharesToOtherServersEnabled"];
+    [aCoder encodeBool:self.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled forKey:@"isFilesSharingAllowUserReceiveSharesToOtherServersEnabled"];
+
+    [aCoder encodeBool:self.isFileBigFileChunkingEnabled forKey:@"isFileBigFileChunkingEnabled"];
+    [aCoder encodeBool:self.isFileUndeleteEnabled forKey:@"isFileUndeleteEnabled"];
+    [aCoder encodeBool:self.isFileVersioningEnabled forKey:@"isFileVersioningEnabled"];
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    if (self = [self init]) {
+        self.versionMajor = [aDecoder decodeIntegerForKey:@"versionMajor"];
+        self.versionMinor = [aDecoder decodeIntegerForKey:@"versionMinor"];
+        self.versionMicro = [aDecoder decodeIntegerForKey:@"versionMicro"];
+        self.versionString = [aDecoder decodeObjectForKey:@"versionString"];
+        self.versionEdition = [aDecoder decodeObjectForKey:@"versionEdition"];
+
+        self.corePollInterval = [aDecoder decodeIntegerForKey:@"corePollInterval"];
+
+        self.isFilesSharingAPIEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingAPIEnabled"];
+
+        self.isFilesSharingShareLinkEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingShareLinkEnabled"];
+
+        self.isFilesSharingPasswordEnforcedEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingPasswordEnforcedEnabled"];
+
+        self.isFilesSharingExpireDateByDefaultEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingExpireDateByDefaultEnabled"];
+        self.isFilesSharingExpireDateEnforceEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingExpireDateEnforceEnabled"];
+        self.filesSharingExpireDateDaysNumber = [aDecoder decodeIntegerForKey:@"filesSharingExpireDateDaysNumber"];
+
+        self.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled"];
+        self.isFilesSharingAllowPublicUploadsEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingAllowPublicUploadsEnabled"];
+        self.isFilesSharingSupportsUploadOnlyEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingSupportsUploadOnlyEnabled"];
+        self.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingAllowUserCreateMultiplePublicLinksEnabled"];
+
+        self.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled"];
+        self.isFilesSharingReSharingEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingReSharingEnabled"];
+
+        self.isFilesSharingAllowUserSendSharesToOtherServersEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingAllowUserSendSharesToOtherServersEnabled"];
+        self.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingAllowUserReceiveSharesToOtherServersEnabled"];
+
+        self.isFileBigFileChunkingEnabled = [aDecoder decodeBoolForKey:@"isFilesSharingReSharingEnabled"];
+        self.isFileUndeleteEnabled = [aDecoder decodeBoolForKey:@"isFileUndeleteEnabled"];
+        self.isFileVersioningEnabled = [aDecoder decodeBoolForKey:@"isFileVersioningEnabled"];
+    }
+    return self;
+}
 
 @end

OCCommunicationLib/OCCommunicationLib/OCCommunication.h

@@ -25,24 +25,19 @@
 
 #import <Foundation/Foundation.h>
 #import "OCServerFeatures.h"
+#import "OCCredentialsDto.h"
+#import "OCOAuth2Configuration.h"
+#import "OCCredentialsStorage.h"
+#import "OCTrustedCertificatesStore.h"
 
-@class OCHTTPRequestOperation;
 @class AFURLSessionManager;
 @class AFSecurityPolicy;
 @class OCCapabilities;
 
+@protocol OCCredentialsStorageDelegate;
 
 @interface OCCommunication : NSObject
 
-//Type of credential
-typedef enum {
-    credentialNotSet = -1,
-    credentialNormal = 0, //user, password
-    credentialCookie = 1,
-    credentialOauth = 2
-} kindOfCredentialEnum;
-
-
 typedef enum {
     OCErrorUnknown = 90, //On all errors
     OCErrorForbiddenCharacters = 100, //On create folder and rename
@@ -51,15 +46,27 @@ typedef enum {
     OCErrorMovingFolderInsideItself = 112, //On move file or folder
     OCErrorFileToUploadDoesNotExist = 120, //The file that we want upload does not exist
     OCErrorForbiddenUnknown = 130, //For example, no write permissions to the target folder of an upload
-    OCErrorForbiddenWithSpecificMessage = 131 // For example, forbidden due to a firewall rule
+    OCErrorForbiddenWithSpecificMessage = 131, // For example, forbidden due to a firewall rule
+    OCErrorServerMaintenanceMode = 140,
+
+    OCErrorOAuth2Error = 1000,
+    OCErrorOAuth2ErrorAccessDenied = 1010,
+
+    OCErrorSslRecoverablePeerUnverified = 1100
+
 } OCErrorEnum;
 
+
 //Private properties
-@property NSInteger kindOfCredential;
-@property (nonatomic, strong) NSString *user;
-@property (nonatomic, strong) NSString *password;
+@property (nonatomic, strong) OCCredentialsDto *credDto;
+
 @property (nonatomic, strong) NSString *userAgent;
 
+@property (nonatomic, strong) OCOAuth2Configuration *oauth2Configuration;
+@property (nonatomic, strong) id<OCCredentialsStorageDelegate> credentialsStorage;
+@property (nonatomic, strong) id<OCTrustedCertificatesStore> trustedCertificatesStore;
+
+
 //Public properties
 @property (nonatomic, strong) NSMutableArray *downloadTaskNetworkQueueArray;
 
@@ -107,52 +114,39 @@ typedef enum {
 
 #pragma mark - Credentials
 
+
 ///-----------------------------------
-/// @name Set Credential With User
+/// @name Set Credentials
 ///-----------------------------------
 
 /**
  * Method to set credentials with user and password
  *
- * @param user -> NSString username
- * @param password -> NSString password
+ * @param credentials -> OCCredentialsDto credentials
  */
-- (void) setCredentialsWithUser:(NSString*) user andPassword:(NSString*) password;
 
-
-///-----------------------------------
-/// @name Set Credential with cookie
-///-----------------------------------
-
-/**
- * Method that set credentials with cookie.
- * Used for SAML servers.
- *
- * @param cookie -> NSString cookie string
- */
-- (void) setCredentialsWithCookie:(NSString*) cookie;
+- (void) setCredentials:(OCCredentialsDto *) credentials;
 
 
 ///-----------------------------------
-/// @name Set Credential with OAuth
+/// @name Set User Agent
 ///-----------------------------------
 
-/**
- * Method to set credentials for OAuth with token
- *
- * @param token -> NSString token
- */
-- (void) setCredentialsOauthWithToken:(NSString*) token;
-
 /**
  * @optional
  *
  * Method to set the user agent, in order to identify the client app to the server.
  *
  * @param userAgent -> String with the user agent. Ex. "iOS-ownCloud"
  */
-- (void) setUserAgent:(NSString *)userAgent;
+- (void) setValueOfUserAgent:(NSString *) userAgent;
+
+
+- (void) setValueOauth2Configuration:(OCOAuth2Configuration *)oauth2Configuration;
+
+- (void) setValueCredentialsStorage:(id<OCCredentialsStorageDelegate>)credentialsStorage;
 
+- (void) setValueTrustedCertificatesStore:(id<OCTrustedCertificatesStore>)trustedCertificatesStore;
 
 /*
  * Method to update the a request with the current credentials
@@ -490,11 +484,44 @@ typedef enum {
                    successRequest:(void(^)(NSHTTPURLResponse *response, NSString *serverVersion, NSString *redirectedServer)) success
                    failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failure;
 
+///-----------------------------------
+/// @name getUserDataOfServer
+///-----------------------------------
+
+/**
+ * Method to get the User data.
+ *
+ * @param path -> NSString server path
+ *
+ * @param sharedOCCommunication -> OCCommunication Singleton of communication to add the operation on the queue.
+ */
+- (void) getUserDataOfServer:(NSString *)path onCommunication:(OCCommunication *)sharedOCCommunication
+                     success:(void(^)(NSHTTPURLResponse *response, NSData *responseData, NSString *redirectedServer))success
+                     failure:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer))failureRequest;
+
+///-----------------------------------
+/// @name getUserDisplayNameOfServer
+///-----------------------------------
+
+/**
+ * Method to get the User display name.
+ *
+ * @param path -> NSString server path
+ *
+ * @param sharedOCCommunication -> OCCommunication Singleton of communication to add the operation on the queue.
+ */
+- (void) getUserDisplayNameOfServer:(NSString *)path onCommunication:(OCCommunication *)sharedOCCommunication
+                            success:(void(^)(NSHTTPURLResponse *response, NSString *displayName, NSString *redirectedServer))success
+                            failure:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer))failureRequest;
+
+
 ///-----------------------------------
 /// @name requestForUserNameByCookie
 ///-----------------------------------
 
 /**
+ *  DEPRECATED use - getUserDataOfServer:onCommunication: or getUserDisplayNameOfServer:onCommunication: instead
+ *
  * Method to get the User name by the cookie of the session. Used with SAML servers.
  *
  * @param cookieString -> NSString The cookie of the session
@@ -507,14 +534,15 @@ typedef enum {
 
 - (void) getUserNameByCookie:(NSString *) cookieString ofServerPath:(NSString *)path onCommunication:
 (OCCommunication *)sharedOCCommunication success:(void(^)(NSHTTPURLResponse *response, NSData *responseData, NSString *redirectedServer))success
-                     failure:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer))failure;
+                     failure:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer))failure
+__deprecated_msg("Use - getUserDataOfServer:onCommunication: or getUserDisplayNameOfServer:onCommunication: instead");
 
 ///-----------------------------------
 /// @name Get Features Supported By Server
 ///-----------------------------------
 
 /**
- * DEPRECATED use + getFeaturesSupportedByServerForVersion: instead
+ * DEPRECATED use - getFeaturesSupportedByServerForVersion: instead
  *
  * Method get the features supported by the path server using the version string.
  *
@@ -536,7 +564,8 @@ typedef enum {
 
 - (void) getFeaturesSupportedByServer:(NSString*) path onCommunication:(OCCommunication *)sharedOCCommunication
                        successRequest:(void(^)(NSHTTPURLResponse *response, BOOL hasShareSupport, BOOL hasShareeSupport, BOOL hasCookiesSupport, BOOL hasForbiddenCharactersSupport, BOOL hasCapabilitiesSupport, BOOL hasFedSharesOptionShareSupport, NSString *redirectedServer)) success
-                       failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failure __deprecated_msg("Use + getFeaturesSupportedByServerForVersion: instead");
+                       failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failure
+__deprecated_msg("Use - getFeaturesSupportedByServerForVersion: instead");
 
 
 ///-----------------------------------