Fix redirect on login and update version number

getkirby · Jan 15, 2019 · 72f01ea · 72f01ea
1 parent e8b7336
commit 72f01ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "getkirby/cms",
   "description": "The Kirby 3 core",
-  "version": "3.0.0-RC-6.0",
+  "version": "3.0.0",
   "license": "proprietary",
   "keywords": ["kirby", "cms", "core"],
   "homepage": "https://getkirby.com",

diff --git a/config/api/routes/auth.php b/config/api/routes/auth.php
@@ -35,12 +35,16 @@
             $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');