Ignore empty , throw ApiException for all AUTH_ERROR instances

2 files changed, 3 insertions, 3 deletions

diff --git a/app/Factories/LinkFactory.php b/app/Factories/LinkFactory.php
index 21a3bc7..2320613 100644
--- a/app/Factories/LinkFactory.php
+++ b/app/Factories/LinkFactory.php
@@ -55,14 +55,14 @@ class LinkFactory {
                 looks like a shortened URL.');
         }
 
-        if (!$is_secret && (!isset($custom_ending)) && (LinkHelper::longLinkExists($long_url) !== false)) {
+        if (!$is_secret && (!isset($custom_ending) || $custom_ending === '') && (LinkHelper::longLinkExists($long_url) !== false)) {
             // if link is not specified as secret, is non-custom, and
             // already exists in Polr, lookup the value and return
             $existing_link = LinkHelper::longLinkExists($long_url);
             return self::formatLink($existing_link);
         }
 
-        if (isset($custom_ending)) {
+        if (isset($custom_ending) && $custom_ending !== '') {
             // has custom ending
             $ending_conforms = LinkHelper::validateEnding($custom_ending);
             if (!$ending_conforms) {
diff --git a/app/Http/Middleware/ApiMiddleware.php b/app/Http/Middleware/ApiMiddleware.php
index 6c4e5eb..bbab80c 100644
--- a/app/Http/Middleware/ApiMiddleware.php
+++ b/app/Http/Middleware/ApiMiddleware.php
@@ -33,7 +33,7 @@ class ApiMiddleware {
                 ->first();
 
             if (!$user) {
-                abort(401, "Invalid authentication token.");
+                throw new ApiException('AUTH_ERROR', 'Authentication token required.', 401, $response_type);
             }
             $username = $user->username;
         }