Use CanCanCan for oauth clients controller

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index c4ea4ef8f83f8694fc48e067bfb5982357dc89fe..7138374f376692c37f26644c9b9bfe5731731210 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -16,6 +16,7 @@ class Ability
 
     if user
       can :welcome, :site
+      can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
       can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
       can [:close, :reopen], Note

diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb
index eb427e090848408f0a3d743de5f1c7698dc647fe..b925002ec7bed7278e19055c719c52092fec30d8 100644 (file)
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -3,7 +3,8 @@ class OauthClientsController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
-  before_action :require_user
+
+  authorize_resource :class => ClientApplication
 
   def index
     @client_applications = current_user.client_applications