interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.0

Browse Source
This commit is contained in:
Bastian Allgeier
2019-01-15 11:43:30 +01:00
parent 8070893b64
commit f596ff5c4c
5 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kirby/config/api/routes/auth.php
View File

@@ -35,12 +35,16 @@ return [
$long = $this->requestBody('long');
$password = $this->requestBody('password');
if ($user = $this->kirby()->auth()->login($email, $password, $long)) {
return [
'code' => 200,
'status' => 'ok',
'user' => $this->resolve($user)->view('auth')->toArray()
];
try {
if ($user = $this->kirby()->auth()->login($email, $password, $long)) {
return [
'code' => 200,
'status' => 'ok',
'user' => $this->resolve($user)->view('auth')->toArray()
];
}
} catch (Throwable $e) {
// catch any kind of login error
}
throw new InvalidArgumentException('Invalid email or password');

16
kirby/config/helpers.php
View File

@@ -97,7 +97,13 @@ function css($url, $options = null)
$url = $component($kirby, $url, $options);
}
$url = $url === '@auto' ? Url::toTemplateAsset('css/templates', 'css') : Url::to($url);
if ($url === '@auto') {
if (!$url = Url::toTemplateAsset('css/templates', 'css')) {
return null;
}
}
$url = Url::to($url);
$attr = array_merge((array)$options, [
'href' => $url,
'rel' => 'stylesheet'
@@ -345,7 +351,13 @@ function js($url, $options = null)
$url = $component($kirby, $url, $options);
}
$url = $url === '@auto' ? Url::toTemplateAsset('js/templates', 'js') : Url::to($url);
if ($url === '@auto') {
if (!$url = Url::toTemplateAsset('js/templates', 'js')) {
return null;
}
}
$url = Url::to($url);
$attr = array_merge((array)$options, ['src' => $url]);
return '<script ' . attr($attr) . '></script>';