Grabbing latest changes

CHANGELOG

@@ -1,5 +1,30 @@
 Hybridauth Change log
 =====================
+2.6.0 - [not released]
+      New providers:
+        #546 + #547 - GitLab OAuth2
+        #577 - MixCloud
+      Updates:
+        Updated LightOpenID to 1.2.0
+        #572 - Add cURL timeouts for OpenID
+        #582 - [Facebook] read_stream removed
+      Changes:
+        #567 - [Odnoklassniki] Get better size of user avatar
+        #570 - [odnoklassniki] Improve error reporting
+        #571 - [Hybrid_Endpoint] Improve error reporting
+      Fixes:
+        #575 - [Steam] Fix Steam profileUrl
+        #578 - [Odnoklassniki] new link
+
+2.5.1 - October 12 2015
+      Fixes:
+        #542 - [XING] updated provider to 1.1.0
+        #549 - Update Auth.php library version
+        #558 - [XING] Fix typo
+        #559 - [VKontakte] Fix warnings for getUserByResponse() for undefined City and Country
+        #560 - [Drupal module] Require OAuth.php only if not exist
+        #564 - Fix DateTime error in Logger
+
 2.5.0 - September 7 2015
       New:
         #444 + #445 - Slack provider

README.md

@@ -1,4 +1,4 @@
-# HybridAuth 2.5.0
+# HybridAuth 2.6.0-dev
 
 [![Join the chat at https://gitter.im/hybridauth/hybridauth](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hybridauth/hybridauth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -16,8 +16,7 @@ HybridAuth repository is made up of several projects:
 
 - **HybridAuth Core library** includes OpenID, Facebook, Twitter, LinkedIn, Google, Yahoo, Windows Live, Foursquare and AOL.
 - **The additional providers project** contains many others services
-  which you may want to use,
-- **Examples and demos** contains five examples for you to test,
+  which you may want to use.
 
 ## Getting Started
 

additional-providers/hybridauth-gitlab/Providers/GitLab.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Hybrid_Providers_GitLab - GitLab.com provider adapter based on the OAuth2 protocol.
+ */
+class Hybrid_Providers_GitLab extends Hybrid_Provider_Model_OAuth2
+{
+	// default permissions
+	// (no scope) => public read-only access (includes public user profile info, public repo info, and gists).
+	public $scope = "api";
+
+	/**
+	* IDp wrappers initializer
+	*/
+	function initialize()
+	{
+		parent::initialize();
+
+		// Provider api end-points
+		$this->api->api_base_url  = "https://gitlab.com/";
+		$this->api->authorize_url = "https://gitlab.com/oauth/authorize";
+		$this->api->token_url     = "https://gitlab.com/oauth/token";
+	}
+
+	/**
+	* load the user profile from the IDp api client
+	*/
+	function getUserProfile()
+	{
+		$data = $this->api->api( "api/v3/user" );
+
+		if ( ! isset( $data->id ) ){
+			throw new Exception( "User profile request failed! {$this->providerId} returned an invalid response.", 6 );
+		}
+
+		$this->user->profile->identifier  = @ $data->id;
+		$this->user->profile->displayName = @ $data->name;
+		$this->user->profile->description = @ $data->bio;
+		$this->user->profile->photoURL    = @ $data->avatar_url;
+		$this->user->profile->profileURL  = @ $data->html_url;
+		$this->user->profile->email       = @ $data->email;
+		$this->user->profile->webSiteURL  = @ $data->website_ur;
+		$this->user->profile->region      = @ $data->location;
+
+		if( empty($this->user->profile->displayName) ){
+			$this->user->profile->displayName = @ $data->username;
+		}
+
+		return $this->user->profile;
+	}
+}

additional-providers/hybridauth-mixcloud/Providers/MixCloud.php

@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Hybrid_Providers_MixCloud - MixCloud provider adapter based on OAuth2 protocol
+ */
+class Hybrid_Providers_MixCloud extends Hybrid_Provider_Model_OAuth2
+{
+    // default permissions
+    public $scope = "";
+
+    public static $_profileData = null;
+
+
+    /**
+     * Initializer
+     */
+    function initialize()
+    {
+        parent::initialize();
+
+        $this->api->api_base_url = 'https://api.mixcloud.com';
+        $this->api->authorize_url = 'https://www.mixcloud.com/oauth/authorize';
+        $this->api->token_url = 'https://www.mixcloud.com/oauth/access_token';
+
+        $this->api->curl_authenticate_method = "POST";
+    }
+
+    /**
+     * Begin login step
+     */
+    function loginBegin()
+    {
+        // redirect the user to the provider authentication url
+        Hybrid_Auth::redirect($this->api->authorizeUrl());
+    }
+
+    /**
+     * @param $url endpoint relative URL
+     * @param null $params any request params
+     * @param bool|false $metadata Get metadata from API
+     * @return mixed
+     */
+    function request($url, $params = null, $metadata = false)
+    {
+        $ch = curl_init();
+
+        $url = $url . '?access_token=' . $this->api->access_token;
+
+        if ($metadata)
+        {
+            $params['metadata'] = 1;
+        }
+
+        if ($params)
+        {
+            $url = $url . ( strpos( $url, '?' ) ? '&' : '?' ) . http_build_query($params, '', '&');
+        }
+        $url = $this->api->api_base_url . '/' . $url;
+
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_URL, $url);
+        $data = curl_exec($ch);
+        curl_close($ch);
+
+        $data = json_decode($data, true);
+        return $data;
+    }
+
+    /**
+     * Returns user`s data
+     * @param bool|false $metadata
+     * @return mixed
+     */
+    function getUser($metadata = false)
+    {
+        $result = $this->request('me/', null, $metadata);
+        return $result;
+    }
+}