Merge branch 'master' of github.com:cosmocode/dokuwiki-plugin-oauth into master

Author: RyanTheAllmighty

auth.php

@@ -294,7 +294,13 @@ protected function addUser(&$uinfo, $servicename) {
  * @return bool|string
  */
  protected function getUserByEmail($mail) {
- if($this->users === null) $this->_loadUserData();
+ if($this->users === null){
+ if(is_callable([$this, '_loadUserData'])) {
+ $this->_loadUserData();
+ } else {
+ $this->loadUserData();
+ }
+ }
  $mail = strtolower($mail);
 
  foreach($this->users as $user => $uinfo) {
@@ -395,7 +401,7 @@ public function modifyUser($user, $changes) {
 
  if(isset($changes['mail'])) {
  $found = $this->getUserByEmail($changes['mail']);
- if($found != $user) {
+ if($found && $found != $user) {
  msg($this->getLang('emailduplicate'), -1);
  return false;
  }

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

@@ -167,6 +167,8 @@ public function request($path, $method = 'GET', $body = null, array $extraHeader
  $uri->addToQuery('apikey', $token->getAccessToken());
  } elseif (static::AUTHORIZATION_METHOD_HEADER_BEARER === $this->getAuthorizationMethod()) {
  $extraHeaders = array_merge(array('Authorization' => 'Bearer ' . $token->getAccessToken()), $extraHeaders);
+ } elseif (static::AUTHORIZATION_METHOD_HEADER_TOKEN === $this->getAuthorizationMethod()) {
+ $extraHeaders = array_merge(array('Authorization' => 'token ' . $token->getAccessToken()), $extraHeaders);
  }
 
  $extraHeaders = array_merge($this->getExtraApiHeaders(), $extraHeaders);

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

@@ -122,7 +122,7 @@ public function getAccessTokenEndpoint()
  */
  protected function getAuthorizationMethod()
  {
- return static::AUTHORIZATION_METHOD_QUERY_STRING;
+ return static::AUTHORIZATION_METHOD_HEADER_TOKEN;
  }
 
  /**

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

@@ -23,6 +23,7 @@ interface ServiceInterface extends BaseServiceInterface
  const AUTHORIZATION_METHOD_QUERY_STRING = 2;
  const AUTHORIZATION_METHOD_QUERY_STRING_V2 = 3;
  const AUTHORIZATION_METHOD_QUERY_STRING_V3 = 4;
+ const AUTHORIZATION_METHOD_HEADER_TOKEN = 5;
 
  /**
  * Retrieves and stores/returns the OAuth2 access token after a successful authorization.

plugin.info.txt

@@ -1,7 +1,7 @@
 base oauthatlauncher
 author Ryan Dowling
 email ryan.dowling@atlauncher.com
-date 2019-06-08
+date 2020-08-05
 name oauth plugin for ATLauncher
 desc oAuth plugin to login via ATLauncher
-url https://www.atlauncher.com
+url https://atlauncher.com