From 1ef131d66c37f61f9b55d6697eec017b75e280f3 Mon Sep 17 00:00:00 2001 From: Giovanni Sakti Date: Thu, 20 Dec 2018 15:03:31 +0700 Subject: [PATCH] replace deprecated renderer (text -> plain) --- app/controllers/pings_controller.rb | 2 +- app/controllers/profile_controller.rb | 20 +++++++++---------- .../users/omniauth_callbacks_controller.rb | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/controllers/pings_controller.rb b/app/controllers/pings_controller.rb index 10fec49f..b8bdb167 100644 --- a/app/controllers/pings_controller.rb +++ b/app/controllers/pings_controller.rb @@ -1,5 +1,5 @@ class PingsController < ApplicationController def show - render :text => "pong" + render :plain => "pong" end end diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb index 77991577..04411093 100755 --- a/app/controllers/profile_controller.rb +++ b/app/controllers/profile_controller.rb @@ -60,7 +60,7 @@ def user_id user = User.get_user(params[:name]) response = user.uid if user.present? end - render text: response + render plain: response end def download_vpn @@ -90,15 +90,15 @@ def download_vpn_for_user def authenticate response = User.authenticate params if response - render text: 0 + render plain: 0 else - render text: 1 + render plain: 1 end end def authenticate_ms_chap response = User.ms_chap_auth params - render text: response + render plain: response end @@ -124,9 +124,9 @@ def authenticate_cas def authenticate_pam response = User.authenticate_pam params if response - render text: 0 + render plain: 0 else - render text: 1 + render plain: 1 end end @@ -135,12 +135,12 @@ def verify if token response = User.verify params if response - render text: 0 + render plain: 0 else - render text: 1 + render plain: 1 end else - render text: 1 + render plain: 1 end end @@ -196,7 +196,7 @@ def public_key public_key = '' @user = User.get_user(params[:name]) public_key = @user.public_key if @user.present? - render text: public_key + render plain: public_key end def user diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 7e3cac98..17adf1a1 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -7,7 +7,7 @@ def google_oauth2 domain = data['info']['email'].split('@').last unless User.valid_domain? domain - return render text: 'Your domain is unauthorized', status: :unauthorized + return render plain: 'Your domain is unauthorized', status: :unauthorized end @user = User.create_user(data.info['name'], data.info['email'])