token_authenticate_me 0.5.1 → 0.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 12c4c69767946c904157af82897d1c3e640b8847
4
- data.tar.gz: 987faf379aa13b83931179a9b11ccf666ae48cd2
3
+ metadata.gz: 18fc0fae8100169ad565315bc3cdd66b351c85b2
4
+ data.tar.gz: 91a6dc40f8b4e9f5b0ccfe0ae95c111000aa476d
5
5
  SHA512:
6
- metadata.gz: 0f513fd097745fafcead5f8d1e4c97439b34c4f46838a8586531f0f938fce081f1768bacbc288b706753754d2ecbac91a58a6ba70a6013ed89568eeae2a1e2e2
7
- data.tar.gz: 5a0bd02eb40cb8e82bd3d596b01ba5602dc1ea4d4f5ed12118a01c9ae8a43a9916793edee55a1f87693bbddb36cd9fa88d080ab29abf1aee7ad6a76bdcad1383
6
+ metadata.gz: f23a6d319cfa48e9377b7bfa167cd03380920910208e001e6dc9248114c9ea849492ea97518d2ebcf8029ceee59a26f2887fe6b0270140283be72aa4d38b8ad4
7
+ data.tar.gz: 3f5ba688dec5e1af7f3896215deeff7e8cb567f283f8e8446439fade87daf0fd9dea55a13ac376c8844911d44375de7611f2fb30003a435a1a7a015cb91b9481
data/config/routes.rb CHANGED
@@ -2,7 +2,7 @@ TokenAuthenticateMe::Engine.routes.draw do
2
2
  namespace :api do
3
3
  namespace :v1 do
4
4
  resource :session, only: [:create, :show, :destroy]
5
- resource :users
5
+ resources :users
6
6
 
7
7
  resources :invites, except: [:update] do
8
8
  member do
@@ -17,13 +17,19 @@ module TokenAuthenticateMe
17
17
  end
18
18
 
19
19
  def current_user
20
- if authenticate_token
21
- @current_user ||= User.find_by_id(authenticate_token.user_id)
22
- end
20
+ return @current_user if authenticate_token
21
+ @current_user ||= User.find_by_id(authenticate_token.user_id)
23
22
  end
24
23
 
25
24
  def authenticate_token
26
- @session ||= authenticate_with_http_token(&method(:token_handler))
25
+ @session ||= (
26
+ authenticate_with_http_token(&method(:token_handler)) || authenticate_with_params
27
+ )
28
+ end
29
+
30
+ def authenticate_with_params
31
+ token = params[:authentication_token]
32
+ token_handler(token, {})
27
33
  end
28
34
 
29
35
  def render_unauthorized
@@ -1,3 +1,3 @@
1
1
  module TokenAuthenticateMe
2
- VERSION = '0.5.1'.freeze
2
+ VERSION = '0.5.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: token_authenticate_me
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1
4
+ version: 0.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sam Clopton
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-07-27 00:00:00.000000000 Z
12
+ date: 2016-09-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails