加入api在线文档

This commit is contained in:
guange 2014-12-10 15:11:10 +08:00
parent 70bc6acbd2
commit 5eba06ddf9
6 changed files with 20 additions and 3 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@
/config/configuration.yml
.rbenv-gemsets
.DS_Store
public/api_doc/

View File

@ -20,6 +20,7 @@ gem "builder", "3.0.0"
gem 'acts-as-taggable-on', '2.4.1'
group :development do
gem 'grape-swagger'
gem 'puma'
gem 'better_errors', path: 'lib/better_errors'
gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'

View File

@ -110,6 +110,9 @@ GEM
grape-entity (0.4.4)
activesupport
multi_json (>= 1.3.2)
grape-swagger (0.8.0)
grape
grape-entity
guard (2.6.1)
formatador (>= 0.2.4)
listen (~> 2.7)
@ -307,6 +310,7 @@ DEPENDENCIES
fastercsv (~> 1.5.0)
grape (~> 0.9.0)
grape-entity
grape-swagger
guard-rails (~> 0.5.3)
guard-spork (~> 1.5.1)
guard-test (~> 1.0.0)

View File

@ -28,6 +28,7 @@ module Mobile
mount Apis::Users
mount Apis::Courses
add_swagger_documentation ({api_version: 'v1', base_path: '/api'})
end
end

View File

@ -10,12 +10,12 @@ module Mobile
module Apis
class Auth < Grape::API
resource :auth do
desc "Creates and returns access_token if valid login"
desc "用户登录"
params do
requires :login, type: String, desc: 'Username or email'
requires :password, type: String, desc: 'Password'
end
post :login do
post do
user,last_logon = ::User.try_to_login(params[:login], params[:password])
if user
::ApiKey.delete_all(user_id: user.id)
@ -27,6 +27,16 @@ module Mobile
{status: 1, message: 'Unauthorized.'}
end
end
desc "用户登出"
params do
end
delete do
authenticate!
::ApiKey.delete_all(user_id: current_user.id)
{status: 0}
end
end
end
end

View File

@ -40,7 +40,7 @@ module Mobile
authenticate!
us = UsersService.new
begin
ue = us.edit_user params
ue = us.edit_user params.merge(id: current_user.id)
{status: 0, data: ue}
rescue => e
{status: 1, message: e.message}