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
b6a5ce44
Commit
b6a5ce44
authored
Jul 04, 2017
by
ivan Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update register to make it can accept more attrs
parent
9980927d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
auth_session.rb
lib/rails_api_authentication/auth_session.rb
+2
-2
authable.rb
lib/rails_api_authentication/authable.rb
+16
-2
No files found.
lib/rails_api_authentication/auth_session.rb
View file @
b6a5ce44
...
@@ -11,12 +11,12 @@ module RailsApiAuthentication
...
@@ -11,12 +11,12 @@ module RailsApiAuthentication
@auth_token
=
self
.
class
.
klass
.
login
(
session_params
[
auth_key
],
session_params
[
auth_password
])
@auth_token
=
self
.
class
.
klass
.
login
(
session_params
[
auth_key
],
session_params
[
auth_password
])
render
json:
{
token:
@auth_token
.
token
},
status:
200
render
json:
{
token:
@auth_token
.
token
},
status:
200
rescue
UserError
=>
e
rescue
UserError
=>
e
render
json:
e
.
message
,
status:
e
.
status
render
json:
{
error:
e
.
message
}
,
status:
e
.
status
end
end
def
destroy
def
destroy
self
.
send
(
"current_
#{
self
.
class
.
klass_sym
}
"
)
&
.
logout
self
.
send
(
"current_
#{
self
.
class
.
klass_sym
}
"
)
&
.
logout
render
json:
"logout successful"
,
status:
200
render
json:
{
message:
"logout successful"
}
,
status:
200
end
end
private
private
...
...
lib/rails_api_authentication/authable.rb
View file @
b6a5ce44
...
@@ -35,9 +35,23 @@ module RailsApiAuthentication
...
@@ -35,9 +35,23 @@ module RailsApiAuthentication
user
.
nil?
?
raise
(
UserError
.
new
(
401
,
'-1'
,
'Unauthorized'
))
:
user
user
.
nil?
?
raise
(
UserError
.
new
(
401
,
'-1'
,
'Unauthorized'
))
:
user
end
end
def
register
(
name
,
password
)
def
register
(
attrs_or_name
,
password
=
nil
)
if
attrs_or_name
.
respond_to?
(
:to_h
)
# attrs_or_name is an Hash or ActionController::Parameters
@_attrs_copy
=
attrs_or_name
.
clone
name
=
@_attrs_copy
[
@auth_key
]
password
=
@_attrs_copy
.
delete
(
@auth_password
)
else
name
=
attrs_or_name
end
raise
(
UserError
.
new
(
401
,
'-1'
,
'password is blank'
))
if
password
.
blank?
raise
(
UserError
.
new
(
401
,
'-1'
,
'password is blank'
))
if
password
.
blank?
self
.
create!
(
@auth_key
=>
name
,
@auth_password
=>
generate_password
(
password
))
self
.
create!
({
@auth_key
=>
name
,
@auth_password
=>
generate_password
(
password
)
}.
merge
(
@_attrs_copy
||
{}
)
)
rescue
ActiveRecord
::
RecordInvalid
=>
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
raise
UserError
.
new
(
401
,
'-1'
,
e
.
message
)
raise
UserError
.
new
(
401
,
'-1'
,
e
.
message
)
end
end
...
...
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