token_authenticate_me 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357dfb44bfccd7add446f558d0f3fa3b65b3dc79
-  data.tar.gz: a65010e05cae35dced331e904977d84f4840f38e
+  metadata.gz: f2b5c60c44ccbe339c703e42d76de4136c11e3a6
+  data.tar.gz: ad45ef4018814f35c501f61589a445aa87f28b7e
 SHA512:
-  metadata.gz: b3ed534c136e7832c43de248eef0618024a3ea8c588285760d440a5fc42818ab612b32b739e68d46b0091b7394d41337ef4a8210b378b94312637394ea69038d
-  data.tar.gz: 7b9ed23311e1e928e2fb2611014c37538bb32e220657e812a3a87fd23261ca6be184e1b38b82900df2ad64f841c9345f29b3e14fe0d8a0776964bdcf0c3a6fc0
+  metadata.gz: 5288acbf84d8217ff85bcf5c8ff79fa9ad0780ec79b195943a1e7537df68f4c79b7328da753969c1ed731504702833eb3106dfe62358c21ddea12891e5b1c77b
+  data.tar.gz: 4311270529652292415ab2bea7b2728464fac4f32e2a106d0316654feaa8d086491b65536ea886c9b932516c49fdca40ed9313eaec2c74da6965fdca2a568abb

data/lib/generators/token_authenticate_me/install/install_generator.rb

@@ -6,13 +6,6 @@ module TokenAuthenticateMe
 
         invoke 'token_authenticate_me:models', params
         invoke 'token_authenticate_me:controllers', params
-        invoke 'api_me:policy', %w(user username email password password_confirmation)
-        invoke 'api_me:filter', ['user']
-        invoke 'serializer', %w(user username email created_at updated_at)
-
-        inject_into_class Rails.root.join('app', 'policies', 'user_policy.rb'), UserPolicy do
-          "  def create?\n    true\n  end\n"
-        end
       end
     end
   end

data/lib/generators/token_authenticate_me/models/models_generator.rb

@@ -47,6 +47,18 @@ module TokenAuthenticateMe
 
       private
 
+      def authenticate_model_singular_name
+        'user' # singular_name
+      end
+
+      def session_model_plural_name
+        'sessions' # "#{singular_name}_sessions"
+      end
+
+      def session_model_singular_name
+        'session' # "#{singular_name}_session"
+      end
+
       def next_migration_number
         self.class.next_migration_number('db/migrations')
       end

data/lib/generators/token_authenticate_me/models/templates/authentication_model.rb

@@ -3,4 +3,9 @@ require 'token_authenticate_me/models/authenticatable'
 class User < ActiveRecord::Base
   include TokenAuthenticateMe::Models::Authenticatable
 
+  has_many :#{session_model_plural_name}
+
+  def as_json(options=nil)
+    { #{authenticate_model_singular_name}: super(options) }
+  end
 end

data/lib/generators/token_authenticate_me/models/templates/session_model.rb

@@ -3,4 +3,10 @@ require 'token_authenticate_me/models/sessionable'
 class Session < ActiveRecord::Base
   include TokenAuthenticateMe::Models::Sessionable
 
+  belongs_to :#{authenticate_model_singular_name}
+
+  def as_json(options={})
+    { #{session_model_singular_name}: super({ include: :#{authenticate_model_singular_name} }.merge(options)) }
+  end
+
 end

data/lib/token_authenticate_me/controllers/sessionable.rb

@@ -17,7 +17,7 @@ module TokenAuthenticateMe
           resource = User.where('username=? OR email=?', params[:username], params[:username]).first
           if resource && resource.authenticate(params[:password])
             @session = Session.create(user_id: resource.id)
-            render json: serialize_session(@session), status: 201
+            render json: @session, status: 201
           else
             render json: { message: 'Bad credentials' }, status: 401
           end
@@ -25,7 +25,7 @@ module TokenAuthenticateMe
 
         def show
           @session = authenticate_token
-          render json: serialize_session(@session)
+          render json: @session
         end
 
         def destroy
@@ -38,16 +38,6 @@ module TokenAuthenticateMe
 
         private
 
-        def serialize_session(session)
-          {
-            session: {
-              key: session.key,
-              user_id: session.user_id,
-              expiration: session.expiration
-            }
-          }
-        end
-
         def session_params
           params.permit(:username, :email, :password)
         end

data/lib/token_authenticate_me/models/authenticatable.rb

@@ -21,6 +21,16 @@ module TokenAuthenticateMe
           uniqueness: { case_sensitive: false }
         )
 
+        def attributes
+          {
+            'id' => id,
+            'username' => username,
+            'email' => email,
+            'created_at' => created_at,
+            'updated_at' => updated_at
+          }
+        end
+
         def create_reset_token!
           # rubocop:disable Lint/Loop
           begin

data/lib/token_authenticate_me/models/sessionable.rb

@@ -8,6 +8,15 @@ module TokenAuthenticateMe
       included do
         before_create :generate_unique_key
 
+        def attributes
+          {
+            'key' => key,
+            'expiration' => expiration,
+            'created_at' => created_at,
+            'updated_at' => updated_at
+          }
+        end
+
         private
 
         def generate_unique_key

data/lib/token_authenticate_me/version.rb

@@ -1,3 +1,3 @@
 module TokenAuthenticateMe
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/spec/acceptance/session_api_spec.rb

@@ -14,7 +14,7 @@ describe 'Session API' do
     expect(json['session']).not_to be_nil
     expect(json['session']['key']).not_to be_nil
     expect(json['session']['expiration']).not_to be_nil
-    expect(user.id).to eq(json['session']['user_id'])
+    expect(user.id).to eq(json['session']['user']['id'])
   end
 
   it 'creates a new session when authenticating with a email and password' do
@@ -30,7 +30,7 @@ describe 'Session API' do
     expect(json['session']).not_to be_nil
     expect(json['session']['key']).not_to be_nil
     expect(json['session']['expiration']).not_to be_nil
-    expect(user.id).to eq(json['session']['user_id'])
+    expect(user.id).to eq(json['session']['user']['id'])
   end
 
   it 'fails to create a new session when authenticating with an invalid password' do
@@ -61,7 +61,7 @@ describe 'Session API' do
     expect(json['session']).not_to be_nil
     expect(json['session']['key']).not_to be_nil
     expect(json['session']['expiration']).not_to be_nil
-    expect(user.id).to eq(json['session']['user_id'])
+    expect(user.id).to eq(json['session']['user']['id'])
   end
 
   it 'fetching an expired session fails' do

data/spec/acceptance/users_api_spec.rb

@@ -53,4 +53,18 @@ describe 'Users API' do
 
     expect(last_response.status).to eq(401)
   end
+
+  it 'does not serialze password digest' do
+    user = create_user
+    session = Session.create!(user_id: user.id)
+
+    header 'Authorization', 'Token token=' + session.key
+    get '/users/' + user.id.to_s + '/'
+
+    expect(last_response.status).to eq(200)
+    json = JSON.parse(last_response.body)
+
+    expect(json['user']).not_to be_nil
+    expect(json['user']['password_digest']).to be_nil
+  end
 end

data/spec/internal/app/models/session.rb

@@ -2,4 +2,10 @@ require 'token_authenticate_me/models/sessionable'
 
 class Session < ActiveRecord::Base
   include TokenAuthenticateMe::Models::Sessionable
+
+  belongs_to :user
+
+  def as_json(options = {})
+    { session: super({ include: :user }.merge(options)) }
+  end
 end

data/spec/internal/app/models/user.rb

@@ -2,4 +2,10 @@ require 'token_authenticate_me/models/authenticatable'
 
 class User < ActiveRecord::Base
   include TokenAuthenticateMe::Models::Authenticatable
+
+  has_many :sessions
+
+  def as_json(options = nil)
+    { user: super(options) }
+  end
 end

data/spec/internal/app/policies/user_policy.rb

@@ -10,6 +10,10 @@ class UserPolicy
     true
   end
 
+  def show?
+    true
+  end
+
   class Scope
     attr_reader :user, :scope
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: token_authenticate_me
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord