Merge pull request #919 from owncloud/oauth_support

OAuth2 support

OC Share Sheet/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.2</string>
+	<string>3.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.0.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>

OC Share Sheet/ShareViewController.swift

@@ -39,7 +39,7 @@ fileprivate func > <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
 
 
 
-@objc class ShareViewController: UIViewController, UITableViewDelegate, UITableViewDataSource, KKPasscodeViewControllerDelegate, CheckAccessToServerDelegate {
+@objc class ShareViewController: UIViewController, UITableViewDelegate, UITableViewDataSource, KKPasscodeViewControllerDelegate {
 
     @IBOutlet weak var navigationBar: UINavigationBar?
     @IBOutlet weak var shareTable: UITableView?
@@ -255,7 +255,7 @@ fileprivate func > <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
                     upload.uploadFileName = fileName
                     upload.kindOfError = enumKindOfError.notAnError.rawValue
                     upload.estimateLength = fileLength
-                    upload.userId = (user?.idUser)!
+                    upload.userId = (user?.userId)!
                     upload.status = enumUpload.generatedByDocumentProvider.rawValue
                     upload.chunksLength = Int(k_lenght_chunk)
                     upload.isNotNecessaryCheckIfExist = false
@@ -344,7 +344,7 @@ fileprivate func > <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
                                 if error == nil {
                                     if let url = item as? URL{
 
-                                        print("item as url: \(item)")
+                                        print("item as url: \(url)")
 
                                         self.filesSelected.append(url)
 

Owncloud iOs Client/AppDelegate.h

@@ -12,10 +12,6 @@
  along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.en.html>.
  */
 
-
-
-
-
 #import <UIKit/UIKit.h>
 #import "UserDto.h"
 #import "MediaAVPlayerViewController.h"
@@ -27,11 +23,12 @@
 #import "DetailViewController.h"
 #import "ManageDownloads.h"
 #import "CheckAccessToServer.h"
+#import "UtilsLogin.h"
+#import "OCOAuth2Configuration.h"
 
 @class FilesViewController;
 @class RecentViewController;
 @class SettingsViewController;
-@class LoginViewController;
 @class HelpGuideViewController;
 @class Download;
 @class OCCommunication;
@@ -42,6 +39,10 @@
 @class CheckHasShareSupport;
 @class CheckCapabilities;
 
+@class UniversalLoginViewController;
+@class ManageAccounts;
+
+
 extern NSString * CloseAlertViewWhenApplicationDidEnterBackground;
 extern NSString * RefreshSharesItemsAfterCheckServerVersion;
 extern NSString * NotReachableNetworkForUploadsNotification;
@@ -59,8 +60,7 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
 
     RecentViewController *_recentViewController;
     FilesViewController *_filesViewController;
-    //Pointer to a actual files view controller where the user is.
-    FilesViewController *_presentFilesViewController;
+
     //FavouritesViewController *_favouritesViewController;
     SettingsViewController *_settingsViewController;
     //OCTabBarController *_tabBarController;
@@ -108,17 +108,16 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
 
 }
 
-@property (strong, nonatomic) LoginViewController *loginWindowViewController;
 @property (strong, nonatomic) HelpGuideViewController *helpGuideWindowViewController;
 @property (strong, nonatomic) UIWindow *window;
-@property (strong, nonatomic) LoginViewController *loginViewController;
 @property (strong, nonatomic) UserDto *activeUser;
 @property (strong, nonatomic) OCTabBarController *ocTabBarController;
 @property (nonatomic, strong) NSMutableArray *uploadArray;
 @property (nonatomic, strong) NSMutableArray *webDavArray;
 @property (nonatomic, strong) SharedViewController *sharedViewController;
 @property (nonatomic, strong) RecentViewController *recentViewController;
 @property (nonatomic, strong) FilesViewController *filesViewController;
+//Pointer to a actual files view controller where the user is.
 @property (nonatomic, strong) FilesViewController *presentFilesViewController;
 @property (nonatomic, strong) SettingsViewController *settingsViewController;
 @property (nonatomic, strong) UISplitViewController *splitViewController;
@@ -153,6 +152,7 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
 @property (nonatomic, strong) ManageDownloads *downloadManager;
 @property (nonatomic, strong) NSString *userSessionCurrentToken;
 
+@property (nonatomic, strong) OCOAuth2Configuration *oauth2Configuration;
 
 /*
  * Method to get a Singleton of the OCCommunication to manage all the communications
@@ -180,9 +180,6 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
 - (void) updateRecents;
 - (void) updateProgressView:(NSUInteger)num withPercent:(float)percent;
 - (void) restartAppAfterDeleteAllAccounts;
-- (void) showLoginView;
-
-- (void)doLoginWithOauthToken;
 
 //Method that erase the data of the detail view in iPad.
 - (void)presentWithView;
@@ -258,7 +255,7 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
  * for a specific user
  *
  */
-- (void) cancelTheCurrentUploadsWithTheSameUserId:(NSInteger)idUser;
+- (void) cancelTheCurrentUploadsWithTheSameUserId:(NSInteger)userId;
 
 ///-----------------------------------
 /// @name Cancel the Currents Uploads
@@ -271,16 +268,16 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
  * @param userId -> id of user
  *
  */
-- (void) cancelTheCurrentUploadsOfTheUser:(NSInteger)idUser;
+- (void) cancelTheCurrentUploadsOfTheUser:(NSInteger)userId;
 
 /*
  * This method is called after that this class receive the notification that the user
  * has resolved the credentials error.
  * In this method we changed the kind of error of uploads failed "errorCredentials" to "notAndError"
  * for a specific user
- * @idUser -> idUser for a scpecific user.
+ * @userId -> userId for a scpecific user.
  */
-- (void)changeTheStatusOfCredentialsFilesErrorOfAnUserId:(NSInteger)idUser;
+- (void)changeTheStatusOfCredentialsFilesErrorOfAnUserId:(NSInteger)userId;
 
 
 ///-----------------------------------
@@ -302,19 +299,6 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
  */
 - (void) generateAppInterfaceFromLoginScreen:(BOOL)isFromLogin;
 
-///-----------------------------------
-/// @name Check if server support different things
-///-----------------------------------
-
-/**
- * This method check if the server support multipple things:
- * - If support Share
- * - If support Cookies
- *
- */
-- (void)checkIfServerSupportThings;
-
-
 
 //-----------------------------------
 /// @name reloadTableFromDataBaseIfFileIsVisibleOnList
@@ -337,4 +321,16 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
 
 - (void) showPassCodeIfNeeded;
 
+
+//---------------------------
+/// @name switchActiveUser
+///-------------------------
+
+/**
+ * Method that switches the active user to that passed as a parameter
+ *
+ * @param user -> UserDto to set as active user
+ */
+- (void) switchActiveUserTo:(UserDto *) user inHardMode:(BOOL)hardMode withCompletionHandler:(void (^)(void)) completionHandler;
+
 @end