Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rails_api_authentication
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
rails_api_authentication
Commits
ddf4d010
Commit
ddf4d010
authored
Mar 05, 2018
by
ivan Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change some code of UserError.new from 401 to 400
parent
86cc5c41
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
authable.rb
lib/rails_api_authentication/authable.rb
+4
-4
No files found.
lib/rails_api_authentication/authable.rb
View file @
ddf4d010
...
@@ -12,7 +12,7 @@ module RailsApiAuthentication
...
@@ -12,7 +12,7 @@ module RailsApiAuthentication
end
end
def
update_password
password
def
update_password
password
raise
(
UserError
.
new
(
40
1
,
'-1'
,
'password is blank'
))
if
password
.
blank?
raise
(
UserError
.
new
(
40
0
,
'-1'
,
'password is blank'
))
if
password
.
blank?
auth_password
=
self
.
class
.
auth_password
auth_password
=
self
.
class
.
auth_password
self
.
update
(
auth_password
=>
self
.
class
.
send
(
:generate_password
,
password
))
self
.
update
(
auth_password
=>
self
.
class
.
send
(
:generate_password
,
password
))
end
end
...
@@ -61,7 +61,7 @@ module RailsApiAuthentication
...
@@ -61,7 +61,7 @@ module RailsApiAuthentication
raise
(
UserError
.
new
(
401
,
'-1'
,
'Unauthorized'
))
if
user
.
nil?
raise
(
UserError
.
new
(
401
,
'-1'
,
'Unauthorized'
))
if
user
.
nil?
AuthToken
.
create
(
self
,
oauth_params
(
params
).
merge
({
oid:
user
.
id
})
)
AuthToken
.
create
(
self
,
oauth_params
(
params
).
merge
({
oid:
user
.
id
})
)
rescue
ActiveRecord
::
RecordInvalid
=>
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
raise
UserError
.
new
(
40
1
,
'-1'
,
e
.
message
)
raise
UserError
.
new
(
40
0
,
'-1'
,
e
.
message
)
end
end
def
login
(
name
,
password
,
params
=
{})
def
login
(
name
,
password
,
params
=
{})
...
@@ -102,13 +102,13 @@ module RailsApiAuthentication
...
@@ -102,13 +102,13 @@ module RailsApiAuthentication
end
end
def
register
(
name
,
password
,
attrs
=
{})
def
register
(
name
,
password
,
attrs
=
{})
raise
(
UserError
.
new
(
40
1
,
'-1'
,
'password is blank'
))
if
password
.
blank?
raise
(
UserError
.
new
(
40
0
,
'-1'
,
'password is blank'
))
if
password
.
blank?
valid!
name
,
attrs
.
delete
(
@valid_key
)
valid!
name
,
attrs
.
delete
(
@valid_key
)
user
=
self
.
create!
({
@auth_key
=>
name
,
@auth_password
=>
generate_password
(
password
)})
user
=
self
.
create!
({
@auth_key
=>
name
,
@auth_password
=>
generate_password
(
password
)})
user
.
token
=
AuthToken
.
create
(
self
,
oauth_params
(
attrs
).
merge
({
oid:
user
.
id
})
).
token
user
.
token
=
AuthToken
.
create
(
self
,
oauth_params
(
attrs
).
merge
({
oid:
user
.
id
})
).
token
user
user
rescue
ActiveRecord
::
RecordInvalid
=>
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
raise
UserError
.
new
(
40
1
,
'-1'
,
e
.
message
)
raise
UserError
.
new
(
40
0
,
'-1'
,
e
.
message
)
end
end
def
register_with
(
attrs
=
{})
def
register_with
(
attrs
=
{})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment