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
9f81e3ab
Commit
9f81e3ab
authored
Jul 25, 2017
by
liyijie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix valid? logic
parent
692eab74
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
authable.rb
lib/rails_api_authentication/authable.rb
+2
-2
No files found.
lib/rails_api_authentication/authable.rb
View file @
9f81e3ab
...
@@ -55,7 +55,7 @@ module RailsApiAuthentication
...
@@ -55,7 +55,7 @@ module RailsApiAuthentication
def
register
(
name
,
password
,
attrs
=
{})
def
register
(
name
,
password
,
attrs
=
{})
raise
(
UserError
.
new
(
401
,
'-1'
,
'password is blank'
))
if
password
.
blank?
raise
(
UserError
.
new
(
401
,
'-1'
,
'password is blank'
))
if
password
.
blank?
raise
(
UserError
.
new
(
401
,
'-1'
,
'valid token is not correct'
))
if
@valid_key
.
present?
&&
!
valid?
(
name
,
attrs
[
@valid_key
])
raise
(
UserError
.
new
(
401
,
'-1'
,
'valid token is not correct'
))
unless
valid?
(
name
,
attrs
[
@valid_key
])
self
.
create!
({
@auth_key
=>
name
,
@auth_password
=>
generate_password
(
password
)}.
merge
attrs
)
self
.
create!
({
@auth_key
=>
name
,
@auth_password
=>
generate_password
(
password
)}.
merge
attrs
)
rescue
ActiveRecord
::
RecordInvalid
=>
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
raise
UserError
.
new
(
401
,
'-1'
,
e
.
message
)
raise
UserError
.
new
(
401
,
'-1'
,
e
.
message
)
...
@@ -81,7 +81,7 @@ module RailsApiAuthentication
...
@@ -81,7 +81,7 @@ module RailsApiAuthentication
end
end
def
valid?
name
,
valid_code
def
valid?
name
,
valid_code
valid_code
==
$redis
.
get
(
name
)
@valid_key
.
blank?
||
(
valid_code
.
present?
&&
valid_code
==
$redis
.
get
(
name
)
)
end
end
def
auth
(
request
)
def
auth
(
request
)
...
...
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