#304 Update OAuth and API URLs with correct prefixes

pkp · Dec 11, 2023 · f89d1dd · f89d1dd
1 parent 9108212
commit f89d1dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/OrcidProfilePlugin.inc.php b/OrcidProfilePlugin.inc.php
@@ -21,8 +21,8 @@
 
 define('ORCID_URL', 'https://orcid.org/');
 define('ORCID_URL_SANDBOX', 'https://sandbox.orcid.org/');
-define('ORCID_API_URL_PUBLIC', 'https://orcid.org/');
-define('ORCID_API_URL_PUBLIC_SANDBOX', 'https://sandbox.orcid.org/');
+define('ORCID_API_URL_PUBLIC', 'https://pub.orcid.org/');
+define('ORCID_API_URL_PUBLIC_SANDBOX', 'https://pub.sandbox.orcid.org/');
 define('ORCID_API_URL_MEMBER', 'https://api.orcid.org/');
 define('ORCID_API_URL_MEMBER_SANDBOX', 'https://api.sandbox.orcid.org/');
 define('ORCID_API_VERSION_URL', 'v3.0/');
@@ -192,9 +192,9 @@ function getSetting($contextId, $name) {
 
 		$config_value = $config_value ?? parent::getSetting($contextId, $name);
 		if ($name == 'orcidProfileAPIPath') {
-			if ($config_value == 'https://pub.orcid.org/') {
+			if ($config_value == 'https://orcid.org/') {
 				$config_value = ORCID_API_URL_PUBLIC;
-			} elseif ($config_value == 'https://pub.sandbox.orcid.org/') {
+			} elseif ($config_value == 'https://sandbox.orcid.org/') {
 				$config_value = ORCID_API_URL_PUBLIC_SANDBOX;
 			}
 		}

diff --git a/pages/OrcidHandler.inc.php b/pages/OrcidHandler.inc.php
@@ -67,7 +67,7 @@ function orcidAuthorize($args, $request)
 		// API request: Get an OAuth token and ORCID.
 		$response = $httpClient->request(
 			'POST',
-			$url = $plugin->getSetting($contextId, 'orcidProfileAPIPath') . OAUTH_TOKEN_URL,
+			$url = $plugin->getOrcidUrl() . OAUTH_TOKEN_URL,
 			[
 				'form_params' => [
 					'code' => $request->getUserVar('code'),
@@ -254,7 +254,7 @@ function orcidVerify($args, $request)
 		}
 
 		// fetch the access token
-		$url = $plugin->getSetting($contextId, 'orcidProfileAPIPath') . OAUTH_TOKEN_URL;
+		$url = $plugin->getOrcidUrl() . OAUTH_TOKEN_URL;
 
 		$httpClient = Application::get()->getHttpClient();
 		$header = ['Accept' => 'application/json'];