@@ -31,22 +31,22 @@ |
||
31 | 31 | use OCP\Migration\SimpleMigrationStep; |
32 | 32 | |
33 | 33 | class Version21000Date20210309185127 extends SimpleMigrationStep { |
34 | - /** |
|
35 | - * @param IOutput $output |
|
36 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
37 | - * @param array $options |
|
38 | - * @return null|ISchemaWrapper |
|
39 | - */ |
|
40 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
41 | - /** @var ISchemaWrapper $schema */ |
|
42 | - $schema = $schemaClosure(); |
|
34 | + /** |
|
35 | + * @param IOutput $output |
|
36 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
37 | + * @param array $options |
|
38 | + * @return null|ISchemaWrapper |
|
39 | + */ |
|
40 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
41 | + /** @var ISchemaWrapper $schema */ |
|
42 | + $schema = $schemaClosure(); |
|
43 | 43 | |
44 | - $table = $schema->getTable('known_users'); |
|
45 | - if (!$table->hasIndex('ku_known_user')) { |
|
46 | - $table->addIndex(['known_user'], 'ku_known_user'); |
|
47 | - return $schema; |
|
48 | - } |
|
44 | + $table = $schema->getTable('known_users'); |
|
45 | + if (!$table->hasIndex('ku_known_user')) { |
|
46 | + $table->addIndex(['known_user'], 'ku_known_user'); |
|
47 | + return $schema; |
|
48 | + } |
|
49 | 49 | |
50 | - return null; |
|
51 | - } |
|
50 | + return null; |
|
51 | + } |
|
52 | 52 | } |
@@ -29,49 +29,49 @@ |
||
29 | 29 | * @since 12.0.0 |
30 | 30 | */ |
31 | 31 | interface ISearchQuery { |
32 | - /** |
|
33 | - * @return ISearchOperator |
|
34 | - * @since 12.0.0 |
|
35 | - */ |
|
36 | - public function getSearchOperation(); |
|
32 | + /** |
|
33 | + * @return ISearchOperator |
|
34 | + * @since 12.0.0 |
|
35 | + */ |
|
36 | + public function getSearchOperation(); |
|
37 | 37 | |
38 | - /** |
|
39 | - * Get the maximum number of results to return |
|
40 | - * |
|
41 | - * @return integer |
|
42 | - * @since 12.0.0 |
|
43 | - */ |
|
44 | - public function getLimit(); |
|
38 | + /** |
|
39 | + * Get the maximum number of results to return |
|
40 | + * |
|
41 | + * @return integer |
|
42 | + * @since 12.0.0 |
|
43 | + */ |
|
44 | + public function getLimit(); |
|
45 | 45 | |
46 | - /** |
|
47 | - * Get the offset for returned results |
|
48 | - * |
|
49 | - * @return integer |
|
50 | - * @since 12.0.0 |
|
51 | - */ |
|
52 | - public function getOffset(); |
|
46 | + /** |
|
47 | + * Get the offset for returned results |
|
48 | + * |
|
49 | + * @return integer |
|
50 | + * @since 12.0.0 |
|
51 | + */ |
|
52 | + public function getOffset(); |
|
53 | 53 | |
54 | - /** |
|
55 | - * The fields and directions to order by |
|
56 | - * |
|
57 | - * @return ISearchOrder[] |
|
58 | - * @since 12.0.0 |
|
59 | - */ |
|
60 | - public function getOrder(); |
|
54 | + /** |
|
55 | + * The fields and directions to order by |
|
56 | + * |
|
57 | + * @return ISearchOrder[] |
|
58 | + * @since 12.0.0 |
|
59 | + */ |
|
60 | + public function getOrder(); |
|
61 | 61 | |
62 | - /** |
|
63 | - * The user that issued the search |
|
64 | - * |
|
65 | - * @return ?IUser |
|
66 | - * @since 12.0.0 |
|
67 | - */ |
|
68 | - public function getUser(); |
|
62 | + /** |
|
63 | + * The user that issued the search |
|
64 | + * |
|
65 | + * @return ?IUser |
|
66 | + * @since 12.0.0 |
|
67 | + */ |
|
68 | + public function getUser(); |
|
69 | 69 | |
70 | - /** |
|
71 | - * Whether or not the search should be limited to the users home storage |
|
72 | - * |
|
73 | - * @return bool |
|
74 | - * @since 18.0.0 |
|
75 | - */ |
|
76 | - public function limitToHome(): bool; |
|
70 | + /** |
|
71 | + * Whether or not the search should be limited to the users home storage |
|
72 | + * |
|
73 | + * @return bool |
|
74 | + * @since 18.0.0 |
|
75 | + */ |
|
76 | + public function limitToHome(): bool; |
|
77 | 77 | } |
@@ -54,48 +54,48 @@ |
||
54 | 54 | use Psr\Container\ContainerInterface; |
55 | 55 | |
56 | 56 | class Application extends App implements IBootstrap { |
57 | - public function __construct(array $urlParams = []) { |
|
58 | - parent::__construct('provisioning_api', $urlParams); |
|
59 | - } |
|
57 | + public function __construct(array $urlParams = []) { |
|
58 | + parent::__construct('provisioning_api', $urlParams); |
|
59 | + } |
|
60 | 60 | |
61 | - public function register(IRegistrationContext $context): void { |
|
62 | - $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class); |
|
61 | + public function register(IRegistrationContext $context): void { |
|
62 | + $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class); |
|
63 | 63 | |
64 | - $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) { |
|
65 | - return new NewUserMailHelper( |
|
66 | - $c->get(Defaults::class), |
|
67 | - $c->get(IURLGenerator::class), |
|
68 | - $c->get(IFactory::class), |
|
69 | - $c->get(IMailer::class), |
|
70 | - $c->get(ISecureRandom::class), |
|
71 | - $c->get(ITimeFactory::class), |
|
72 | - $c->get(IConfig::class), |
|
73 | - $c->get(ICrypto::class), |
|
74 | - Util::getDefaultEmailAddress('no-reply') |
|
75 | - ); |
|
76 | - }); |
|
77 | - $context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) { |
|
78 | - $user = $c->get(IUserManager::class)->get($c->get('UserId')); |
|
79 | - $isAdmin = false; |
|
80 | - $isSubAdmin = false; |
|
64 | + $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) { |
|
65 | + return new NewUserMailHelper( |
|
66 | + $c->get(Defaults::class), |
|
67 | + $c->get(IURLGenerator::class), |
|
68 | + $c->get(IFactory::class), |
|
69 | + $c->get(IMailer::class), |
|
70 | + $c->get(ISecureRandom::class), |
|
71 | + $c->get(ITimeFactory::class), |
|
72 | + $c->get(IConfig::class), |
|
73 | + $c->get(ICrypto::class), |
|
74 | + Util::getDefaultEmailAddress('no-reply') |
|
75 | + ); |
|
76 | + }); |
|
77 | + $context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) { |
|
78 | + $user = $c->get(IUserManager::class)->get($c->get('UserId')); |
|
79 | + $isAdmin = false; |
|
80 | + $isSubAdmin = false; |
|
81 | 81 | |
82 | - if ($user instanceof IUser) { |
|
83 | - $groupManager = $c->get(IGroupManager::class); |
|
84 | - assert($groupManager instanceof GroupManager); |
|
85 | - $isAdmin = $groupManager->isAdmin($user->getUID()); |
|
86 | - $isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user); |
|
87 | - } |
|
82 | + if ($user instanceof IUser) { |
|
83 | + $groupManager = $c->get(IGroupManager::class); |
|
84 | + assert($groupManager instanceof GroupManager); |
|
85 | + $isAdmin = $groupManager->isAdmin($user->getUID()); |
|
86 | + $isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user); |
|
87 | + } |
|
88 | 88 | |
89 | - return new ProvisioningApiMiddleware( |
|
90 | - $c->get(IControllerMethodReflector::class), |
|
91 | - $isAdmin, |
|
92 | - $isSubAdmin |
|
93 | - ); |
|
94 | - }); |
|
95 | - $context->registerMiddleware(ProvisioningApiMiddleware::class); |
|
96 | - $context->registerCapability(Capabilities::class); |
|
97 | - } |
|
89 | + return new ProvisioningApiMiddleware( |
|
90 | + $c->get(IControllerMethodReflector::class), |
|
91 | + $isAdmin, |
|
92 | + $isSubAdmin |
|
93 | + ); |
|
94 | + }); |
|
95 | + $context->registerMiddleware(ProvisioningApiMiddleware::class); |
|
96 | + $context->registerCapability(Capabilities::class); |
|
97 | + } |
|
98 | 98 | |
99 | - public function boot(IBootContext $context): void { |
|
100 | - } |
|
99 | + public function boot(IBootContext $context): void { |
|
100 | + } |
|
101 | 101 | } |
@@ -36,27 +36,27 @@ |
||
36 | 36 | |
37 | 37 | class Version1002Date20170919123342 extends SimpleMigrationStep { |
38 | 38 | |
39 | - /** |
|
40 | - * @param IOutput $output |
|
41 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
42 | - * @param array $options |
|
43 | - * @return null|ISchemaWrapper |
|
44 | - * @since 13.0.0 |
|
45 | - */ |
|
46 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
47 | - /** @var ISchemaWrapper $schema */ |
|
48 | - $schema = $schemaClosure(); |
|
49 | - |
|
50 | - $table = $schema->getTable('twofactor_backupcodes'); |
|
51 | - $column = $table->getColumn('user_id'); |
|
52 | - $column->setDefault(''); |
|
53 | - |
|
54 | - $column = $table->getColumn('used'); |
|
55 | - if ($column->getType()->getName() !== Types::SMALLINT) { |
|
56 | - $column->setType(Type::getType(Types::SMALLINT)); |
|
57 | - $column->setOptions(['length' => 6]); |
|
58 | - } |
|
59 | - |
|
60 | - return $schema; |
|
61 | - } |
|
39 | + /** |
|
40 | + * @param IOutput $output |
|
41 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
42 | + * @param array $options |
|
43 | + * @return null|ISchemaWrapper |
|
44 | + * @since 13.0.0 |
|
45 | + */ |
|
46 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
47 | + /** @var ISchemaWrapper $schema */ |
|
48 | + $schema = $schemaClosure(); |
|
49 | + |
|
50 | + $table = $schema->getTable('twofactor_backupcodes'); |
|
51 | + $column = $table->getColumn('user_id'); |
|
52 | + $column->setDefault(''); |
|
53 | + |
|
54 | + $column = $table->getColumn('used'); |
|
55 | + if ($column->getType()->getName() !== Types::SMALLINT) { |
|
56 | + $column->setType(Type::getType(Types::SMALLINT)); |
|
57 | + $column->setOptions(['length' => 6]); |
|
58 | + } |
|
59 | + |
|
60 | + return $schema; |
|
61 | + } |
|
62 | 62 | } |
@@ -16,10 +16,10 @@ |
||
16 | 16 | <?php if ((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?> |
17 | 17 | <span class="status success"></span> |
18 | 18 | <?php |
19 | - } elseif ( |
|
20 | - (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING || |
|
21 | - (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED |
|
22 | - ) { ?> |
|
19 | + } elseif ( |
|
20 | + (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING || |
|
21 | + (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED |
|
22 | + ) { ?> |
|
23 | 23 | <span class="status indeterminate"></span> |
24 | 24 | <?php } else {?> |
25 | 25 | <span class="status error"></span> |
@@ -32,51 +32,51 @@ |
||
32 | 32 | * @since 8.0.0 |
33 | 33 | */ |
34 | 34 | interface ICertificate { |
35 | - /** |
|
36 | - * @return string |
|
37 | - * @since 8.0.0 |
|
38 | - */ |
|
39 | - public function getName(): string; |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + * @since 8.0.0 |
|
38 | + */ |
|
39 | + public function getName(): string; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @return string|null |
|
43 | - * @since 8.0.0 |
|
44 | - */ |
|
45 | - public function getCommonName(): ?string; |
|
41 | + /** |
|
42 | + * @return string|null |
|
43 | + * @since 8.0.0 |
|
44 | + */ |
|
45 | + public function getCommonName(): ?string; |
|
46 | 46 | |
47 | - /** |
|
48 | - * @return string|null |
|
49 | - * @since 8.0.0 |
|
50 | - */ |
|
51 | - public function getOrganization(): ?string; |
|
47 | + /** |
|
48 | + * @return string|null |
|
49 | + * @since 8.0.0 |
|
50 | + */ |
|
51 | + public function getOrganization(): ?string; |
|
52 | 52 | |
53 | - /** |
|
54 | - * @return \DateTime |
|
55 | - * @since 8.0.0 |
|
56 | - */ |
|
57 | - public function getIssueDate(): \DateTime; |
|
53 | + /** |
|
54 | + * @return \DateTime |
|
55 | + * @since 8.0.0 |
|
56 | + */ |
|
57 | + public function getIssueDate(): \DateTime; |
|
58 | 58 | |
59 | - /** |
|
60 | - * @return \DateTime |
|
61 | - * @since 8.0.0 |
|
62 | - */ |
|
63 | - public function getExpireDate(): \DateTime; |
|
59 | + /** |
|
60 | + * @return \DateTime |
|
61 | + * @since 8.0.0 |
|
62 | + */ |
|
63 | + public function getExpireDate(): \DateTime; |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return bool |
|
67 | - * @since 8.0.0 |
|
68 | - */ |
|
69 | - public function isExpired(): bool; |
|
65 | + /** |
|
66 | + * @return bool |
|
67 | + * @since 8.0.0 |
|
68 | + */ |
|
69 | + public function isExpired(): bool; |
|
70 | 70 | |
71 | - /** |
|
72 | - * @return string|null |
|
73 | - * @since 8.0.0 |
|
74 | - */ |
|
75 | - public function getIssuerName(): ?string; |
|
71 | + /** |
|
72 | + * @return string|null |
|
73 | + * @since 8.0.0 |
|
74 | + */ |
|
75 | + public function getIssuerName(): ?string; |
|
76 | 76 | |
77 | - /** |
|
78 | - * @return string|null |
|
79 | - * @since 8.0.0 |
|
80 | - */ |
|
81 | - public function getIssuerOrganization(): ?string; |
|
77 | + /** |
|
78 | + * @return string|null |
|
79 | + * @since 8.0.0 |
|
80 | + */ |
|
81 | + public function getIssuerOrganization(): ?string; |
|
82 | 82 | } |
@@ -32,43 +32,43 @@ |
||
32 | 32 | * @since 8.0.0 |
33 | 33 | */ |
34 | 34 | interface ICertificateManager { |
35 | - /** |
|
36 | - * Returns all certificates trusted by the system |
|
37 | - * |
|
38 | - * @return \OCP\ICertificate[] |
|
39 | - * @since 8.0.0 |
|
40 | - */ |
|
41 | - public function listCertificates(): array; |
|
35 | + /** |
|
36 | + * Returns all certificates trusted by the system |
|
37 | + * |
|
38 | + * @return \OCP\ICertificate[] |
|
39 | + * @since 8.0.0 |
|
40 | + */ |
|
41 | + public function listCertificates(): array; |
|
42 | 42 | |
43 | - /** |
|
44 | - * @param string $certificate the certificate data |
|
45 | - * @param string $name the filename for the certificate |
|
46 | - * @return \OCP\ICertificate |
|
47 | - * @throws \Exception If the certificate could not get added |
|
48 | - * @since 8.0.0 - since 8.1.0 throws exception instead of returning false |
|
49 | - */ |
|
50 | - public function addCertificate(string $certificate, string $name): \OCP\ICertificate; |
|
43 | + /** |
|
44 | + * @param string $certificate the certificate data |
|
45 | + * @param string $name the filename for the certificate |
|
46 | + * @return \OCP\ICertificate |
|
47 | + * @throws \Exception If the certificate could not get added |
|
48 | + * @since 8.0.0 - since 8.1.0 throws exception instead of returning false |
|
49 | + */ |
|
50 | + public function addCertificate(string $certificate, string $name): \OCP\ICertificate; |
|
51 | 51 | |
52 | - /** |
|
53 | - * @param string $name |
|
54 | - * @return bool |
|
55 | - * @since 8.0.0 |
|
56 | - */ |
|
57 | - public function removeCertificate(string $name): bool; |
|
52 | + /** |
|
53 | + * @param string $name |
|
54 | + * @return bool |
|
55 | + * @since 8.0.0 |
|
56 | + */ |
|
57 | + public function removeCertificate(string $name): bool; |
|
58 | 58 | |
59 | - /** |
|
60 | - * Get the path to the certificate bundle |
|
61 | - * |
|
62 | - * @return string |
|
63 | - * @since 8.0.0 |
|
64 | - */ |
|
65 | - public function getCertificateBundle(): string; |
|
59 | + /** |
|
60 | + * Get the path to the certificate bundle |
|
61 | + * |
|
62 | + * @return string |
|
63 | + * @since 8.0.0 |
|
64 | + */ |
|
65 | + public function getCertificateBundle(): string; |
|
66 | 66 | |
67 | - /** |
|
68 | - * Get the full local path to the certificate bundle |
|
69 | - * |
|
70 | - * @return string |
|
71 | - * @since 9.0.0 |
|
72 | - */ |
|
73 | - public function getAbsoluteBundlePath(): string; |
|
67 | + /** |
|
68 | + * Get the full local path to the certificate bundle |
|
69 | + * |
|
70 | + * @return string |
|
71 | + * @since 9.0.0 |
|
72 | + */ |
|
73 | + public function getAbsoluteBundlePath(): string; |
|
74 | 74 | } |
@@ -12,34 +12,34 @@ |
||
12 | 12 | |
13 | 13 | class Version1018Date20210312100735 extends SimpleMigrationStep { |
14 | 14 | |
15 | - /** |
|
16 | - * @param IOutput $output |
|
17 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
18 | - * @param array $options |
|
19 | - * @return ISchemaWrapper |
|
20 | - */ |
|
21 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
22 | - /** @var ISchemaWrapper $schema */ |
|
23 | - $schema = $schemaClosure(); |
|
24 | - |
|
25 | - $calendarsTable = $schema->getTable('calendars'); |
|
26 | - $calendarsTable->addColumn('deleted_at', Types::INTEGER, [ |
|
27 | - 'notnull' => false, |
|
28 | - 'length' => 4, |
|
29 | - 'unsigned' => true, |
|
30 | - ]); |
|
31 | - $calendarsTable->addIndex([ |
|
32 | - 'principaluri', |
|
33 | - 'deleted_at', |
|
34 | - ], 'cals_princ_del_idx'); |
|
35 | - |
|
36 | - $calendarObjectsTable = $schema->getTable('calendarobjects'); |
|
37 | - $calendarObjectsTable->addColumn('deleted_at', Types::INTEGER, [ |
|
38 | - 'notnull' => false, |
|
39 | - 'length' => 4, |
|
40 | - 'unsigned' => true, |
|
41 | - ]); |
|
42 | - |
|
43 | - return $schema; |
|
44 | - } |
|
15 | + /** |
|
16 | + * @param IOutput $output |
|
17 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
18 | + * @param array $options |
|
19 | + * @return ISchemaWrapper |
|
20 | + */ |
|
21 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
22 | + /** @var ISchemaWrapper $schema */ |
|
23 | + $schema = $schemaClosure(); |
|
24 | + |
|
25 | + $calendarsTable = $schema->getTable('calendars'); |
|
26 | + $calendarsTable->addColumn('deleted_at', Types::INTEGER, [ |
|
27 | + 'notnull' => false, |
|
28 | + 'length' => 4, |
|
29 | + 'unsigned' => true, |
|
30 | + ]); |
|
31 | + $calendarsTable->addIndex([ |
|
32 | + 'principaluri', |
|
33 | + 'deleted_at', |
|
34 | + ], 'cals_princ_del_idx'); |
|
35 | + |
|
36 | + $calendarObjectsTable = $schema->getTable('calendarobjects'); |
|
37 | + $calendarObjectsTable->addColumn('deleted_at', Types::INTEGER, [ |
|
38 | + 'notnull' => false, |
|
39 | + 'length' => 4, |
|
40 | + 'unsigned' => true, |
|
41 | + ]); |
|
42 | + |
|
43 | + return $schema; |
|
44 | + } |
|
45 | 45 | } |
@@ -32,10 +32,10 @@ |
||
32 | 32 | */ |
33 | 33 | interface IRestorable { |
34 | 34 | |
35 | - /** |
|
36 | - * Restore this node |
|
37 | - * |
|
38 | - * @throws Exception |
|
39 | - */ |
|
40 | - public function restore(): void; |
|
35 | + /** |
|
36 | + * Restore this node |
|
37 | + * |
|
38 | + * @throws Exception |
|
39 | + */ |
|
40 | + public function restore(): void; |
|
41 | 41 | } |