Ver código fonte

token api change

CauseFX 4 anos atrás
pai
commit
ba1ab323ba
2 arquivos alterados com 11 adições e 8 exclusões
  1. 10 7
      api/classes/organizr.class.php
  2. 1 1
      api/v2/routes/token.php

+ 10 - 7
api/classes/organizr.class.php

@@ -1163,7 +1163,7 @@ class Organizr
 		}
 	}
 	
-	public function validateToken($token)
+	public function validateToken($token, $api = false)
 	{
 		// Validate script
 		$userInfo = $this->jwtParse($token);
@@ -1174,8 +1174,9 @@ class Organizr
 			$tokenCheck = ($this->searchArray($allTokens, 'token', $token) !== false);
 			if (!$tokenCheck) {
 				$this->invalidToken($token);
-				$this->setResponse(403, 'Token was no in approved list');
-				$this->debug('Token was no in approved list');
+				if ($api) {
+					$this->setResponse(403, 'Token was no in approved list');
+				}
 				return false;
 			} else {
 				$this->setResponse(200, 'Token is valid');
@@ -1197,12 +1198,14 @@ class Organizr
 				);
 			}
 		} else {
-			$this->setResponse(403, 'Token was invalid');
-			$this->debug('Token was invalid');
+			if ($api) {
+				$this->setResponse(403, 'Token was invalid');
+			}
 			$this->invalidToken($token);
 		}
-		$this->setResponse(403, 'Token was invalid.');
-		$this->debug('Token was invalid.');
+		if ($api) {
+			$this->setResponse(403, 'Token was invalid');
+		}
 		return false;
 	}
 	

+ 1 - 1
api/v2/routes/token.php

@@ -12,7 +12,7 @@ $app->get('/token/me', function ($request, $response, $args) {
 $app->post('/token/validate', function ($request, $response, $args) {
 	$Organizr = ($request->getAttribute('Organizr')) ?? new Organizr();
 	if ($Organizr->qualifyRequest(999, true)) {
-		$GLOBALS['api']['response']['data'] = $Organizr->validateToken($_REQUEST["Token"]);
+		$GLOBALS['api']['response']['data'] = $Organizr->validateToken($_REQUEST["Token"], true);
 	}
 	$response->getBody()->write(jsonE($GLOBALS['api']));
 	return $response