Add update and info method on User
This commit is contained in:
parent
b5ba7725d2
commit
49e4a02150
2 changed files with 21 additions and 4 deletions
|
|
@ -2,6 +2,7 @@ class Api::V1::UsersController < Api::V1::ApiController
|
||||||
class ForbiddenError < StandardError; end
|
class ForbiddenError < StandardError; end
|
||||||
|
|
||||||
before_action :set, except: ['create', 'check_email', 'check_username']
|
before_action :set, except: ['create', 'check_email', 'check_username']
|
||||||
|
before_action :set_by_id, only: ['info', 'update']
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@user = User.new(user_params)
|
@user = User.new(user_params)
|
||||||
|
|
@ -24,6 +25,15 @@ class Api::V1::UsersController < Api::V1::ApiController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
def update
|
||||||
|
render :info, status: :ok if @user.update(user_params)
|
||||||
|
end
|
||||||
|
|
||||||
|
def info
|
||||||
|
render :info, status: :ok
|
||||||
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
if @user
|
if @user
|
||||||
now = DateTime.current
|
now = DateTime.current
|
||||||
|
|
@ -63,9 +73,6 @@ class Api::V1::UsersController < Api::V1::ApiController
|
||||||
render :available
|
render :available
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
|
||||||
end
|
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -76,7 +83,14 @@ class Api::V1::UsersController < Api::V1::ApiController
|
||||||
@user = User.where("username = ?", params[:id]).first
|
@user = User.where("username = ?", params[:id]).first
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def set_by_id
|
||||||
|
@user = User.where("id = ?", params[:id]).first
|
||||||
|
end
|
||||||
|
|
||||||
def user_params
|
def user_params
|
||||||
params.require(:user).permit(:username, :email, :password, :password_confirmation, :granblue_id)
|
params.require(:user).permit(
|
||||||
|
:username, :email, :password, :password_confirmation,
|
||||||
|
:granblue_id, :picture, :element, :language, :private
|
||||||
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
3
app/views/api/v1/users/info.rabl
Normal file
3
app/views/api/v1/users/info.rabl
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
object @user
|
||||||
|
|
||||||
|
extends 'api/v1/users/base'
|
||||||
Loading…
Reference in a new issue