Skip to content

Commit a29bb43

Browse files
committed
Fix more bugs.
1 parent be1a270 commit a29bb43

7 files changed

Lines changed: 207 additions & 251 deletions

File tree

‎src/Application.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,16 @@ public function middleware($middlewareQueue): \Cake\Http\MiddlewareQueue
112112
// Add authorization **after** authentication
113113
->add(new AuthorizationMiddleware($this));
114114

115+
if (Configure::read('debug')) {
116+
// Disable authz for debugkit
117+
$middlewareQueue->add(function ($req, $res, $next) {
118+
if ($req->getParam('plugin') === 'DebugKit') {
119+
$req->getAttribute('authorization')->skipAuthorization();
120+
}
121+
return $next($req, $res);
122+
});
123+
}
124+
115125
return $middlewareQueue;
116126
}
117127

‎src/Controller/ArticlesController.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ class ArticlesController extends AppController
1010
public function index()
1111
{
1212
$this->Authorization->skipAuthorization();
13-
$articles = $this->Paginator->paginate($this->Articles->find());
13+
$articles = $this->paginate($this->Articles->find());
1414
$this->set(compact('articles'));
1515
}
1616

1717
public function view($slug)
1818
{
1919
$this->Authorization->skipAuthorization();
20-
$article = $this->Articles->findBySlug($slug)->firstOrFail();
20+
$article = $this->Articles
21+
->findBySlug($slug)
22+
->contain('Tags')
23+
->firstOrFail();
2124
$this->set(compact('article'));
2225
}
2326

‎src/Controller/UsersController.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ public function login() {
4040
$result = $this->Authentication->getResult();
4141
// regardless of POST or GET, redirect if user is logged in
4242
if ($result->isValid()) {
43-
// redirect to /pages/home after login success
43+
// redirect to /articles after login success
4444
$redirect = $this->request->getQuery('redirect', [
45-
'controller' => 'Pages',
46-
'action' => 'display',
47-
'home',
45+
'controller' => 'Articles',
46+
'action' => 'index',
4847
]);
4948

5049
return $this->redirect($redirect);
@@ -93,13 +92,13 @@ public function add()
9392
{
9493
$this->Authorization->skipAuthorization();
9594

96-
$user = $this->Users->newEntity();
95+
$user = $this->Users->newEmptyEntity();
9796
if ($this->request->is('post')) {
9897
$user = $this->Users->patchEntity($user, $this->request->getData());
9998
if ($this->Users->save($user)) {
10099
$this->Flash->success(__('The user has been saved.'));
101100

102-
return $this->redirect(['action' => 'index']);
101+
return $this->redirect(['action' => 'login']);
103102
}
104103
$this->Flash->error(__('The user could not be saved. Please, try again.'));
105104
}

‎src/Model/Table/TagsTable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function validationDefault(Validator $validator): \Cake\Validation\Valida
7474
* @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
7575
* @return \Cake\ORM\RulesChecker
7676
*/
77-
public function buildRules(\Cake\Event\EventInterface $rules): \Cake\ORM\RulesChecker
77+
public function buildRules(RulesChecker $rules): RulesChecker
7878
{
7979
$rules->add($rules->isUnique(['title']));
8080

‎src/Model/Table/UsersTable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function validationDefault(Validator $validator): \Cake\Validation\Valida
7777
* @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
7878
* @return \Cake\ORM\RulesChecker
7979
*/
80-
public function buildRules(\Cake\Event\EventInterface $rules): \Cake\ORM\RulesChecker
80+
public function buildRules(RulesChecker $rules): RulesChecker
8181
{
8282
$rules->add($rules->isUnique(['email']));
8383

0 commit comments

Comments
 (0)