Bug 1676223: Check token is supplied first

Before checking that it is in database and is unique

behatnotneeded

Change-Id: I3c51b228361ad10c567f6af04148246a95fed096
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/auth/webservice/lang/en.utf8/auth.webservice.php

@@ -144,6 +144,7 @@ $string['owner'] = 'Owner';
 $string['servicename'] = 'Service';
 $string['generate'] = 'Generate token';
 $string['invalidtoken'] = 'Invalid token selected';
+$string['invalidtokennotsuppied'] = 'Invalid token selected or none supplied';
 $string['token'] = 'Token';
 $string['tokenid'] = 'Token "%s"';
 $string['invaliduserselected'] = 'Invalid user selected';

htdocs/webservice/lib.php

@@ -1030,6 +1030,10 @@ abstract class webservice_server implements webservice_server_interface {
             return $user;
         }
 
+        if (empty($this->token)) {
+            // log failed login attempts
+            throw new WebserviceAccessException(get_string('invalidtokennotsupplied', 'auth.webservice'));
+        }
 
         $token = get_record('external_tokens', 'token', $this->token);
         if (!$token) {