From 7b92b4e3cdb8f98f84587895fca46df77e950f05 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Tue, 14 Oct 2014 14:19:18 -0300
Subject: [PATCH] oauth_provider: use noosfero layout in doorkeeper views

---
 plugins/oauth_client/lib/omniauth/strategies/noosfero_oauth2.rb                         |  4 ++++
 plugins/oauth_provider/controllers/doorkeeper/application_controller.rb                 |  8 ++++++++
 plugins/oauth_provider/controllers/oauth_provider_applications_controller.rb            |  9 +++++++++
 plugins/oauth_provider/controllers/oauth_provider_authorized_applications_controller.rb |  6 ++++++
 plugins/oauth_provider/controllers/oauth_provider_plugin_admin_controller.rb            |  6 ++++++
 plugins/oauth_provider/lib/oauth_provider_plugin.rb                                     | 13 +++++++++++--
 plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb                 | 11 +++++++++++
 7 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
 create mode 100644 plugins/oauth_provider/controllers/oauth_provider_applications_controller.rb
 create mode 100644 plugins/oauth_provider/controllers/oauth_provider_authorized_applications_controller.rb
 create mode 100644 plugins/oauth_provider/controllers/oauth_provider_plugin_admin_controller.rb
 create mode 100644 plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb

diff --git a/plugins/oauth_client/lib/omniauth/strategies/noosfero_oauth2.rb b/plugins/oauth_client/lib/omniauth/strategies/noosfero_oauth2.rb
index 433307e..b223e53 100644
--- a/plugins/oauth_client/lib/omniauth/strategies/noosfero_oauth2.rb
+++ b/plugins/oauth_client/lib/omniauth/strategies/noosfero_oauth2.rb
@@ -4,6 +4,10 @@ module OmniAuth
   module Strategies
     class NoosferoOauth2 < OmniAuth::Strategies::OAuth2
       option :name, :noosfero_oauth2
+      option :client_options, {
+        :authorize_url => '/oauth_provider/oauth/authorize',
+        :token_url     => '/oauth_provider/oauth/token'
+      }
 
       uid { raw_info["id"] }
 
diff --git a/plugins/oauth_provider/controllers/doorkeeper/application_controller.rb b/plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
new file mode 100644
index 0000000..75ac214
--- /dev/null
+++ b/plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
@@ -0,0 +1,8 @@
+module Doorkeeper
+  class ApplicationController < ApplicationController
+
+    include Helpers::Controller
+    helper 'doorkeeper/form_errors'
+
+  end
+end
diff --git a/plugins/oauth_provider/controllers/oauth_provider_applications_controller.rb b/plugins/oauth_provider/controllers/oauth_provider_applications_controller.rb
new file mode 100644
index 0000000..49b07b9
--- /dev/null
+++ b/plugins/oauth_provider/controllers/oauth_provider_applications_controller.rb
@@ -0,0 +1,9 @@
+class OauthProviderApplicationsController < Doorkeeper::ApplicationsController
+
+  no_design_blocks
+  layout :get_layout
+
+  def show
+  end
+
+end
diff --git a/plugins/oauth_provider/controllers/oauth_provider_authorized_applications_controller.rb b/plugins/oauth_provider/controllers/oauth_provider_authorized_applications_controller.rb
new file mode 100644
index 0000000..4f71984
--- /dev/null
+++ b/plugins/oauth_provider/controllers/oauth_provider_authorized_applications_controller.rb
@@ -0,0 +1,6 @@
+class OauthProviderAuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
+
+  no_design_blocks
+  layout :get_layout
+
+end
diff --git a/plugins/oauth_provider/controllers/oauth_provider_plugin_admin_controller.rb b/plugins/oauth_provider/controllers/oauth_provider_plugin_admin_controller.rb
new file mode 100644
index 0000000..3969069
--- /dev/null
+++ b/plugins/oauth_provider/controllers/oauth_provider_plugin_admin_controller.rb
@@ -0,0 +1,6 @@
+class OauthProviderPluginAdminController < AdminController
+
+  def index
+  end
+
+end
diff --git a/plugins/oauth_provider/lib/oauth_provider_plugin.rb b/plugins/oauth_provider/lib/oauth_provider_plugin.rb
index 28f3900..6655461 100644
--- a/plugins/oauth_provider/lib/oauth_provider_plugin.rb
+++ b/plugins/oauth_provider/lib/oauth_provider_plugin.rb
@@ -104,8 +104,17 @@ class OauthProviderPlugin < Noosfero::Plugin
     # wildcard_redirect_uri false
   end
 
-  Rails.application.routes.prepend do
-    use_doorkeeper
+  Rails.configuration.to_prepare do
+    Rails.application.routes.prepend do
+      scope 'oauth_provider' do
+        use_doorkeeper do
+          controllers ({
+            :applications => 'oauth_provider_applications',
+            :authorized_applications => 'oauth_provider_authorized_applications'
+          })
+        end
+      end
+    end
   end
 
 end
diff --git a/plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb b/plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb
new file mode 100644
index 0000000..5fa8720
--- /dev/null
+++ b/plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb
@@ -0,0 +1,11 @@
+<div class="oauth-provider">
+  <h3><%= _('Oauh Provider') %></h3>
+
+  <div class="applications">
+    <%= link_to _('Applications'), oauth_applications_path %>
+  </div>
+  <div class="authorized-applications">
+    <%= link_to _('Authorized Applications'), oauth_authorized_applications_path %>
+  </div>
+
+</div>
--
libgit2 0.21.2