oauth_provider: use noosfero layout in doorkeeper views

Victor Costa
1 parent 23837332
Showing 7 changed files with 55 additions and 2 deletions Show diff stats
plugins/oauth_client/lib/omniauth/strategies/noosfero_oauth2.rb
plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
plugins/oauth_provider/controllers/oauth_provider_applications_controller.rb
plugins/oauth_provider/controllers/oauth_provider_authorized_applications_controller.rb
plugins/oauth_provider/controllers/oauth_provider_plugin_admin_controller.rb
plugins/oauth_provider/lib/oauth_provider_plugin.rb
plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb
@@ -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"] }
  
@@ -0,0 +1,8 @@
+module Doorkeeper
+  class ApplicationController < ApplicationController
+
+    include Helpers::Controller
+    helper 'doorkeeper/form_errors'
+
+  end
+end
@@ -0,0 +1,9 @@
+class OauthProviderApplicationsController < Doorkeeper::ApplicationsController
+
+  no_design_blocks
+  layout :get_layout
+
+  def show
+  end
+
+end
@@ -0,0 +1,6 @@
+class OauthProviderAuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
+
+  no_design_blocks
+  layout :get_layout
+
+end
@@ -0,0 +1,6 @@
+class OauthProviderPluginAdminController < AdminController
+
+  def index
+  end
+
+end
@@ -104,8 +104,17 @@ class OauthProviderPlugin &lt; 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
@@ -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>
...	...	@@ -4,6 +4,10 @@ module OmniAuth
4	4	module Strategies
5	5	class NoosferoOauth2 < OmniAuth::Strategies::OAuth2
6	6	option :name, :noosfero_oauth2
	7	+ option :client_options, {
	8	+ :authorize_url => '/oauth_provider/oauth/authorize',
	9	+ :token_url => '/oauth_provider/oauth/token'
	10	+ }
7	11
8	12	uid { raw_info["id"] }
9	13
...	...
...	...	@@ -0,0 +1,8 @@
	1	+module Doorkeeper
	2	+ class ApplicationController < ApplicationController
	3	+
	4	+ include Helpers::Controller
	5	+ helper 'doorkeeper/form_errors'
	6	+
	7	+ end
	8	+end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+class OauthProviderApplicationsController < Doorkeeper::ApplicationsController
	2	+
	3	+ no_design_blocks
	4	+ layout :get_layout
	5	+
	6	+ def show
	7	+ end
	8	+
	9	+end
...	...
...	...	@@ -0,0 +1,6 @@
	1	+class OauthProviderAuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
	2	+
	3	+ no_design_blocks
	4	+ layout :get_layout
	5	+
	6	+end
...	...
...	...	@@ -0,0 +1,6 @@
	1	+class OauthProviderPluginAdminController < AdminController
	2	+
	3	+ def index
	4	+ end
	5	+
	6	+end
...	...
...	...	@@ -104,8 +104,17 @@ class OauthProviderPlugin < Noosfero::Plugin
104	104	# wildcard_redirect_uri false
105	105	end
106	106
107		- Rails.application.routes.prepend do
108		- use_doorkeeper
	107	+ Rails.configuration.to_prepare do
	108	+ Rails.application.routes.prepend do
	109	+ scope 'oauth_provider' do
	110	+ use_doorkeeper do
	111	+ controllers ({
	112	+ :applications => 'oauth_provider_applications',
	113	+ :authorized_applications => 'oauth_provider_authorized_applications'
	114	+ })
	115	+ end
	116	+ end
	117	+ end
109	118	end
110	119
111	120	end
...	...
...	...	@@ -0,0 +1,11 @@
	1	+<div class="oauth-provider">
	2	+ <h3><%= _('Oauh Provider') %></h3>
	3	+
	4	+ <div class="applications">
	5	+ <%= link_to _('Applications'), oauth_applications_path %>
	6	+ </div>
	7	+ <div class="authorized-applications">
	8	+ <%= link_to _('Authorized Applications'), oauth_authorized_applications_path %>
	9	+ </div>
	10	+
	11	+</div>
...	...