aadhar 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFkNzcxYmNlMWNkZmVjZDhhNmFjZDQwZTFlZjM5YzUwZmUwNjg2OA==
+    ZTlkMTg0MmZjOGMxMzBlM2Y5NDU3M2EyOTQ4NjBkYjdiYTVkY2EwMg==
   data.tar.gz: !binary |-
-    NzM5MTU5OWNiZDc3YWE3YzMxZWJiYjRjYjc4YTdjZmQ5NzFhMDk3ZA==
+    ZDA5OTBhZmZmMTVkMTQzOTRlZDUxZmNkNDUzNTU3MmNjYTU3YzM2Ng==
 SHA512:
   metadata.gz: !binary |-
-    YmM3NDg0YTQ4MmUwMjBlMTE4ZTc0ZTgzZDRjMTM5MjE0YzIzNmI2NDhmY2Y3
-    YTA2Njg5Y2E4ODhkYWE5ZTZjNmI2MzhiNDVmN2U1MjAxZDVkNTU5YWU5YzE3
-    MmExZDA1OGM3OWQ4ZjVkZjZlOWVhYzliZDEyMmIyYzJjYjlmNzA=
+    MmJmNjlhMTk1ZGE2ZTE3Y2E2ZWUyMDM3MDNiOTgzZDExYTA2ZDIxNDgyYjZl
+    ODBmNDk3NWYxZjhmZTYzOWE1YmQ2MTZkNmFkZWRhYzRlMTAyYWM2MDk0YTZi
+    NGNkMjNkNDY2NTk2YWIyY2FhZmViNmY1ZTZkY2UwN2VjNWNhMjI=
   data.tar.gz: !binary |-
-    MGQ2YjdjZDk4MDJkNWEyYTdmYzlkN2ExMzQ5MjZmNjUzNGM0NzYxMjdmZTEz
-    NTNhMzZmZDA2Y2JiYmMyNzIwMzZkMTg1Y2EyOGU2MTZjOGEyNjA1OGMwZWRk
-    MjNlMjMyMjZlNDNiYzI1YTIwYmZjMTM5ODA1YWY5NjM3NmQ0YzY=
+    ZmE3Yjk1YjY4OGM5NjczN2ViOWI1MDYwY2RjYjY5ZWU2ZjQ5ZmVjNDA0MWM5
+    MmMxYWM2ODYxN2E4YTc2YWEzNWM2NmUxYTgzMDY4YzM5NGFiZTcwYTk3NDU2
+    ZjA1ZjExYWIyNTAwNjU2YTE3MWI2MWVjYjljZDNlZTQyZGE4NDk=

data/app/controllers/aadhar/sessions_controller.rb

@@ -1,14 +1,15 @@
 class Aadhar::SessionsController < Aadhar::ApplicationController
+  before_filter :authenticate, only: [:destroy]
 
   def create
     user = User.authenticate(params[:email], params[:password])
     if user
-      user.save_token
+      authentication_token = AuthenticationToken.create_token(user)
       render :status => 200,
         :json => { :success => true,
                    :info => "Logged in",
                    :data => { 
-                     :auth_token => user.authentication_token, 
+                     :auth_token => authentication_token.token, 
                      :user => {
                        id: user.id,
                        email: user.email,
@@ -24,7 +25,8 @@ class Aadhar::SessionsController < Aadhar::ApplicationController
   end
 
   def destroy
-  	current_user.update_column(:authentication_token, nil)
+    authentication_token = AuthenticationToken.where(token: params[:auth_token], user_id: current_user.id).first
+    authentication_token.destroy
     render :status => 200,
            :json => { :success => true,
                       :info => "Logged out",

data/app/controllers/aadhar/users_controller.rb

@@ -5,7 +5,6 @@ class Aadhar::UsersController < Aadhar::ApplicationController
     @user.set_temporary_password
     @user.change_password = true
     if @user.save
-      #RegistrationEmailJob.set(wait: 20.seconds).perform_later(@user, @user.temp_password)
       UserMailer.signup_email(@user, @user.temp_password).deliver_later
       render :status => 200,
            :json => { :success => true,

data/app/models/authentication_token.rb

@@ -0,0 +1,20 @@
+class AuthenticationToken < ActiveRecord::Base
+	belongs_to :user
+
+	class << self
+	  def generate_token
+        token = loop do
+          random_token = SecureRandom.urlsafe_base64(nil, false)
+          break random_token unless AuthenticationToken.exists?(token: random_token)
+        end
+
+        return token
+      end
+
+      def create_token(user)
+      	authentication_token = AuthenticationToken.create!(user_id: user.id, token: generate_token)
+      	return authentication_token
+      end
+    end
+
+end

data/app/models/user.rb

@@ -8,6 +8,8 @@ class User < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :email
 
+  has_many :authentication_tokens
+
   def self.authenticate(email, password)
     user = find_by_email(email)
     if user && user.password_hash == ::BCrypt::Engine.hash_secret(password, user.password_salt)
@@ -38,15 +40,4 @@ class User < ActiveRecord::Base
     return Array.new(password_length){||lower_alphabets[rand(lower_alphabets.size)]}.join
   end
 
-  def generate_token
-    self.authentication_token = loop do
-      random_token = SecureRandom.urlsafe_base64(nil, false)
-      break random_token unless self.class.exists?(authentication_token: random_token)
-    end
-  end
-
-  def save_token
-  	self.generate_token
-  	self.save
-  end
 end

data/db/migrate/20150130043153_create_users.rb

@@ -5,7 +5,6 @@ class CreateUsers < ActiveRecord::Migration
       t.string :email
       t.string :password_hash
       t.string :password_salt
-      t.string :authentication_token
       t.boolean :change_password, default: false
 
       t.timestamps null: false

data/db/migrate/20150227220755_create_authentication_tokens.rb

@@ -0,0 +1,9 @@
+class CreateAuthenticationTokens < ActiveRecord::Migration
+  def change
+    create_table :authentication_tokens do |t|
+    	t.integer :user_id
+    	t.string  :token
+    	t.timestamps null: false
+    end
+  end
+end

data/lib/aadhar/authenticate.rb

@@ -7,7 +7,10 @@ module Aadhar
 		end
 
 	    def current_user
-	        @current_user ||= User.where(authentication_token: params[:auth_token]).first
+	        @current_user ||= begin
+	          authentication = AuthenticationToken.where(token: params[:auth_token]).first
+	          authentication.present? ? authentication.user : nil
+	        end
 	    end
 	end
 end

data/lib/aadhar/version.rb

@@ -1,3 +1,3 @@
 module Aadhar
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aadhar
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Krunal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,7 @@ files:
 - app/controllers/aadhar/users_controller.rb
 - app/helpers/aadhar/application_helper.rb
 - app/mailers/user_mailer.rb
+- app/models/authentication_token.rb
 - app/models/user.rb
 - app/views/layouts/aadhar/application.html.erb
 - app/views/layouts/aadhar/mailer.html.erb
@@ -95,6 +96,7 @@ files:
 - app/views/user_mailer/signup_email.html.erb
 - config/routes.rb
 - db/migrate/20150130043153_create_users.rb
+- db/migrate/20150227220755_create_authentication_tokens.rb
 - lib/aadhar.rb
 - lib/aadhar/authenticate.rb
 - lib/aadhar/engine.rb