From 53d4dc1c53bf48223c9f093f396e2084dbf38fb1 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Wed, 15 Oct 2014 15:37:19 -0300
Subject: [PATCH] oauth_provider: customize views

---
 plugins/oauth_provider/lib/oauth_provider_plugin.rb                     | 80 +++++---------------------------------------------------------------------------
 plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb     | 10 ++++++----
 plugins/oauth_provider/views/doorkeeper/applications/edit.html.erb      |  2 +-
 plugins/oauth_provider/views/doorkeeper/applications/index.html.erb     | 10 +++++-----
 plugins/oauth_provider/views/doorkeeper/applications/show.html.erb      | 16 +++++++++-------
 plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb     | 12 ++++++------
 plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb |  2 +-
 7 files changed, 33 insertions(+), 99 deletions(-)

diff --git a/plugins/oauth_provider/lib/oauth_provider_plugin.rb b/plugins/oauth_provider/lib/oauth_provider_plugin.rb
index 6655461..a733c5d 100644
--- a/plugins/oauth_provider/lib/oauth_provider_plugin.rb
+++ b/plugins/oauth_provider/lib/oauth_provider_plugin.rb
@@ -9,18 +9,14 @@ class OauthProviderPlugin < Noosfero::Plugin
   end
 
   Doorkeeper.configure do
-    # Change the ORM that doorkeeper will use.
-    # Currently supported options are :active_record, :mongoid2, :mongoid3, :mongo_mapper
     orm :active_record
 
-    # This block will be called to check whether the resource owner is authenticated or not.
     resource_owner_authenticator do
       domain = Domain.find_by_name(request.host)
       environment = domain ? domain.environment : Environment.default
       environment.users.find_by_id(session[:user]) || redirect_to('/account/login')
     end
 
-    # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
     admin_authenticator do
       domain = Domain.find_by_name(request.host)
       environment = domain ? domain.environment : Environment.default
@@ -31,77 +27,7 @@ class OauthProviderPlugin < Noosfero::Plugin
       user
     end
 
-    # Authorization Code expiration time (default 10 minutes).
-    # authorization_code_expires_in 10.minutes
-
-    # Access token expiration time (default 2 hours).
-    # If you want to disable expiration, set this to nil.
-    # access_token_expires_in 2.hours
-
-    # Reuse access token for the same resource owner within an application (disabled by default)
-    # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
-    # reuse_access_token
-
-    # Issue access tokens with refresh token (disabled by default)
-    # use_refresh_token
-
-    # Provide support for an owner to be assigned to each registered application (disabled by default)
-    # Optional parameter :confirmation => true (default false) if you want to enforce ownership of
-    # a registered application
-    # Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support
-    # enable_application_owner :confirmation => false
-
-    # Define access token scopes for your provider
-    # For more information go to
-    # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes
-    # default_scopes  :public
-    # optional_scopes :write, :update
-
-    # Change the way client credentials are retrieved from the request object.
-    # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
-    # falls back to the `:client_id` and `:client_secret` params from the `params` object.
-    # Check out the wiki for more information on customization
-    # client_credentials :from_basic, :from_params
-
-    # Change the way access token is authenticated from the request object.
-    # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
-    # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
-    # Check out the wiki for more information on customization
-    # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
-
-    # Change the native redirect uri for client apps
-    # When clients register with the following redirect uri, they won't be redirected to any server and the authorization code will be displayed within the provider
-    # The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL
-    # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
-    #
-    # native_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
-
-    # Specify what grant flows are enabled in array of Strings. The valid
-    # strings and the flows they enable are:
-    #
-    # "authorization_code" => Authorization Code Grant Flow
-    # "implicit"           => Implicit Grant Flow
-    # "password"           => Resource Owner Password Credentials Grant Flow
-    # "client_credentials" => Client Credentials Grant Flow
-    #
-    # If not specified, Doorkeeper enables all the four grant flows.
-    #
-    # grant_flows %w(authorization_code implicit password client_credentials)
-
-    # Under some circumstances you might want to have applications auto-approved,
-    # so that the user skips the authorization step.
-    # For example if dealing with trusted a application.
-    # skip_authorization do |resource_owner, client|
-    #   client.superapp? or resource_owner.admin?
-    # end
-
-    # WWW-Authenticate Realm (default "Doorkeeper").
-    # realm "Doorkeeper"
-
-    # Allow dynamic query parameters (disabled by default)
-    # Some applications require dynamic query parameters on their request_uri
-    # set to true if you want this to be allowed
-    # wildcard_redirect_uri false
+    default_scopes :public
   end
 
   Rails.configuration.to_prepare do
@@ -117,4 +43,8 @@ class OauthProviderPlugin < Noosfero::Plugin
     end
   end
 
+  SCOPE_TRANSLATION = {
+    'public' => _('Access your public data')
+  }
+
 end
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb
index 4654d72..7ea09dc 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb
@@ -1,6 +1,8 @@
 <%= form_for [:oauth, 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 %>
@@ -17,7 +19,7 @@
       <%= f.text_area :redirect_uri, class: 'form-control' %>
       <%= doorkeeper_errors_for application, :redirect_uri %>
       <span class="help-block">
-         Use one line per URI
+        <%= _('Use one line per URI') %>
         </span>
       <% if Doorkeeper.configuration.native_redirect_uri %>
           <span class="help-block">
@@ -29,8 +31,8 @@
 
   <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" %>
+      <%= f.submit _('Submit'), class: "btn btn-primary" %>
+      <%= link_to _("Cancel"), oauth_applications_path, :class => "btn btn-default" %>
     </div>
   </div>
 <% end %>
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/edit.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/edit.html.erb
index 06926ae..6fceb40 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/edit.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/edit.html.erb
@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1>Edit application</h1>
+  <h1><%= _('Edit application') %></h1>
 </div>
 
 <%= render 'form', application: @application %>
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb
index 1584d31..9e20df0 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb
@@ -1,14 +1,14 @@
 <div class="page-header">
-  <h1>Your applications</h1>
+  <h3><%= link_to _('Oauh Provider'), '/admin/plugin/oauth_provider' %></h3>
 </div>
 
-<p><%= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success' %></p>
+<p><%= link_to _('New Application'), new_oauth_application_path, class: 'btn btn-success' %></p>
 
 <table class="table table-striped">
   <thead>
   <tr>
-    <th>Name</th>
-    <th>Callback URL</th>
+    <th><%= _('Name') %></th>
+    <th><%= _('Callback URL') %></th>
     <th></th>
     <th></th>
   </tr>
@@ -18,7 +18,7 @@
     <tr id="application_<%= application.id %>">
       <td><%= link_to application.name, [:oauth, application] %></td>
       <td><%= application.redirect_uri %></td>
-      <td><%= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link' %></td>
+      <td><%= link_to _('Edit'), edit_oauth_application_path(application), class: 'btn btn-link' %></td>
       <td><%= render 'delete_form', application: application %></td>
     </tr>
   <% end %>
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb
index d3af6fc..1a68133 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb
@@ -1,18 +1,18 @@
 <div class="page-header">
-  <h1>Application: <%= @application.name %></h1>
+  <h1><%= _('Application: %s' % @application.name) %></h1>
 </div>
 
 <div class="row">
   <div class="col-md-8">
-    <h4>Application Id:</h4>
+    <h4><%= _('Application Id:') %></h4>
 
     <p><code id="application_id"><%= @application.uid %></code></p>
 
-    <h4>Secret:</h4>
+    <h4><%= _('Secret:') %></h4>
 
     <p><code id="secret"><%= @application.secret %></code></p>
 
-    <h4>Callback urls:</h4>
+    <h4><%= _('Callback urls:') %></h4>
 
     <table>
       <% @application.redirect_uri.split.each do |uri| %>
@@ -21,7 +21,6 @@
             <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 %>
@@ -29,9 +28,12 @@
   </div>
 
   <div class="col-md-4">
-    <h3>Actions</h3>
+    <h3><%= _('Actions') %></h3>
 
-    <p><%= link_to 'Edit', edit_oauth_application_path(@application), class: 'btn btn-primary' %></p>
+    <p>
+      <%= link_to _('Edit'), edit_oauth_application_path(@application), class: 'btn btn-primary' %>
+      <%= link_to _("Cancel"), oauth_applications_path, :class => "btn btn-default" %>
+    </p>
 
     <p><%= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger' %></p>
   </div>
diff --git a/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb b/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
index c6140c0..6be5fab 100644
--- a/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
@@ -1,19 +1,19 @@
 <header class="page-header" role="banner">
-  <h1>Authorize required</h1>
+  <h1><%= _('Authorize required') %></h1>
 </header>
 
 <main role="main">
   <p class="h4">
-    Authorize <strong class="text-info"><%= @pre_auth.client.name %></strong> to use your account?
+  <%= _('Authorize %s to use your account?' % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>") %>
   </p>
 
   <% if @pre_auth.scopes %>
     <div id="oauth-permissions">
-      <p>This application will be able to:</p>
+      <p><%= _('This application will be able to:') %></p>
 
       <ul class="text-info">
         <% @pre_auth.scopes.each do |scope| %>
-          <li><%= t scope, scope: [:doorkeeper, :scopes] %></li>
+          <li><%= OauthProviderPlugin::SCOPE_TRANSLATION[scope] %></li>
         <% end %>
       </ul>
     </div>
@@ -26,7 +26,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_tag "Authorize", class: "btn btn-success btn-lg btn-block" %>
+      <%= 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 %>
@@ -34,7 +34,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_tag "Deny", class: "btn btn-danger btn-lg btn-block" %>
+      <%= submit_tag _("Deny"), class: "btn btn-danger btn-lg btn-block" %>
     <% end %>
   </div>
 </main>
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
index 5fa8720..7e11968 100644
--- a/plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb
+++ b/plugins/oauth_provider/views/oauth_provider_plugin_admin/index.html.erb
@@ -1,5 +1,5 @@
 <div class="oauth-provider">
-  <h3><%= _('Oauh Provider') %></h3>
+<h3><%= _('Oauh Provider') %></h3>
 
   <div class="applications">
     <%= link_to _('Applications'), oauth_applications_path %>
--
libgit2 0.21.2