- OCConnection+Spaces: add support for creating spaces from templates

- OCDrive: add new type OCDriveTemplate and a default template value

Author: felix-schwarz

ownCloudSDK/Connection/OCConnection+Spaces.m

@@ -24,11 +24,12 @@
 #import "OCConnection+GraphAPI.h"
 #import "OCMacros.h"
 #import "NSError+OCError.h"
+#import "NSURL+OCURLQueryParameterExtensions.h"
 
 @implementation OCConnection (Drives)
 
 #pragma mark - Creation
-- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes completionHandler:(OCConnectionDriveCompletionHandler)completionHandler
+- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes template:(nullable OCDriveTemplate)templateName completionHandler:(OCConnectionDriveCompletionHandler)completionHandler
 {
 	GADrive *drive = [GADrive new];
 	drive.name = name;
@@ -41,8 +42,16 @@ - (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nulla
 		drive.quota = quota;
 	}
 
-	return ([self createODataObject:drive atURL:[self URLForEndpoint:OCConnectionEndpointIDGraphDrives options:nil] requireSignals:[NSSet setWithObject:OCConnectionSignalIDAuthenticationAvailable] parameters:nil responseEntityClass:Nil completionHandler:^(NSError * _Nullable error, id  _Nullable response) {
-		NSLog(@"New space: %@", response);
+	NSURL *creationURL = [self URLForEndpoint:OCConnectionEndpointIDGraphDrives options:nil];
+	if (templateName != nil)
+	{
+		creationURL = [creationURL urlByAppendingQueryParameters:@{
+			@"template" : templateName
+		} replaceExisting:NO];
+	}
+
+	return ([self createODataObject:drive atURL:creationURL requireSignals:[NSSet setWithObject:OCConnectionSignalIDAuthenticationAvailable] parameters:nil responseEntityClass:Nil completionHandler:^(NSError * _Nullable error, id  _Nullable response) {
+		OCLogDebug(@"New space: %@", response);
 		completionHandler(error, (response != nil) ? [OCDrive driveFromGADrive:(GADrive *)response] : nil);
 	}]);
 }
@@ -119,7 +128,7 @@ - (nullable NSProgress *)updateDrive:(OCDrive *)drive properties:(NSDictionary<O
 	}
 
 	return ([self updateODataObject:gaDriveUpdate atURL:[[self URLForEndpoint:OCConnectionEndpointIDGraphDrives options:nil] URLByAppendingPathComponent:drive.identifier] requireSignals:[NSSet setWithObject:OCConnectionSignalIDAuthenticationAvailable] parameters:nil responseEntityClass:GADrive.class completionHandler:^(NSError * _Nullable error, id  _Nullable response) {
-		NSLog(@"Updated space: %@", response);
+		OCLogDebug(@"Updated space: %@", response);
 		completionHandler(error, (response != nil) ? [OCDrive driveFromGADrive:(GADrive *)response] : nil);
 	}]);
 }

ownCloudSDK/Connection/OCConnection.h

@@ -359,7 +359,7 @@ typedef void(^OCConnectionDriveManagementCompletionHandler)(NSError * _Nullable
 @interface OCConnection (Drives)
 
 #pragma mark - Creation
-- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes completionHandler:(OCConnectionDriveCompletionHandler)completionHandler;
+- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes template:(nullable OCDriveTemplate)templateName completionHandler:(OCConnectionDriveCompletionHandler)completionHandler;
 
 #pragma mark - Disable/Restore/Delete
 - (nullable NSProgress *)disableDrive:(OCDrive *)drive completionHandler:(OCConnectionDriveManagementCompletionHandler)completionHandler;

ownCloudSDK/Core/DriveManagement/OCCore+DriveManagement.m

@@ -27,9 +27,9 @@
 @implementation OCCore (DriveManagement)
 
 // Creation
-- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes completionHandler:(OCCoreDriveCompletionHandler)completionHandler
+- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes template:(nullable OCDriveTemplate)template completionHandler:(OCCoreDriveCompletionHandler)completionHandler
 {
-	return ([self.connection createDriveWithName:name description:description quota:quotaBytes completionHandler:^(NSError * _Nullable error, OCDrive * _Nullable newDrive) {
+	return ([self.connection createDriveWithName:name description:description quota:quotaBytes template:template completionHandler:^(NSError * _Nullable error, OCDrive * _Nullable newDrive) {
 		if (error == nil) {
 			[self fetchUpdatesWithCompletionHandler:nil];
 		}

ownCloudSDK/Core/OCCore.h

@@ -516,7 +516,7 @@ typedef void(^OCCoreShareRoleRetrievalHandler)(NSError * _Nullable error, NSArra
 @interface OCCore (DriveManagement)
 
 // Creation
-- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes completionHandler:(OCCoreDriveCompletionHandler)completionHandler;
+- (nullable NSProgress *)createDriveWithName:(NSString *)name description:(nullable NSString *)description quota:(nullable NSNumber *)quotaBytes template:(nullable OCDriveTemplate)templateName completionHandler:(OCCoreDriveCompletionHandler)completionHandler;
 
 // Disable/Restore/Delete
 - (nullable NSProgress *)disableDrive:(OCDrive *)drive completionHandler:(OCCoreCompletionHandler)completionHandler;

ownCloudSDK/Drive/OCDrive.h

@@ -35,6 +35,8 @@ typedef NSString* OCDriveSpecialType NS_TYPED_ENUM;
 
 typedef NSString* OCDriveProperty NS_TYPED_ENUM;
 
+typedef NSString* OCDriveTemplate NS_TYPED_ENUM;
+
 typedef NSString* OCDriveResource NS_TYPED_ENUM;
 
 typedef NS_ENUM(NSInteger, OCDriveDetachedState)
@@ -102,6 +104,8 @@ extern OCDriveProperty OCDrivePropertyQuotaTotal; //!< The quota total of / spac
 
 extern OCDriveID OCDriveIDSharesJail; //!< The static UUID of the Shares Jail
 
+extern OCDriveTemplate OCDriveTemplateDefault; //!< The default template
+
 extern OCDriveResource OCDriveResourceCoverImage; //!< The cover image of a drive/space
 extern OCDriveResource OCDriveResourceCoverDescription; //!< The MD description of a drive/space
 extern OCDriveResource OCDriveResourceSpaceFolder; //!< The folder typically used to store a drive's/space's cover image and/or MD description.

ownCloudSDK/Drive/OCDrive.m

@@ -309,6 +309,8 @@ - (NSString *)description
 OCDriveProperty OCDrivePropertyDescription = @"desc"; // Must correspond to GADriveUpdate key path
 OCDriveProperty OCDrivePropertyQuotaTotal = @"quota.total"; // Must correspond to GADriveUpdate key path
 
+OCDriveTemplate OCDriveTemplateDefault = @"default";
+
 OCDriveResource OCDriveResourceCoverImage = @"image";
 OCDriveResource OCDriveResourceCoverDescription = @"description";
 OCDriveResource OCDriveResourceSpaceFolder = @"space-folder";