@@ -63,113 +63,113 @@ |
||
63 | 63 | use OCP\Util; |
64 | 64 | |
65 | 65 | class Application extends App implements IBootstrap { |
66 | - public const APP_ID = 'settings'; |
|
67 | - |
|
68 | - /** |
|
69 | - * @param array $urlParams |
|
70 | - */ |
|
71 | - public function __construct(array $urlParams = []) { |
|
72 | - parent::__construct(self::APP_ID, $urlParams); |
|
73 | - } |
|
74 | - |
|
75 | - public function register(IRegistrationContext $context): void { |
|
76 | - // Register Middleware |
|
77 | - $context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class); |
|
78 | - $context->registerMiddleware(SubadminMiddleware::class); |
|
79 | - $context->registerSearchProvider(SectionSearch::class); |
|
80 | - $context->registerSearchProvider(AppSearch::class); |
|
81 | - |
|
82 | - // Register listeners |
|
83 | - $context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class); |
|
84 | - $context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class); |
|
85 | - $context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class); |
|
86 | - $context->registerEventListener(GroupDeletedEvent::class, GroupRemovedListener::class); |
|
87 | - |
|
88 | - // Register well-known handlers |
|
89 | - $context->registerWellKnownHandler(SecurityTxtHandler::class); |
|
90 | - $context->registerWellKnownHandler(ChangePasswordHandler::class); |
|
91 | - |
|
92 | - /** |
|
93 | - * Core class wrappers |
|
94 | - */ |
|
95 | - /** FIXME: Remove once OC_User is non-static and mockable */ |
|
96 | - $context->registerService('isAdmin', function () { |
|
97 | - return \OC_User::isAdminUser(\OC_User::getUser()); |
|
98 | - }); |
|
99 | - /** FIXME: Remove once OC_SubAdmin is non-static and mockable */ |
|
100 | - $context->registerService('isSubAdmin', function () { |
|
101 | - $userObject = \OC::$server->getUserSession()->getUser(); |
|
102 | - $isSubAdmin = false; |
|
103 | - if ($userObject !== null) { |
|
104 | - $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject); |
|
105 | - } |
|
106 | - return $isSubAdmin; |
|
107 | - }); |
|
108 | - $context->registerService(IProvider::class, function (IAppContainer $appContainer) { |
|
109 | - /** @var IServerContainer $serverContainer */ |
|
110 | - $serverContainer = $appContainer->query(IServerContainer::class); |
|
111 | - return $serverContainer->query(IProvider::class); |
|
112 | - }); |
|
113 | - $context->registerService(IManager::class, function (IAppContainer $appContainer) { |
|
114 | - /** @var IServerContainer $serverContainer */ |
|
115 | - $serverContainer = $appContainer->query(IServerContainer::class); |
|
116 | - return $serverContainer->getSettingsManager(); |
|
117 | - }); |
|
118 | - |
|
119 | - $context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) { |
|
120 | - /** @var Server $server */ |
|
121 | - $server = $appContainer->query(IServerContainer::class); |
|
122 | - /** @var Defaults $defaults */ |
|
123 | - $defaults = $server->query(Defaults::class); |
|
124 | - |
|
125 | - return new NewUserMailHelper( |
|
126 | - $defaults, |
|
127 | - $server->getURLGenerator(), |
|
128 | - $server->getL10NFactory(), |
|
129 | - $server->getMailer(), |
|
130 | - $server->getSecureRandom(), |
|
131 | - new TimeFactory(), |
|
132 | - $server->getConfig(), |
|
133 | - $server->getCrypto(), |
|
134 | - Util::getDefaultEmailAddress('no-reply') |
|
135 | - ); |
|
136 | - }); |
|
137 | - |
|
138 | - $context->registerUserMigrator(AccountMigrator::class); |
|
139 | - } |
|
140 | - |
|
141 | - public function boot(IBootContext $context): void { |
|
142 | - Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword'); |
|
143 | - Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo'); |
|
144 | - } |
|
145 | - |
|
146 | - /** |
|
147 | - * @param array $parameters |
|
148 | - * @throws \InvalidArgumentException |
|
149 | - * @throws \BadMethodCallException |
|
150 | - * @throws \Exception |
|
151 | - * @throws \OCP\AppFramework\QueryException |
|
152 | - */ |
|
153 | - public function onChangePassword(array $parameters) { |
|
154 | - /** @var Hooks $hooks */ |
|
155 | - $hooks = $this->getContainer()->query(Hooks::class); |
|
156 | - $hooks->onChangePassword($parameters['uid']); |
|
157 | - } |
|
158 | - |
|
159 | - /** |
|
160 | - * @param array $parameters |
|
161 | - * @throws \InvalidArgumentException |
|
162 | - * @throws \BadMethodCallException |
|
163 | - * @throws \Exception |
|
164 | - * @throws \OCP\AppFramework\QueryException |
|
165 | - */ |
|
166 | - public function onChangeInfo(array $parameters) { |
|
167 | - if ($parameters['feature'] !== 'eMailAddress') { |
|
168 | - return; |
|
169 | - } |
|
170 | - |
|
171 | - /** @var Hooks $hooks */ |
|
172 | - $hooks = $this->getContainer()->query(Hooks::class); |
|
173 | - $hooks->onChangeEmail($parameters['user'], $parameters['old_value']); |
|
174 | - } |
|
66 | + public const APP_ID = 'settings'; |
|
67 | + |
|
68 | + /** |
|
69 | + * @param array $urlParams |
|
70 | + */ |
|
71 | + public function __construct(array $urlParams = []) { |
|
72 | + parent::__construct(self::APP_ID, $urlParams); |
|
73 | + } |
|
74 | + |
|
75 | + public function register(IRegistrationContext $context): void { |
|
76 | + // Register Middleware |
|
77 | + $context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class); |
|
78 | + $context->registerMiddleware(SubadminMiddleware::class); |
|
79 | + $context->registerSearchProvider(SectionSearch::class); |
|
80 | + $context->registerSearchProvider(AppSearch::class); |
|
81 | + |
|
82 | + // Register listeners |
|
83 | + $context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class); |
|
84 | + $context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class); |
|
85 | + $context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class); |
|
86 | + $context->registerEventListener(GroupDeletedEvent::class, GroupRemovedListener::class); |
|
87 | + |
|
88 | + // Register well-known handlers |
|
89 | + $context->registerWellKnownHandler(SecurityTxtHandler::class); |
|
90 | + $context->registerWellKnownHandler(ChangePasswordHandler::class); |
|
91 | + |
|
92 | + /** |
|
93 | + * Core class wrappers |
|
94 | + */ |
|
95 | + /** FIXME: Remove once OC_User is non-static and mockable */ |
|
96 | + $context->registerService('isAdmin', function () { |
|
97 | + return \OC_User::isAdminUser(\OC_User::getUser()); |
|
98 | + }); |
|
99 | + /** FIXME: Remove once OC_SubAdmin is non-static and mockable */ |
|
100 | + $context->registerService('isSubAdmin', function () { |
|
101 | + $userObject = \OC::$server->getUserSession()->getUser(); |
|
102 | + $isSubAdmin = false; |
|
103 | + if ($userObject !== null) { |
|
104 | + $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject); |
|
105 | + } |
|
106 | + return $isSubAdmin; |
|
107 | + }); |
|
108 | + $context->registerService(IProvider::class, function (IAppContainer $appContainer) { |
|
109 | + /** @var IServerContainer $serverContainer */ |
|
110 | + $serverContainer = $appContainer->query(IServerContainer::class); |
|
111 | + return $serverContainer->query(IProvider::class); |
|
112 | + }); |
|
113 | + $context->registerService(IManager::class, function (IAppContainer $appContainer) { |
|
114 | + /** @var IServerContainer $serverContainer */ |
|
115 | + $serverContainer = $appContainer->query(IServerContainer::class); |
|
116 | + return $serverContainer->getSettingsManager(); |
|
117 | + }); |
|
118 | + |
|
119 | + $context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) { |
|
120 | + /** @var Server $server */ |
|
121 | + $server = $appContainer->query(IServerContainer::class); |
|
122 | + /** @var Defaults $defaults */ |
|
123 | + $defaults = $server->query(Defaults::class); |
|
124 | + |
|
125 | + return new NewUserMailHelper( |
|
126 | + $defaults, |
|
127 | + $server->getURLGenerator(), |
|
128 | + $server->getL10NFactory(), |
|
129 | + $server->getMailer(), |
|
130 | + $server->getSecureRandom(), |
|
131 | + new TimeFactory(), |
|
132 | + $server->getConfig(), |
|
133 | + $server->getCrypto(), |
|
134 | + Util::getDefaultEmailAddress('no-reply') |
|
135 | + ); |
|
136 | + }); |
|
137 | + |
|
138 | + $context->registerUserMigrator(AccountMigrator::class); |
|
139 | + } |
|
140 | + |
|
141 | + public function boot(IBootContext $context): void { |
|
142 | + Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword'); |
|
143 | + Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo'); |
|
144 | + } |
|
145 | + |
|
146 | + /** |
|
147 | + * @param array $parameters |
|
148 | + * @throws \InvalidArgumentException |
|
149 | + * @throws \BadMethodCallException |
|
150 | + * @throws \Exception |
|
151 | + * @throws \OCP\AppFramework\QueryException |
|
152 | + */ |
|
153 | + public function onChangePassword(array $parameters) { |
|
154 | + /** @var Hooks $hooks */ |
|
155 | + $hooks = $this->getContainer()->query(Hooks::class); |
|
156 | + $hooks->onChangePassword($parameters['uid']); |
|
157 | + } |
|
158 | + |
|
159 | + /** |
|
160 | + * @param array $parameters |
|
161 | + * @throws \InvalidArgumentException |
|
162 | + * @throws \BadMethodCallException |
|
163 | + * @throws \Exception |
|
164 | + * @throws \OCP\AppFramework\QueryException |
|
165 | + */ |
|
166 | + public function onChangeInfo(array $parameters) { |
|
167 | + if ($parameters['feature'] !== 'eMailAddress') { |
|
168 | + return; |
|
169 | + } |
|
170 | + |
|
171 | + /** @var Hooks $hooks */ |
|
172 | + $hooks = $this->getContainer()->query(Hooks::class); |
|
173 | + $hooks->onChangeEmail($parameters['user'], $parameters['old_value']); |
|
174 | + } |
|
175 | 175 | } |
@@ -34,18 +34,18 @@ |
||
34 | 34 | |
35 | 35 | class ChangePasswordHandler implements IHandler { |
36 | 36 | |
37 | - private IURLGenerator $urlGenerator; |
|
37 | + private IURLGenerator $urlGenerator; |
|
38 | 38 | |
39 | - public function __construct(IURLGenerator $urlGenerator) { |
|
40 | - $this->urlGenerator = $urlGenerator; |
|
41 | - } |
|
39 | + public function __construct(IURLGenerator $urlGenerator) { |
|
40 | + $this->urlGenerator = $urlGenerator; |
|
41 | + } |
|
42 | 42 | |
43 | - public function handle(string $service, IRequestContext $context, ?IResponse $previousResponse): ?IResponse { |
|
44 | - if ($service !== 'change-password') { |
|
45 | - return $previousResponse; |
|
46 | - } |
|
43 | + public function handle(string $service, IRequestContext $context, ?IResponse $previousResponse): ?IResponse { |
|
44 | + if ($service !== 'change-password') { |
|
45 | + return $previousResponse; |
|
46 | + } |
|
47 | 47 | |
48 | - $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'security'])); |
|
49 | - return new GenericResponse($response); |
|
50 | - } |
|
48 | + $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'security'])); |
|
49 | + return new GenericResponse($response); |
|
50 | + } |
|
51 | 51 | } |