From 72435671703e5ac1d959c00d665b143e39afbc6b Mon Sep 17 00:00:00 2001
From: Gustavo Jaruga Cruz <darksshades@hotmail.com>
Date: Thu, 7 Jul 2016 15:28:55 -0300
Subject: [PATCH] Fix oauth_provider, upgrade doorkeeper to 2.2.0

---
 plugins/oauth_provider/Gemfile                                                 |  2 +-
 plugins/oauth_provider/controllers/doorkeeper/application_controller.rb        |  3 ++-
 plugins/oauth_provider/controllers/doorkeeper/applications_controller.rb       | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 plugins/oauth_provider/controllers/oauth_provider_authorizations_controller.rb |  3 +++
 plugins/oauth_provider/db/migrate/20140829153047_create_doorkeeper_tables.rb   | 41 -----------------------------------------
 plugins/oauth_provider/db/migrate/20170718153047_create_doorkeeper_tables.rb   | 42 ++++++++++++++++++++++++++++++++++++++++++
 plugins/oauth_provider/views/doorkeeper/applications/_delete_form.html.erb     |  4 ++--
 plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb            |  2 +-
 plugins/oauth_provider/views/doorkeeper/applications/index.html.erb            |  6 +++---
 plugins/oauth_provider/views/doorkeeper/applications/show.html.erb             |  3 ++-
 plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb            |  6 +++---
 plugins/oauth_provider/views/doorkeeper/authorized_applications/index.html.erb |  2 +-
 12 files changed, 114 insertions(+), 54 deletions(-)
 create mode 100644 plugins/oauth_provider/controllers/doorkeeper/applications_controller.rb
 delete mode 100644 plugins/oauth_provider/db/migrate/20140829153047_create_doorkeeper_tables.rb
 create mode 100644 plugins/oauth_provider/db/migrate/20170718153047_create_doorkeeper_tables.rb

diff --git a/plugins/oauth_provider/Gemfile b/plugins/oauth_provider/Gemfile
index ccaff8e..6813a7a 100644
--- a/plugins/oauth_provider/Gemfile
+++ b/plugins/oauth_provider/Gemfile
@@ -1 +1 @@
-gem 'doorkeeper', '~> 1.4.0'
+gem 'doorkeeper', '~> 2.2.0'
diff --git a/plugins/oauth_provider/controllers/doorkeeper/application_controller.rb b/plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
index 75ac214..ff39280 100644
--- a/plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
+++ b/plugins/oauth_provider/controllers/doorkeeper/application_controller.rb
@@ -2,7 +2,8 @@ module Doorkeeper
   class ApplicationController < ApplicationController
 
     include Helpers::Controller
-    helper 'doorkeeper/form_errors'
+
+    helper 'doorkeeper/dashboard'
 
   end
 end
diff --git a/plugins/oauth_provider/controllers/doorkeeper/applications_controller.rb b/plugins/oauth_provider/controllers/doorkeeper/applications_controller.rb
new file mode 100644
index 0000000..1885268
--- /dev/null
+++ b/plugins/oauth_provider/controllers/doorkeeper/applications_controller.rb
@@ -0,0 +1,54 @@
+module Doorkeeper
+  class ApplicationsController < Doorkeeper::ApplicationController
+    layout 'doorkeeper/admin'
+
+    before_action :authenticate_admin!
+    before_action :set_application, only: [:show, :edit, :update, :destroy]
+
+    def index
+      @applications = Application.all
+    end
+
+    def new
+      @application = Application.new
+    end
+
+    def create
+      @application = Application.new(application_params)
+      if @application.save
+        flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
+        redirect_to oauth_application_url(@application)
+      else
+        render :new
+      end
+    end
+
+    def update
+      if @application.update_attributes(application_params)
+        flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :update])
+        redirect_to oauth_application_url(@application)
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :destroy]) if @application.destroy
+      redirect_to oauth_applications_url
+    end
+
+    private
+
+    def set_application
+      @application = Application.find(params[:id])
+    end
+
+    def application_params
+      if params.respond_to?(:permit)
+        params.require(:doorkeeper_application).permit(:name, :redirect_uri, :scopes)
+      else
+        params[:doorkeeper_application].slice(:name, :redirect_uri, :scopes) rescue nil
+      end
+    end
+  end
+end
diff --git a/plugins/oauth_provider/controllers/oauth_provider_authorizations_controller.rb b/plugins/oauth_provider/controllers/oauth_provider_authorizations_controller.rb
index a48b70d..4945af1 100644
--- a/plugins/oauth_provider/controllers/oauth_provider_authorizations_controller.rb
+++ b/plugins/oauth_provider/controllers/oauth_provider_authorizations_controller.rb
@@ -6,4 +6,7 @@ class OauthProviderAuthorizationsController < Doorkeeper::AuthorizationsControll
   def index
   end
 
+  def show
+  end
+
 end
diff --git a/plugins/oauth_provider/db/migrate/20140829153047_create_doorkeeper_tables.rb b/plugins/oauth_provider/db/migrate/20140829153047_create_doorkeeper_tables.rb
deleted file mode 100644
index fd0bd10..0000000
--- a/plugins/oauth_provider/db/migrate/20140829153047_create_doorkeeper_tables.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-class CreateDoorkeeperTables < ActiveRecord::Migration
-  def change
-    create_table :oauth_applications do |t|
-      t.string  :name,         null: false
-      t.string  :uid,          null: false
-      t.string  :secret,       null: false
-      t.text    :redirect_uri, null: false
-      t.timestamps
-    end
-
-    add_index :oauth_applications, :uid, unique: true
-
-    create_table :oauth_access_grants do |t|
-      t.integer  :resource_owner_id, null: false
-      t.integer  :application_id,    null: false
-      t.string   :token,             null: false
-      t.integer  :expires_in,        null: false
-      t.text     :redirect_uri,      null: false
-      t.datetime :created_at,        null: false
-      t.datetime :revoked_at
-      t.string   :scopes
-    end
-
-    add_index :oauth_access_grants, :token, unique: true
-
-    create_table :oauth_access_tokens do |t|
-      t.integer  :resource_owner_id
-      t.integer  :application_id
-      t.string   :token,             null: false
-      t.string   :refresh_token
-      t.integer  :expires_in
-      t.datetime :revoked_at
-      t.datetime :created_at,        null: false
-      t.string   :scopes
-    end
-
-    add_index :oauth_access_tokens, :token, unique: true
-    add_index :oauth_access_tokens, :resource_owner_id
-    add_index :oauth_access_tokens, :refresh_token, unique: true
-  end
-end
diff --git a/plugins/oauth_provider/db/migrate/20170718153047_create_doorkeeper_tables.rb b/plugins/oauth_provider/db/migrate/20170718153047_create_doorkeeper_tables.rb
new file mode 100644
index 0000000..af5aa7d
--- /dev/null
+++ b/plugins/oauth_provider/db/migrate/20170718153047_create_doorkeeper_tables.rb
@@ -0,0 +1,42 @@
+class CreateDoorkeeperTables < ActiveRecord::Migration
+  def change
+    create_table :oauth_applications do |t|
+      t.string  :name,         null: false
+      t.string  :uid,          null: false
+      t.string  :secret,       null: false
+      t.text    :redirect_uri, null: false
+      t.string  :scopes,       null: false, default: ''
+      t.timestamps
+    end
+
+    add_index :oauth_applications, :uid, unique: true
+
+    create_table :oauth_access_grants do |t|
+      t.integer  :resource_owner_id, null: false
+      t.integer  :application_id,    null: false
+      t.string   :token,             null: false
+      t.integer  :expires_in,        null: false
+      t.text     :redirect_uri,      null: false
+      t.datetime :created_at,        null: false
+      t.datetime :revoked_at
+      t.string   :scopes
+    end
+
+    add_index :oauth_access_grants, :token, unique: true
+
+    create_table :oauth_access_tokens do |t|
+      t.integer  :resource_owner_id
+      t.integer  :application_id
+      t.string   :token,             null: false
+      t.string   :refresh_token
+      t.integer  :expires_in
+      t.datetime :revoked_at
+      t.datetime :created_at,        null: false
+      t.string   :scopes
+    end
+
+    add_index :oauth_access_tokens, :token, unique: true
+    add_index :oauth_access_tokens, :resource_owner_id
+    add_index :oauth_access_tokens, :refresh_token, unique: true
+  end
+end
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/_delete_form.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/_delete_form.html.erb
index 0a407db..8d8c93f 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/_delete_form.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/_delete_form.html.erb
@@ -1,5 +1,5 @@
 <%- 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 t('doorkeeper.applications.buttons.destroy'), onclick: "return confirm('#{ t('doorkeeper.applications.confirmations.destroy') }')", class: submit_btn_css %>
 <% end %>
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb
index 7ea09dc..0af5363 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for [:oauth, application], html: {class: 'form-horizontal', role: 'form'} do |f| %>
+<%= 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>
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb
index 2cc3631..a8fac25 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/index.html.erb
@@ -17,15 +17,15 @@
   <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><%= link_to t('doorkeeper.applications.buttons.edit'), edit_oauth_application_path(application), class: 'btn btn-link' %></td>
       <td><%= render 'delete_form', application: application %></td>
     </tr>
   <% end %>
   </tbody>
 </table>
-<div class="actions">
+<div class="actions" style="padding-top: 5px;">
   <%= button(:back, _('Go back'), {:controller => 'oauth_provider_plugin_admin', :action => 'index'}) %>
 </div>
 </div>
diff --git a/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb b/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb
index 1a68133..6925aae 100644
--- a/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/applications/show.html.erb
@@ -20,7 +20,8 @@
           <td>
             <code><%= uri %></code>
           </td>
-          <td>
+           <td>
+            <%= link_to t('doorkeeper.applications.buttons.authorize'), oauth_authorization_path(client_id: @application.uid, redirect_uri: uri, response_type: 'code', scope: @application.scopes), class: 'btn btn-success', target: '_blank' %>
           </td>
         </tr>
       <% end %>
diff --git a/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb b/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
index 2c6455c..e662346 100644
--- a/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/authorizations/new.html.erb
@@ -6,16 +6,16 @@
 
 <main role="main">
   <p class="h4">
-  <%= _('Authorize %s to use your account?') % "<strong class=\"text-info\">#{@pre_auth.client.name}</strong>" %>
+  <%= raw _('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>
diff --git a/plugins/oauth_provider/views/doorkeeper/authorized_applications/index.html.erb b/plugins/oauth_provider/views/doorkeeper/authorized_applications/index.html.erb
index 0b9a6c3..aaef12c 100644
--- a/plugins/oauth_provider/views/doorkeeper/authorized_applications/index.html.erb
+++ b/plugins/oauth_provider/views/doorkeeper/authorized_applications/index.html.erb
@@ -25,7 +25,7 @@
   </table>
 </main>
 
-<div class="actions">
+<div class="actions" style="padding-top: 5px;">
   <%= button(:back, _('Go back'), :back) %>
 </div>
 </div>
--
libgit2 0.21.2