Completed
Push — master ( 57ea46...72dc01 )
by Blizzz
14:28
created
lib/public/Authentication/LoginCredentials/ICredentials.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -31,31 +31,31 @@
 block discarded – undo
31 31
  */
32 32
 interface ICredentials {
33 33
 
34
-	/**
35
-	 * Get the user UID
36
-	 *
37
-	 * @since 12
38
-	 *
39
-	 * @return string
40
-	 */
41
-	public function getUID();
34
+    /**
35
+     * Get the user UID
36
+     *
37
+     * @since 12
38
+     *
39
+     * @return string
40
+     */
41
+    public function getUID();
42 42
 
43
-	/**
44
-	 * Get the login name the users used to login
45
-	 *
46
-	 * @since 12
47
-	 *
48
-	 * @return string
49
-	 */
50
-	public function getLoginName();
43
+    /**
44
+     * Get the login name the users used to login
45
+     *
46
+     * @since 12
47
+     *
48
+     * @return string
49
+     */
50
+    public function getLoginName();
51 51
 
52
-	/**
53
-	 * Get the password
54
-	 *
55
-	 * @since 12
56
-	 *
57
-	 * @return string
58
-	 * @throws PasswordUnavailableException
59
-	 */
60
-	public function getPassword();
52
+    /**
53
+     * Get the password
54
+     *
55
+     * @since 12
56
+     *
57
+     * @return string
58
+     * @throws PasswordUnavailableException
59
+     */
60
+    public function getPassword();
61 61
 }
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -28,48 +28,48 @@
 block discarded – undo
28 28
 
29 29
 class BackupCodeMapper extends Mapper {
30 30
 
31
-	public function __construct(IDBConnection $db) {
32
-		parent::__construct($db, 'twofactor_backupcodes');
33
-	}
31
+    public function __construct(IDBConnection $db) {
32
+        parent::__construct($db, 'twofactor_backupcodes');
33
+    }
34 34
 
35
-	/**
36
-	 * @param IUser $user
37
-	 * @return BackupCode[]
38
-	 */
39
-	public function getBackupCodes(IUser $user) {
40
-		/* @var IQueryBuilder $qb */
41
-		$qb = $this->db->getQueryBuilder();
35
+    /**
36
+     * @param IUser $user
37
+     * @return BackupCode[]
38
+     */
39
+    public function getBackupCodes(IUser $user) {
40
+        /* @var IQueryBuilder $qb */
41
+        $qb = $this->db->getQueryBuilder();
42 42
 
43
-		$qb->select('id', 'user_id', 'code', 'used')
44
-			->from('twofactor_backupcodes')
45
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
46
-		$result = $qb->execute();
43
+        $qb->select('id', 'user_id', 'code', 'used')
44
+            ->from('twofactor_backupcodes')
45
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
46
+        $result = $qb->execute();
47 47
 
48
-		$rows = $result->fetchAll();
49
-		$result->closeCursor();
48
+        $rows = $result->fetchAll();
49
+        $result->closeCursor();
50 50
 
51
-		return array_map(function ($row) {
52
-			return BackupCode::fromRow($row);
53
-		}, $rows);
54
-	}
51
+        return array_map(function ($row) {
52
+            return BackupCode::fromRow($row);
53
+        }, $rows);
54
+    }
55 55
 
56
-	/**
57
-	 * @param IUser $user
58
-	 */
59
-	public function deleteCodes(IUser $user) {
60
-		$this->deleteCodesByUserId($user->getUID());
61
-	}
56
+    /**
57
+     * @param IUser $user
58
+     */
59
+    public function deleteCodes(IUser $user) {
60
+        $this->deleteCodesByUserId($user->getUID());
61
+    }
62 62
 
63
-	/**
64
-	 * @param string $uid
65
-	 */
66
-	public function deleteCodesByUserId($uid) {
67
-		/* @var IQueryBuilder $qb */
68
-		$qb = $this->db->getQueryBuilder();
63
+    /**
64
+     * @param string $uid
65
+     */
66
+    public function deleteCodesByUserId($uid) {
67
+        /* @var IQueryBuilder $qb */
68
+        $qb = $this->db->getQueryBuilder();
69 69
 
70
-		$qb->delete('twofactor_backupcodes')
71
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
72
-		$qb->execute();
73
-	}
70
+        $qb->delete('twofactor_backupcodes')
71
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
72
+        $qb->execute();
73
+    }
74 74
 
75 75
 }
Please login to merge, or discard this patch.
settings/Application.php 1 patch
Indentation   +92 added lines, -92 removed lines patch added patch discarded remove patch
@@ -52,106 +52,106 @@
 block discarded – undo
52 52
 class Application extends App {
53 53
 
54 54
 
55
-	/**
56
-	 * @param array $urlParams
57
-	 */
58
-	public function __construct(array $urlParams=[]){
59
-		parent::__construct('settings', $urlParams);
55
+    /**
56
+     * @param array $urlParams
57
+     */
58
+    public function __construct(array $urlParams=[]){
59
+        parent::__construct('settings', $urlParams);
60 60
 
61
-		$container = $this->getContainer();
61
+        $container = $this->getContainer();
62 62
 
63
-		// Register Middleware
64
-		$container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
65
-		$container->registerMiddleWare('SubadminMiddleware');
63
+        // Register Middleware
64
+        $container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
65
+        $container->registerMiddleWare('SubadminMiddleware');
66 66
 
67
-		/**
68
-		 * Core class wrappers
69
-		 */
70
-		/** FIXME: Remove once OC_User is non-static and mockable */
71
-		$container->registerService('isAdmin', function() {
72
-			return \OC_User::isAdminUser(\OC_User::getUser());
73
-		});
74
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
75
-		$container->registerService('isSubAdmin', function(IContainer $c) {
76
-			$userObject = \OC::$server->getUserSession()->getUser();
77
-			$isSubAdmin = false;
78
-			if($userObject !== null) {
79
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
80
-			}
81
-			return $isSubAdmin;
82
-		});
83
-		$container->registerService('userCertificateManager', function(IContainer $c) {
84
-			return $c->query('ServerContainer')->getCertificateManager();
85
-		}, false);
86
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
87
-			return $c->query('ServerContainer')->getCertificateManager(null);
88
-		}, false);
89
-		$container->registerService(IProvider::class, function (IContainer $c) {
90
-			return $c->query('ServerContainer')->query(IProvider::class);
91
-		});
92
-		$container->registerService(IManager::class, function (IContainer $c) {
93
-			return $c->query('ServerContainer')->getSettingsManager();
94
-		});
67
+        /**
68
+         * Core class wrappers
69
+         */
70
+        /** FIXME: Remove once OC_User is non-static and mockable */
71
+        $container->registerService('isAdmin', function() {
72
+            return \OC_User::isAdminUser(\OC_User::getUser());
73
+        });
74
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
75
+        $container->registerService('isSubAdmin', function(IContainer $c) {
76
+            $userObject = \OC::$server->getUserSession()->getUser();
77
+            $isSubAdmin = false;
78
+            if($userObject !== null) {
79
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
80
+            }
81
+            return $isSubAdmin;
82
+        });
83
+        $container->registerService('userCertificateManager', function(IContainer $c) {
84
+            return $c->query('ServerContainer')->getCertificateManager();
85
+        }, false);
86
+        $container->registerService('systemCertificateManager', function (IContainer $c) {
87
+            return $c->query('ServerContainer')->getCertificateManager(null);
88
+        }, false);
89
+        $container->registerService(IProvider::class, function (IContainer $c) {
90
+            return $c->query('ServerContainer')->query(IProvider::class);
91
+        });
92
+        $container->registerService(IManager::class, function (IContainer $c) {
93
+            return $c->query('ServerContainer')->getSettingsManager();
94
+        });
95 95
 
96
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
97
-			/** @var Server $server */
98
-			$server = $c->query('ServerContainer');
99
-			/** @var Defaults $defaults */
100
-			$defaults = $server->query(Defaults::class);
96
+        $container->registerService(NewUserMailHelper::class, function (IContainer $c) {
97
+            /** @var Server $server */
98
+            $server = $c->query('ServerContainer');
99
+            /** @var Defaults $defaults */
100
+            $defaults = $server->query(Defaults::class);
101 101
 
102
-			return new NewUserMailHelper(
103
-				$defaults,
104
-				$server->getURLGenerator(),
105
-				$server->getL10N('settings'),
106
-				$server->getMailer(),
107
-				$server->getSecureRandom(),
108
-				new TimeFactory(),
109
-				$server->getConfig(),
110
-				$server->getCrypto(),
111
-				Util::getDefaultEmailAddress('no-reply')
112
-			);
113
-		});
114
-	}
102
+            return new NewUserMailHelper(
103
+                $defaults,
104
+                $server->getURLGenerator(),
105
+                $server->getL10N('settings'),
106
+                $server->getMailer(),
107
+                $server->getSecureRandom(),
108
+                new TimeFactory(),
109
+                $server->getConfig(),
110
+                $server->getCrypto(),
111
+                Util::getDefaultEmailAddress('no-reply')
112
+            );
113
+        });
114
+    }
115 115
 
116
-	public function register() {
117
-		$activityManager = $this->getContainer()->getServer()->getActivityManager();
118
-		$activityManager->registerSetting(Setting::class); // FIXME move to info.xml
119
-		$activityManager->registerProvider(Provider::class); // FIXME move to info.xml
120
-		$activityManager->registerFilter(SecurityFilter::class); // FIXME move to info.xml
121
-		$activityManager->registerSetting(SecuritySetting::class); // FIXME move to info.xml
122
-		$activityManager->registerProvider(SecurityProvider::class); // FIXME move to info.xml
116
+    public function register() {
117
+        $activityManager = $this->getContainer()->getServer()->getActivityManager();
118
+        $activityManager->registerSetting(Setting::class); // FIXME move to info.xml
119
+        $activityManager->registerProvider(Provider::class); // FIXME move to info.xml
120
+        $activityManager->registerFilter(SecurityFilter::class); // FIXME move to info.xml
121
+        $activityManager->registerSetting(SecuritySetting::class); // FIXME move to info.xml
122
+        $activityManager->registerProvider(SecurityProvider::class); // FIXME move to info.xml
123 123
 
124
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
125
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
126
-	}
124
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
125
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
126
+    }
127 127
 
128
-	/**
129
-	 * @param array $parameters
130
-	 * @throws \InvalidArgumentException
131
-	 * @throws \BadMethodCallException
132
-	 * @throws \Exception
133
-	 * @throws \OCP\AppFramework\QueryException
134
-	 */
135
-	public function onChangePassword(array $parameters) {
136
-		/** @var Hooks $hooks */
137
-		$hooks = $this->getContainer()->query(Hooks::class);
138
-		$hooks->onChangePassword($parameters['uid']);
139
-	}
128
+    /**
129
+     * @param array $parameters
130
+     * @throws \InvalidArgumentException
131
+     * @throws \BadMethodCallException
132
+     * @throws \Exception
133
+     * @throws \OCP\AppFramework\QueryException
134
+     */
135
+    public function onChangePassword(array $parameters) {
136
+        /** @var Hooks $hooks */
137
+        $hooks = $this->getContainer()->query(Hooks::class);
138
+        $hooks->onChangePassword($parameters['uid']);
139
+    }
140 140
 
141
-	/**
142
-	 * @param array $parameters
143
-	 * @throws \InvalidArgumentException
144
-	 * @throws \BadMethodCallException
145
-	 * @throws \Exception
146
-	 * @throws \OCP\AppFramework\QueryException
147
-	 */
148
-	public function onChangeInfo(array $parameters) {
149
-		if ($parameters['feature'] !== 'eMailAddress') {
150
-			return;
151
-		}
141
+    /**
142
+     * @param array $parameters
143
+     * @throws \InvalidArgumentException
144
+     * @throws \BadMethodCallException
145
+     * @throws \Exception
146
+     * @throws \OCP\AppFramework\QueryException
147
+     */
148
+    public function onChangeInfo(array $parameters) {
149
+        if ($parameters['feature'] !== 'eMailAddress') {
150
+            return;
151
+        }
152 152
 
153
-		/** @var Hooks $hooks */
154
-		$hooks = $this->getContainer()->query(Hooks::class);
155
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
156
-	}
153
+        /** @var Hooks $hooks */
154
+        $hooks = $this->getContainer()->query(Hooks::class);
155
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
156
+    }
157 157
 }
Please login to merge, or discard this patch.
settings/Activity/SecurityFilter.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -28,39 +28,39 @@
 block discarded – undo
28 28
 
29 29
 class SecurityFilter implements IFilter {
30 30
 
31
-	/** @var IURLGenerator */
32
-	private $urlGenerator;
31
+    /** @var IURLGenerator */
32
+    private $urlGenerator;
33 33
 
34
-	/** @var IL10N */
35
-	private $l10n;
34
+    /** @var IL10N */
35
+    private $l10n;
36 36
 
37
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
38
-		$this->urlGenerator = $urlGenerator;
39
-		$this->l10n = $l10n;
40
-	}
37
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
38
+        $this->urlGenerator = $urlGenerator;
39
+        $this->l10n = $l10n;
40
+    }
41 41
 
42
-	public function allowedApps() {
43
-		return [];
44
-	}
42
+    public function allowedApps() {
43
+        return [];
44
+    }
45 45
 
46
-	public function filterTypes(array $types) {
47
-		return array_intersect(['security'], $types);
48
-	}
46
+    public function filterTypes(array $types) {
47
+        return array_intersect(['security'], $types);
48
+    }
49 49
 
50
-	public function getIcon() {
51
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
52
-	}
50
+    public function getIcon() {
51
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
52
+    }
53 53
 
54
-	public function getIdentifier() {
55
-		return 'security';
56
-	}
54
+    public function getIdentifier() {
55
+        return 'security';
56
+    }
57 57
 
58
-	public function getName() {
59
-		return $this->l10n->t('Security');
60
-	}
58
+    public function getName() {
59
+        return $this->l10n->t('Security');
60
+    }
61 61
 
62
-	public function getPriority() {
63
-		return 30;
64
-	}
62
+    public function getPriority() {
63
+        return 30;
64
+    }
65 65
 
66 66
 }
Please login to merge, or discard this patch.
settings/Activity/SecuritySetting.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -27,39 +27,39 @@
 block discarded – undo
27 27
 
28 28
 class SecuritySetting implements ISetting {
29 29
 
30
-	/** @var IL10N */
31
-	private $l10n;
30
+    /** @var IL10N */
31
+    private $l10n;
32 32
 
33
-	public function __construct(IL10N $l10n) {
34
-		$this->l10n = $l10n;
35
-	}
33
+    public function __construct(IL10N $l10n) {
34
+        $this->l10n = $l10n;
35
+    }
36 36
 
37
-	public function canChangeMail() {
38
-		return false;
39
-	}
37
+    public function canChangeMail() {
38
+        return false;
39
+    }
40 40
 
41
-	public function canChangeStream() {
42
-		return false;
43
-	}
41
+    public function canChangeStream() {
42
+        return false;
43
+    }
44 44
 
45
-	public function getIdentifier() {
46
-		return 'security';
47
-	}
45
+    public function getIdentifier() {
46
+        return 'security';
47
+    }
48 48
 
49
-	public function getName() {
50
-		return $this->l10n->t('Security');
51
-	}
49
+    public function getName() {
50
+        return $this->l10n->t('Security');
51
+    }
52 52
 
53
-	public function getPriority() {
54
-		return 30;
55
-	}
53
+    public function getPriority() {
54
+        return 30;
55
+    }
56 56
 
57
-	public function isDefaultEnabledMail() {
58
-		return true;
59
-	}
57
+    public function isDefaultEnabledMail() {
58
+        return true;
59
+    }
60 60
 
61
-	public function isDefaultEnabledStream() {
62
-		return true;
63
-	}
61
+    public function isDefaultEnabledStream() {
62
+        return true;
63
+    }
64 64
 
65 65
 }
Please login to merge, or discard this patch.
apps/oauth2/lib/Controller/SettingsController.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -32,69 +32,69 @@
 block discarded – undo
32 32
 use OCP\Security\ISecureRandom;
33 33
 
34 34
 class SettingsController extends Controller {
35
-	/** @var IURLGenerator */
36
-	private $urlGenerator;
37
-	/** @var ClientMapper */
38
-	private $clientMapper;
39
-	/** @var ISecureRandom */
40
-	private $secureRandom;
41
-	/** @var AccessTokenMapper  */
42
-	private $accessTokenMapper;
43
-	/** @var  DefaultTokenMapper */
44
-	private $defaultTokenMapper;
35
+    /** @var IURLGenerator */
36
+    private $urlGenerator;
37
+    /** @var ClientMapper */
38
+    private $clientMapper;
39
+    /** @var ISecureRandom */
40
+    private $secureRandom;
41
+    /** @var AccessTokenMapper  */
42
+    private $accessTokenMapper;
43
+    /** @var  DefaultTokenMapper */
44
+    private $defaultTokenMapper;
45 45
 
46
-	const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
46
+    const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
47 47
 
48
-	/**
49
-	 * @param string $appName
50
-	 * @param IRequest $request
51
-	 * @param IURLGenerator $urlGenerator
52
-	 * @param ClientMapper $clientMapper
53
-	 * @param ISecureRandom $secureRandom
54
-	 * @param AccessTokenMapper $accessTokenMapper
55
-	 * @param DefaultTokenMapper $defaultTokenMapper
56
-	 */
57
-	public function __construct($appName,
58
-								IRequest $request,
59
-								IURLGenerator $urlGenerator,
60
-								ClientMapper $clientMapper,
61
-								ISecureRandom $secureRandom,
62
-								AccessTokenMapper $accessTokenMapper,
63
-								DefaultTokenMapper $defaultTokenMapper
64
-	) {
65
-		parent::__construct($appName, $request);
66
-		$this->urlGenerator = $urlGenerator;
67
-		$this->secureRandom = $secureRandom;
68
-		$this->clientMapper = $clientMapper;
69
-		$this->accessTokenMapper = $accessTokenMapper;
70
-		$this->defaultTokenMapper = $defaultTokenMapper;
71
-	}
48
+    /**
49
+     * @param string $appName
50
+     * @param IRequest $request
51
+     * @param IURLGenerator $urlGenerator
52
+     * @param ClientMapper $clientMapper
53
+     * @param ISecureRandom $secureRandom
54
+     * @param AccessTokenMapper $accessTokenMapper
55
+     * @param DefaultTokenMapper $defaultTokenMapper
56
+     */
57
+    public function __construct($appName,
58
+                                IRequest $request,
59
+                                IURLGenerator $urlGenerator,
60
+                                ClientMapper $clientMapper,
61
+                                ISecureRandom $secureRandom,
62
+                                AccessTokenMapper $accessTokenMapper,
63
+                                DefaultTokenMapper $defaultTokenMapper
64
+    ) {
65
+        parent::__construct($appName, $request);
66
+        $this->urlGenerator = $urlGenerator;
67
+        $this->secureRandom = $secureRandom;
68
+        $this->clientMapper = $clientMapper;
69
+        $this->accessTokenMapper = $accessTokenMapper;
70
+        $this->defaultTokenMapper = $defaultTokenMapper;
71
+    }
72 72
 
73
-	/**
74
-	 * @param string $name
75
-	 * @param string $redirectUri
76
-	 * @return RedirectResponse
77
-	 */
78
-	public function addClient($name,
79
-							  $redirectUri) {
80
-		$client = new Client();
81
-		$client->setName($name);
82
-		$client->setRedirectUri($redirectUri);
83
-		$client->setSecret($this->secureRandom->generate(64, self::validChars));
84
-		$client->setClientIdentifier($this->secureRandom->generate(64, self::validChars));
85
-		$this->clientMapper->insert($client);
86
-		return new RedirectResponse($this->urlGenerator->getAbsoluteURL('/index.php/settings/admin/security'));
87
-	}
73
+    /**
74
+     * @param string $name
75
+     * @param string $redirectUri
76
+     * @return RedirectResponse
77
+     */
78
+    public function addClient($name,
79
+                                $redirectUri) {
80
+        $client = new Client();
81
+        $client->setName($name);
82
+        $client->setRedirectUri($redirectUri);
83
+        $client->setSecret($this->secureRandom->generate(64, self::validChars));
84
+        $client->setClientIdentifier($this->secureRandom->generate(64, self::validChars));
85
+        $this->clientMapper->insert($client);
86
+        return new RedirectResponse($this->urlGenerator->getAbsoluteURL('/index.php/settings/admin/security'));
87
+    }
88 88
 
89
-	/**
90
-	 * @param int $id
91
-	 * @return RedirectResponse
92
-	 */
93
-	public function deleteClient($id) {
94
-		$client = $this->clientMapper->getByUid($id);
95
-		$this->accessTokenMapper->deleteByClientId($id);
96
-		$this->defaultTokenMapper->deleteByName($client->getName());
97
-		$this->clientMapper->delete($client);
98
-		return new RedirectResponse($this->urlGenerator->getAbsoluteURL('/index.php/settings/admin/security'));
99
-	}
89
+    /**
90
+     * @param int $id
91
+     * @return RedirectResponse
92
+     */
93
+    public function deleteClient($id) {
94
+        $client = $this->clientMapper->getByUid($id);
95
+        $this->accessTokenMapper->deleteByClientId($id);
96
+        $this->defaultTokenMapper->deleteByName($client->getName());
97
+        $this->clientMapper->delete($client);
98
+        return new RedirectResponse($this->urlGenerator->getAbsoluteURL('/index.php/settings/admin/security'));
99
+    }
100 100
 }
Please login to merge, or discard this patch.
apps/oauth2/templates/admin.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,9 +46,9 @@
 block discarded – undo
46 46
 		</thead>
47 47
 		<tbody>
48 48
 		<?php
49
-		$imageUrl = $urlGenerator->imagePath('core', 'actions/toggle.svg');
50
-		foreach ($clients as $client) {
51
-		?>
49
+        $imageUrl = $urlGenerator->imagePath('core', 'actions/toggle.svg');
50
+        foreach ($clients as $client) {
51
+        ?>
52 52
 			<tr>
53 53
 				<td><?php p($client->getName()); ?></td>
54 54
 				<td><?php p($client->getRedirectUri()); ?></td>
Please login to merge, or discard this patch.
apps/oauth2/lib/Controller/LoginRedirectorController.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -29,51 +29,51 @@
 block discarded – undo
29 29
 use OCP\IURLGenerator;
30 30
 
31 31
 class LoginRedirectorController extends Controller {
32
-	/** @var IURLGenerator */
33
-	private $urlGenerator;
34
-	/** @var ClientMapper */
35
-	private $clientMapper;
36
-	/** @var ISession */
37
-	private $session;
32
+    /** @var IURLGenerator */
33
+    private $urlGenerator;
34
+    /** @var ClientMapper */
35
+    private $clientMapper;
36
+    /** @var ISession */
37
+    private $session;
38 38
 
39
-	/**
40
-	 * @param string $appName
41
-	 * @param IRequest $request
42
-	 * @param IURLGenerator $urlGenerator
43
-	 * @param ClientMapper $clientMapper
44
-	 * @param ISession $session
45
-	 */
46
-	public function __construct($appName,
47
-								IRequest $request,
48
-								IURLGenerator $urlGenerator,
49
-								ClientMapper $clientMapper,
50
-								ISession $session) {
51
-		parent::__construct($appName, $request);
52
-		$this->urlGenerator = $urlGenerator;
53
-		$this->clientMapper = $clientMapper;
54
-		$this->session = $session;
55
-	}
39
+    /**
40
+     * @param string $appName
41
+     * @param IRequest $request
42
+     * @param IURLGenerator $urlGenerator
43
+     * @param ClientMapper $clientMapper
44
+     * @param ISession $session
45
+     */
46
+    public function __construct($appName,
47
+                                IRequest $request,
48
+                                IURLGenerator $urlGenerator,
49
+                                ClientMapper $clientMapper,
50
+                                ISession $session) {
51
+        parent::__construct($appName, $request);
52
+        $this->urlGenerator = $urlGenerator;
53
+        $this->clientMapper = $clientMapper;
54
+        $this->session = $session;
55
+    }
56 56
 
57
-	/**
58
-	 * @PublicPage
59
-	 * @NoCSRFRequired
60
-	 * @UseSession
61
-	 *
62
-	 * @param string $client_id
63
-	 * @param string $state
64
-	 * @return RedirectResponse
65
-	 */
66
-	public function authorize($client_id,
67
-							  $state) {
68
-		$client = $this->clientMapper->getByIdentifier($client_id);
69
-		$this->session->set('oauth.state', $state);
57
+    /**
58
+     * @PublicPage
59
+     * @NoCSRFRequired
60
+     * @UseSession
61
+     *
62
+     * @param string $client_id
63
+     * @param string $state
64
+     * @return RedirectResponse
65
+     */
66
+    public function authorize($client_id,
67
+                                $state) {
68
+        $client = $this->clientMapper->getByIdentifier($client_id);
69
+        $this->session->set('oauth.state', $state);
70 70
 
71
-		$targetUrl = $this->urlGenerator->linkToRouteAbsolute(
72
-			'core.ClientFlowLogin.showAuthPickerPage',
73
-			[
74
-				'clientIdentifier' => $client->getClientIdentifier(),
75
-			]
76
-		);
77
-		return new RedirectResponse($targetUrl);
78
-	}
71
+        $targetUrl = $this->urlGenerator->linkToRouteAbsolute(
72
+            'core.ClientFlowLogin.showAuthPickerPage',
73
+            [
74
+                'clientIdentifier' => $client->getClientIdentifier(),
75
+            ]
76
+        );
77
+        return new RedirectResponse($targetUrl);
78
+    }
79 79
 }
Please login to merge, or discard this patch.
apps/oauth2/lib/Controller/OauthApiController.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -30,59 +30,59 @@
 block discarded – undo
30 30
 use OCP\Security\ISecureRandom;
31 31
 
32 32
 class OauthApiController extends Controller {
33
-	/** @var AccessTokenMapper */
34
-	private $accessTokenMapper;
35
-	/** @var ICrypto */
36
-	private $crypto;
37
-	/** @var DefaultTokenMapper */
38
-	private $defaultTokenMapper;
39
-	/** @var ISecureRandom */
40
-	private $secureRandom;
33
+    /** @var AccessTokenMapper */
34
+    private $accessTokenMapper;
35
+    /** @var ICrypto */
36
+    private $crypto;
37
+    /** @var DefaultTokenMapper */
38
+    private $defaultTokenMapper;
39
+    /** @var ISecureRandom */
40
+    private $secureRandom;
41 41
 
42
-	/**
43
-	 * @param string $appName
44
-	 * @param IRequest $request
45
-	 * @param ICrypto $crypto
46
-	 * @param AccessTokenMapper $accessTokenMapper
47
-	 * @param DefaultTokenMapper $defaultTokenMapper
48
-	 * @param ISecureRandom $secureRandom
49
-	 */
50
-	public function __construct($appName,
51
-								IRequest $request,
52
-								ICrypto $crypto,
53
-								AccessTokenMapper $accessTokenMapper,
54
-								DefaultTokenMapper $defaultTokenMapper,
55
-								ISecureRandom $secureRandom) {
56
-		parent::__construct($appName, $request);
57
-		$this->crypto = $crypto;
58
-		$this->accessTokenMapper = $accessTokenMapper;
59
-		$this->defaultTokenMapper = $defaultTokenMapper;
60
-		$this->secureRandom = $secureRandom;
61
-	}
42
+    /**
43
+     * @param string $appName
44
+     * @param IRequest $request
45
+     * @param ICrypto $crypto
46
+     * @param AccessTokenMapper $accessTokenMapper
47
+     * @param DefaultTokenMapper $defaultTokenMapper
48
+     * @param ISecureRandom $secureRandom
49
+     */
50
+    public function __construct($appName,
51
+                                IRequest $request,
52
+                                ICrypto $crypto,
53
+                                AccessTokenMapper $accessTokenMapper,
54
+                                DefaultTokenMapper $defaultTokenMapper,
55
+                                ISecureRandom $secureRandom) {
56
+        parent::__construct($appName, $request);
57
+        $this->crypto = $crypto;
58
+        $this->accessTokenMapper = $accessTokenMapper;
59
+        $this->defaultTokenMapper = $defaultTokenMapper;
60
+        $this->secureRandom = $secureRandom;
61
+    }
62 62
 
63
-	/**
64
-	 * @PublicPage
65
-	 * @NoCSRFRequired
66
-	 *
67
-	 * @param string $code
68
-	 * @return JSONResponse
69
-	 */
70
-	public function getToken($code) {
71
-		$accessToken = $this->accessTokenMapper->getByCode($code);
72
-		$decryptedToken = $this->crypto->decrypt($accessToken->getEncryptedToken(), $code);
73
-		$newCode = $this->secureRandom->generate(128);
74
-		$accessToken->setHashedCode(hash('sha512', $newCode));
75
-		$accessToken->setEncryptedToken($this->crypto->encrypt($decryptedToken, $newCode));
76
-		$this->accessTokenMapper->update($accessToken);
63
+    /**
64
+     * @PublicPage
65
+     * @NoCSRFRequired
66
+     *
67
+     * @param string $code
68
+     * @return JSONResponse
69
+     */
70
+    public function getToken($code) {
71
+        $accessToken = $this->accessTokenMapper->getByCode($code);
72
+        $decryptedToken = $this->crypto->decrypt($accessToken->getEncryptedToken(), $code);
73
+        $newCode = $this->secureRandom->generate(128);
74
+        $accessToken->setHashedCode(hash('sha512', $newCode));
75
+        $accessToken->setEncryptedToken($this->crypto->encrypt($decryptedToken, $newCode));
76
+        $this->accessTokenMapper->update($accessToken);
77 77
 
78
-		return new JSONResponse(
79
-			[
80
-				'access_token' => $decryptedToken,
81
-				'token_type' => 'Bearer',
82
-				'expires_in' => 3600,
83
-				'refresh_token' => $newCode,
84
-				'user_id' => $this->defaultTokenMapper->getTokenById($accessToken->getTokenId())->getUID(),
85
-			]
86
-		);
87
-	}
78
+        return new JSONResponse(
79
+            [
80
+                'access_token' => $decryptedToken,
81
+                'token_type' => 'Bearer',
82
+                'expires_in' => 3600,
83
+                'refresh_token' => $newCode,
84
+                'user_id' => $this->defaultTokenMapper->getTokenById($accessToken->getTokenId())->getUID(),
85
+            ]
86
+        );
87
+    }
88 88
 }
Please login to merge, or discard this patch.