Merge branch 'fix_oauth' into 'master'

Fix oauth_client and oauth_provider See merge request !990

Merge branch 'fix_oauth' into 'master'
Fix oauth_client and oauth_provider See merge request !990
Leandro Santos
2 parents c61cef1f 4652d202
Showing 15 changed files with 47 additions and 33 deletions Show diff stats
plugins/oauth_client/lib/oauth_client_plugin.rb
plugins/oauth_provider/Gemfile
plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
plugins/oauth_provider/controllers/public/oauth_provider_plugin_public_controller.rb
plugins/oauth_provider/db/migrate/20160727164530_add_scopes_to_oauth_applications.rb
plugins/oauth_provider/views/doorkeeper/applications/_delete_form.html.erb
plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb
plugins/oauth_provider/views/doorkeeper/applications/index.html.erb
plugins/oauth_provider/views/doorkeeper/applications/new.html.erb
plugins/oauth_provider/views/doorkeeper/applications/show.html.erb
plugins/oauth_provider/views/doorkeeper/authorizations/error.html.erb
plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
plugins/oauth_provider/views/doorkeeper/authorizations/show.html.erb
plugins/oauth_provider/views/doorkeeper/authorized_applications/_delete_form.html.erb
plugins/oauth_provider/views/doorkeeper/authorized_applications/index.html.erb
@@ -72,6 +72,7 @@ class OauthClientPlugin &lt; Noosfero::Plugin
         strategy.options.merge! consumer_key: provider.client_id, consumer_secret: provider.client_secret
         strategy.options.merge! client_id: provider.client_id, client_secret: provider.client_secret
         strategy.options.merge! options
+        strategy.options.merge! provider.options
         request.session[:provider_id] = provider_id
       }
-gem 'doorkeeper', '~> 1.4.0'
+gem 'doorkeeper', '~> 3.1.0'
@@ -2,7 +2,6 @@ module Doorkeeper
   class ApplicationController < ApplicationController
     include Helpers::Controller
-    helper 'doorkeeper/form_errors'
   end
 end
 class OauthProviderPluginPublicController < PublicController
-  doorkeeper_for :me
+  before_action :doorkeeper_authorize!
   def me
     user = environment.users.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
@@ -0,0 +1,5 @@
+class AddScopesToOauthApplications < ActiveRecord::Migration
+  def change
+    add_column :oauth_applications, :scopes, :string, null: false, default: ''
+  end
+end
 <%- submit_btn_css ||= 'btn btn-link' %>
-<%= form_tag [:oauth, application] do %>
+<%= form_tag oauth_application_path(application) do %>
   <input type="hidden" name="_method" value="delete">
-  <%= submit_tag 'Destroy', onclick: "return confirm('Are you sure?')", class: submit_btn_css %>
+  <%= submit_tag _('Destroy'), onclick: "return confirm('#{ _('Are you sure?') }')", class: submit_btn_css %>
 <% end %>
-<%= form_for [:oauth, application], html: {class: 'form-horizontal', role: 'form'} do |f| %>
+<% extend Doorkeeper::DashboardHelper %>
+<%= form_for application, url: doorkeeper_submit_path(application), html: {class: 'form-horizontal', role: 'form'} do |f| %>
   <% if application.errors.any? %>
-    <div class="alert alert-danger" data-alert>
-      <p><%= _('Whoops! Check your form for possible errors') %></p>
-    </div>
+    <div class="alert alert-danger" data-alert><p><%= _('Whoops! Check your form for possible errors') %></p></div>
   <% end %>
   <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do %>
-    <%= f.label :name, class: 'col-sm-2 control-label', for: 'application_name' %>
+    <%= f.label :name, class: 'col-sm-2 control-label' %>
     <div class="col-sm-10">
       <%= f.text_field :name, class: 'form-control' %>
       <%= doorkeeper_errors_for application, :name %>
@@ -14,26 +13,36 @@
   <% end %>
   <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:redirect_uri].present?}" do %>
-    <%= f.label :redirect_uri, class: 'col-sm-2 control-label', for: 'application_redirect_uri' %>
+    <%= f.label :redirect_uri, class: 'col-sm-2 control-label' %>
     <div class="col-sm-10">
       <%= f.text_area :redirect_uri, class: 'form-control' %>
       <%= doorkeeper_errors_for application, :redirect_uri %>
       <span class="help-block">
         <%= _('Use one line per URI') %>
-        </span>
+      </span>
       <% if Doorkeeper.configuration.native_redirect_uri %>
           <span class="help-block">
-            Use <code><%= Doorkeeper.configuration.native_redirect_uri %></code> for local tests
+            <%= raw _('Use %s to local tests') % "<code>#{ Doorkeeper.configuration.native_redirect_uri }</code>" %>
           </span>
       <% end %>
     </div>
   <% end %>
+  <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:scopes].present?}" do %>
+    <%= f.label :scopes, class: 'col-sm-2 control-label' %>
+    <div class="col-sm-10">
+      <%= f.text_field :scopes, class: 'form-control' %>
+      <%= doorkeeper_errors_for application, :scopes %>
+      <span class="help-block">
+        <%= _('Separate scopes with spaces. Leave blank to use the default scopes.') %>
+      </span>
+    </div>
+  <% end %>
+
   <div class="form-group">
     <div class="col-sm-offset-2 col-sm-10">
       <%= f.submit _('Submit'), class: "btn btn-primary" %>
-      <%= link_to _("Cancel"), oauth_applications_path, :class => "btn btn-default" %>
+      <%= link_to _('Cancel'), oauth_applications_path, :class => "btn btn-default" %>
     </div>
   </div>
 <% end %>
-
 <div class="oauth-provider">
 <div class="page-header">
-  <h3><%= link_to _('Oauh Provider'), '/admin/plugin/oauth_provider' %></h3>
+  <h1><%= _('Oauh Provider') %></h1>
 </div>
 <p><%= link_to _('New Application'), new_oauth_application_path, class: 'btn btn-success' %></p>
@@ -17,7 +17,7 @@
   <tbody>
   <% @applications.each do |application| %>
     <tr id="application_<%= application.id %>">
-      <td><%= link_to application.name, [:oauth, application] %></td>
+      <td><%= link_to application.name, oauth_application_path(application) %></td>
       <td><%= application.redirect_uri %></td>
       <td><%= link_to _('Edit'), edit_oauth_application_path(application), class: 'btn btn-link' %></td>
       <td><%= render 'delete_form', application: application %></td>
 <div class="page-header">
-  <h1>New application</h1>
+  <h1><%= _('New application') %></h1>
 </div>
 <%= render 'form', application: @application %>
@@ -5,13 +5,14 @@
 <div class="row">
   <div class="col-md-8">
     <h4><%= _('Application Id:') %></h4>
-
     <p><code id="application_id"><%= @application.uid %></code></p>
     <h4><%= _('Secret:') %></h4>
-
     <p><code id="secret"><%= @application.secret %></code></p>
+    <h4><%= _('Scopes') %>:</h4>
+    <p><code id="scopes"><%= @application.scopes %></code></p>
+
     <h4><%= _('Callback urls:') %></h4>
     <table>
@@ -21,6 +22,7 @@
             <code><%= uri %></code>
           </td>
           <td>
+            <%= link_to _('Authorize'), oauth_authorization_path(client_id: @application.uid, redirect_uri: uri, response_type: 'code'), class: 'btn btn-success', target: '_blank' %>
           </td>
         </tr>
       <% end %>
 <div class="page-header">
-  <h1>An error has occurred</h1>
+  <h1><%= _('An error has occurred') %></h1>
 </div>
 <main role="main">
 <div class="oauth-provider-authorize">
-
 <header class="page-header" role="banner">
   <h1><%= _('Authorize required') %></h1>
 </header>
 <main role="main">
   <p class="h4">
-  <%= _('Authorize %s to use your account?') % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>" %>
+    <%= _('Authorize %s to use your account?') % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>" %>
   </p>
-  <% if @pre_auth.scopes %>
+  <% if @pre_auth.scopes.count > 0 %>
     <div id="oauth-permissions">
       <p><%= _('This application will be able to:') %></p>
       <ul class="text-info">
         <% @pre_auth.scopes.each do |scope| %>
-          <li><%= OauthProviderPlugin::SCOPE_TRANSLATION[scope] %></li>
+          <li><%= t scope, scope: [:doorkeeper, :scopes] %></li>
         <% end %>
       </ul>
     </div>
@@ -28,7 +27,7 @@
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_button :ok, _("Authorize") %>
+      <%= submit_tag _('Authorize'), class: "btn btn-success btn-lg btn-block" %>
     <% end %>
     <%= form_tag oauth_authorization_path, method: :delete do %>
       <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
@@ -36,7 +35,7 @@
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_button :cancel, _("Deny") %>
+      <%= submit_tag _('Deny'), class: "btn btn-danger btn-lg btn-block" %>
     <% end %>
   </div>
 </main>
 <header class="page-header">
-  <h1>Authorization code:</h1>
+  <h1><%= _('Authorization code:') %></h1>
 </header>
 <main role="main">
 <%- submit_btn_css ||= 'btn btn-link' %>
 <%= form_tag oauth_authorized_application_path(application) do %>
   <input type="hidden" name="_method" value="delete">
-  <%= submit_tag 'Revoke', onclick: "return confirm('Are you sure?')", class: submit_btn_css %>
+  <%= submit_tag _('Revoke'), onclick: "return confirm('#{ _('Are you sure?') }')", class: submit_btn_css %>
 <% end %>
 <div class="oauth-provider">
 <header class="page-header">
-  <h1>Your authorized applications</h1>
+  <h1><%= _('Your authorized applications') %></h1>
 </header>
 <main role="main">
   <table class="table table-striped">
     <thead>
     <tr>
-      <th>Application</th>
-      <th>Created At</th>
+      <th><%= _('Application') %></th>
+      <th><%= _('Created at') %></th>
       <th></th>
       <th></th>
     </tr>
@@ -24,7 +24,6 @@
     </tbody>
   </table>
 </main>
-
 <div class="actions">
   <%= button(:back, _('Go back'), :back) %>
 </div>
	@@ -72,6 +72,7 @@ class OauthClientPlugin < Noosfero::Plugin		@@ -72,6 +72,7 @@ class OauthClientPlugin < Noosfero::Plugin
72	strategy.options.merge! consumer_key: provider.client_id, consumer_secret: provider.client_secret	72	strategy.options.merge! consumer_key: provider.client_id, consumer_secret: provider.client_secret
73	strategy.options.merge! client_id: provider.client_id, client_secret: provider.client_secret	73	strategy.options.merge! client_id: provider.client_id, client_secret: provider.client_secret
74	strategy.options.merge! options	74	strategy.options.merge! options
		75	+ strategy.options.merge! provider.options
75		76
76	request.session[:provider_id] = provider_id	77	request.session[:provider_id] = provider_id
77	}	78	}
	@@ -2,7 +2,6 @@ module Doorkeeper		@@ -2,7 +2,6 @@ module Doorkeeper
2	class ApplicationController < ApplicationController	2	class ApplicationController < ApplicationController
3		3
4	include Helpers::Controller	4	include Helpers::Controller
5	- helper 'doorkeeper/form_errors'
6		5
7	end	6	end
8	end	7	end
1	class OauthProviderPluginPublicController < PublicController	1	class OauthProviderPluginPublicController < PublicController
2		2
3	- doorkeeper_for :me	3	+ before_action :doorkeeper_authorize!
4		4
5	def me	5	def me
6	user = environment.users.find(doorkeeper_token.resource_owner_id) if doorkeeper_token	6	user = environment.users.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddScopesToOauthApplications < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :oauth_applications, :scopes, :string, null: false, default: ''
	4	+ end
	5	+end
1	<%- submit_btn_css \|\|= 'btn btn-link' %>	1	<%- submit_btn_css \|\|= 'btn btn-link' %>
2	-<%= form_tag [:oauth, application] do %>	2	+<%= form_tag oauth_application_path(application) do %>
3	<input type="hidden" name="_method" value="delete">	3	<input type="hidden" name="_method" value="delete">
4	- <%= submit_tag 'Destroy', onclick: "return confirm('Are you sure?')", class: submit_btn_css %>	4	+ <%= submit_tag _('Destroy'), onclick: "return confirm('#{ _('Are you sure?') }')", class: submit_btn_css %>
5	<% end %>	5	<% end %>
1	<div class="oauth-provider">	1	<div class="oauth-provider">
2	<div class="page-header">	2	<div class="page-header">
3	- <h3><%= link_to _('Oauh Provider'), '/admin/plugin/oauth_provider' %></h3>	3	+ <h1><%= _('Oauh Provider') %></h1>
4	</div>	4	</div>
5		5
6	<p><%= link_to _('New Application'), new_oauth_application_path, class: 'btn btn-success' %></p>	6	<p><%= link_to _('New Application'), new_oauth_application_path, class: 'btn btn-success' %></p>
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	<tbody>	17	<tbody>
18	<% @applications.each do \|application\| %>	18	<% @applications.each do \|application\| %>
19	<tr id="application_<%= application.id %>">	19	<tr id="application_<%= application.id %>">
20	- <td><%= link_to application.name, [:oauth, application] %></td>	20	+ <td><%= link_to application.name, oauth_application_path(application) %></td>
21	<td><%= application.redirect_uri %></td>	21	<td><%= application.redirect_uri %></td>
22	<td><%= link_to _('Edit'), edit_oauth_application_path(application), class: 'btn btn-link' %></td>	22	<td><%= link_to _('Edit'), edit_oauth_application_path(application), class: 'btn btn-link' %></td>
23	<td><%= render 'delete_form', application: application %></td>	23	<td><%= render 'delete_form', application: application %></td>
1	<div class="page-header">	1	<div class="page-header">
2	- <h1>New application</h1>	2	+ <h1><%= _('New application') %></h1>
3	</div>	3	</div>
4		4
5	<%= render 'form', application: @application %>	5	<%= render 'form', application: @application %>
1	<div class="page-header">	1	<div class="page-header">
2	- <h1>An error has occurred</h1>	2	+ <h1><%= _('An error has occurred') %></h1>
3	</div>	3	</div>
4		4
5	<main role="main">	5	<main role="main">
1	<header class="page-header">	1	<header class="page-header">
2	- <h1>Authorization code:</h1>	2	+ <h1><%= _('Authorization code:') %></h1>
3	</header>	3	</header>
4		4
5	<main role="main">	5	<main role="main">
1	<%- submit_btn_css \|\|= 'btn btn-link' %>	1	<%- submit_btn_css \|\|= 'btn btn-link' %>
2	<%= form_tag oauth_authorized_application_path(application) do %>	2	<%= form_tag oauth_authorized_application_path(application) do %>
3	<input type="hidden" name="_method" value="delete">	3	<input type="hidden" name="_method" value="delete">
4	- <%= submit_tag 'Revoke', onclick: "return confirm('Are you sure?')", class: submit_btn_css %>	4	+ <%= submit_tag _('Revoke'), onclick: "return confirm('#{ _('Are you sure?') }')", class: submit_btn_css %>
5	<% end %>	5	<% end %>