X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ae5d94b2f16d6f2cf1739e19ebc3793a18a0a4a..64da05f8ffa5e17de11e94335f418cd73498a76d:/app/controllers/oauth_clients_controller.rb?ds=sidebyside

diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb
index 56f19dbda..42b0921f1 100644
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -1,54 +1,75 @@
 class OauthClientsController < ApplicationController
-  layout 'site'
+  layout "site"
 
-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user
+  before_action :authorize_web
+  before_action :set_locale
+
+  authorize_resource :class => ClientApplication
 
   def index
-    @client_applications = @user.client_applications
-    @tokens = @user.oauth_tokens.authorized
+    @client_applications = current_user.client_applications
+    @tokens = current_user.oauth_tokens.authorized
   end
 
-  def new
-    @client_application = ClientApplication.new
+  def show
+    @client_application = current_user.client_applications.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    @type = "client application"
+    render :action => "not_found", :status => :not_found
   end
 
-  def create
-    @client_application = @user.client_applications.build(params[:client_application])
-    if @client_application.save
-      flash[:notice] = t'oauth_clients.create.flash'
-      redirect_to :action => "show", :id => @client_application.id
+  def new
+    if Settings.oauth_10_registration
+      @client_application = ClientApplication.new
     else
-      render :action => "new"
+      flash[:error] = t ".disabled"
+      redirect_to :action => "index"
     end
   end
 
-  def show
-    @client_application = @user.client_applications.find(params[:id])
+  def edit
+    @client_application = current_user.client_applications.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     @type = "client application"
     render :action => "not_found", :status => :not_found
   end
 
-  def edit
-    @client_application = @user.client_applications.find(params[:id])
+  def create
+    @client_application = current_user.client_applications.build(application_params)
+    if @client_application.save
+      flash[:notice] = t ".flash"
+      redirect_to :action => "show", :id => @client_application.id
+    else
+      render :action => "new"
+    end
   end
 
   def update
-    @client_application = @user.client_applications.find(params[:id])
-    if @client_application.update_attributes(params[:client_application])
-      flash[:notice] = t'oauth_clients.update.flash'
+    @client_application = current_user.client_applications.find(params[:id])
+    if @client_application.update(application_params)
+      flash[:notice] = t ".flash"
       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "edit"
     end
+  rescue ActiveRecord::RecordNotFound
+    @type = "client application"
+    render :action => "not_found", :status => :not_found
   end
 
   def destroy
-    @client_application = @user.client_applications.find(params[:id])
+    @client_application = current_user.client_applications.find(params[:id])
     @client_application.destroy
-    flash[:notice] = t'oauth_clients.destroy.flash'
+    flash[:notice] = t ".flash"
     redirect_to :action => "index"
+  rescue ActiveRecord::RecordNotFound
+    @type = "client application"
+    render :action => "not_found", :status => :not_found
+  end
+
+  private
+
+  def application_params
+    params.require(:client_application).permit(:name, :url, :callback_url, :support_url, ClientApplication.all_permissions)
   end
 end