feat: update url for ATLauncher oauth base

Author: RyanTheAllmighty

classes/ATLauncherAdapter.php

@@ -17,7 +17,7 @@ public function getUser() {
  $JSON = new \JSON(JSON_LOOSE_TYPE);
  $data = array();
 
- $response = $this->oAuth->request('/oauth/me');
+ $response = $this->oAuth->request('https://atlauncher.com/admin/oauth/me');
  $result = $JSON->decode($response);
 
  if( !empty($result['username']) )

conf/default.php

@@ -5,6 +5,6 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 
-$conf['client-key']  = '';
-$conf['client-secret']  = '';
-$conf['register-on-auth']  = 0;
+$conf['client-key'] = '';
+$conf['client-secret'] = '';
+$conf['register-on-auth'] = 0;

conf/metadata.php

@@ -25,7 +25,7 @@ public function html(&$plugin, $echo = false) {
 
 }
 
-$meta['info']  = array('plugin_oauthatlauncher');
-$meta['client-key']  = array('string');
-$meta['client-secret']  = array('string');
-$meta['register-on-auth']  = array('onoff','_caution' => 'security');
+$meta['info'] = array('plugin_oauthatlauncher');
+$meta['client-key'] = array('string');
+$meta['client-secret'] = array('string');
+$meta['register-on-auth'] = array('onoff','_caution' => 'security');

helper.php

@@ -42,8 +42,8 @@ public function loadService(&$servicename) {
 
  // The generic service can be externally configured
  if(is_a($service->oAuth, 'OAuth\\OAuth2\\Service\\Generic')) {
- $service->oAuth->setAuthorizationEndpoint("https://admin.atlauncher.com/oauth/authorize");
- $service->oAuth->setAccessTokenEndpoint("https://admin.atlauncher.com/oauth/access_token");
+ $service->oAuth->setAuthorizationEndpoint("https://atlauncher.com/admin/oauth/authorize");
+ $service->oAuth->setAccessTokenEndpoint("https://atlauncher.com/admin/oauth/token");
  }
 
  return $service;

phpoauthlib/src/OAuth/OAuth2/Service/ATLauncher.php

@@ -26,7 +26,7 @@ public function __construct(
  parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
 
  if (null === $baseApiUri) {
- $this->baseApiUri = new Uri('https://admin.atlauncher.com/');
+ $this->baseApiUri = new Uri('https://atlauncher.com/admin/oauth');
  }
  }
 
@@ -35,23 +35,23 @@ public function __construct(
  */
  protected function getAuthorizationMethod()
  {
- return static::AUTHORIZATION_METHOD_QUERY_STRING;
+ return static::AUTHORIZATION_METHOD_HEADER_BEARER;
  }
 
  /**
  * {@inheritdoc}
  */
  public function getAuthorizationEndpoint()
  {
- return new Uri('https://admin.atlauncher.com/oauth/authorize');
+ return new Uri('https://atlauncher.com/admin/oauth/authorize');
  }
 
  /**
  * {@inheritdoc}
  */
  public function getAccessTokenEndpoint()
  {
- return new Uri('https://admin.atlauncher.com/oauth/access_token');
+ return new Uri('https://atlauncher.com/admin/oauth/token');
  }
 
  /**
@@ -70,8 +70,8 @@ protected function parseAccessTokenResponse($responseBody)
  $token = new StdOAuth2Token();
  $token->setAccessToken($data['access_token']);
 
- if (isset($data['expires'])) {
- $token->setLifeTime($data['expires']);
+ if (isset($data['expires_in'])) {
+ $token->setLifeTime($data['expires_in']);
  }
 
  if (isset($data['refresh_token'])) {
@@ -80,7 +80,7 @@ protected function parseAccessTokenResponse($responseBody)
  }
 
  unset($data['access_token']);
- unset($data['expires']);
+ unset($data['expires_in']);
 
  $token->setExtraParams($data);