wip auth gitlab

Gandi · Jan 5, 2016 · 4599eb8 · 4599eb8
1 parent 19053c7
commit 4599eb8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/web.rb b/app/web.rb
@@ -83,7 +83,7 @@ def check_authorization
 
     when 'gitlab'
 
-      set :oauth, Hieraviz::AuthGitlab.new(settings.configdata['oauth2_auth'], session)
+      set :oauth, Hieraviz::AuthGitlab.new(settings.configdata['gitlab_auth'], session)
 
       get '/login' do
         redirect settings.oauth.login_url

diff --git a/lib/hieraviz.rb b/lib/hieraviz.rb
@@ -1,5 +1,6 @@
 require "hieraviz/version"
 require "hieraviz/store"
+require "hieraviz/auth_gitlab"
 
 module Hieraviz
   # Your code goes here...

diff --git a/lib/hieraviz/auth_gitlab.rb b/lib/hieraviz/auth_gitlab.rb
@@ -5,9 +5,9 @@ class AuthGitlab
 
     def initialize(settings, session)
       @@client ||= OAuth2::Client.new(
-        settings.configdata['oauth2_auth']['application_id'], 
-        settings.configdata['oauth2_auth']['secret'], 
-        :site => settings.configdata['oauth2_auth']['host']
+        settings['application_id'], 
+        settings['secret'], 
+        :site => settings['host']
         )
       @session = session
     end