Use API v4 by default

Author: linchus

README.md

@@ -31,12 +31,35 @@ Or install it yourself as:
 ## Standalone Usage
 
     use OmniAuth::Builder do
-      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'], 
-                                client_options: {
-                                     site: 'https://gitlab.YOURDOMAIN.com',
-                                     authorize_url: '/oauth/authorize',
-                                     token_url: '/oauth/token'
-                                 }      
+      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'],
+        {
+           client_options: {
+             site: 'https://gitlab.YOURDOMAIN.com/api/v4'
+           }
+        }
+    end
+
+## Custom scopes
+
+    use OmniAuth::Builder do
+      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'], scope: 'read_user openid'
+    end
+
+## Old API version
+
+API V3 will be unsupported from GitLab 9.5 and will be removed in GitLab 9.5 or later.
+
+[https://gitlab.com/help/api/v3_to_v4.md](https://gitlab.com/help/api/v3_to_v4.md)
+
+If you use GitLab 9.0 and below you could configure V3 API:
+
+    use OmniAuth::Builder do
+      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'],
+        {
+           client_options: {
+             site: 'https://gitlab.YOURDOMAIN.com/api/v3'
+           }
+        }
     end
 
 ## Contributing

lib/omniauth/strategies/gitlab.rb

@@ -4,23 +4,18 @@
 module OmniAuth
   module Strategies
     class GitLab < OmniAuth::Strategies::OAuth2
-
-      option :client_options, {
-          site: 'https://gitlab.com',
-          authorize_url: '/oauth/authorize',
-          token_url: '/oauth/token'
-      }
+      option :client_options, site: 'https://gitlab.com/api/v4'
 
       option :redirect_url
 
       uid { raw_info['id'].to_s }
 
       info do
         {
-            name:     raw_info['name'],
-            username: raw_info['username'],
-            email:    raw_info['email'],
-            image:    raw_info['avatar_url']
+          name: raw_info['name'],
+          username: raw_info['username'],
+          email: raw_info['email'],
+          image: raw_info['avatar_url']
         }
       end
 
@@ -29,7 +24,7 @@ class GitLab < OmniAuth::Strategies::OAuth2
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/v3/user').parsed
+        @raw_info ||= access_token.get('user').parsed
       end
 
       private
@@ -41,5 +36,4 @@ def callback_url
   end
 end
 
-
 OmniAuth.config.add_camelization 'gitlab', 'GitLab'