cow_auth 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfaaf0d5f8c6e90a6f6cef610a1e22ae253e9583
-  data.tar.gz: c5817e97f60e5dae55dd9ea28df6c821ac47bc4f
+  metadata.gz: 6bde8798e339337d6f36ff9501e53cd585f79937
+  data.tar.gz: 4778ac785e62c819ff028c55d8027c940d9d78a0
 SHA512:
-  metadata.gz: b71afdd4e265c535ddfa8dfda4963c4df1a5db672085487448bee259995910e1b8a5fc1b995e41c225a97da81a7eb596cccf2e2d0ff0019e9a1db02e8694036f
-  data.tar.gz: 952dfd528ae4264b8f7dad71f33c709403bd72cf92fc7e1e3681ce7e320a6318435b4979effe3d81d9115114b9fc4e1146598749e6f2616a82cab6eb3a9dba59
+  metadata.gz: a340166bbe215adbf73ce3fe211a48d34c94db184cde1c2c3b2ed8ef541f1ac39bc6a8b33ed86e83748ff5fc67e02597dfbdd7b6e5ae09b94ac40daf705b9a79
+  data.tar.gz: 03f15f6a5cee66db6b30404d602f4bb3188a30c3c60d01d34ffe8167dbb1a8548a7210e98e15da13e88c665157fb039765d955a1df164abfc295bbc5aa88cee2

data/lib/cow_auth/authentication.rb

@@ -1,3 +1,5 @@
+require 'cow_auth/not_authenticated_error'
+
 module CowAuth
   module Authentication
     extend ActiveSupport::Concern
@@ -9,13 +11,9 @@ module CowAuth
       authenticate_or_request_with_http_token do |api_key, options|
         sid, auth_token = api_key.match(/sid=([[:alnum:]]*)&auth_token=([[:alnum:]]*)/).try(:captures)
         @current_user = User.authenticate_from_token(sid, auth_token)
+        raise CowAuth::NotAuthenticatedError.new('User not authenticated.') if @current_user.blank?
+        return true
       end
     end
-
-    def request_http_token_authentication(realm = 'Application', message = nil)
-      message ||= 'HTTP Token: Access denied.'
-      self.headers['WWW-Authenticate'] = %(Token realm="#{realm.tr('"'.freeze, ''.freeze)}")
-      self.__send__ :render, json: { error: message }, status: :unauthorized
-    end
   end
 end

data/lib/cow_auth/not_authenticated_error.rb

@@ -0,0 +1,4 @@
+module CowAuth
+  class NotAuthenticatedError < StandardError
+  end
+end

data/lib/cow_auth/session.rb

@@ -1,14 +1,15 @@
+require 'cow_auth/not_authenticated_error'
+
 module CowAuth
   module Session
     extend ActiveSupport::Concern
 
     def create
-      user = User.find_by(email: params[:email])
-      if user.try(:authenticate, params[:password])
-        user.api_sign_in
-        render json: user
+      @user = User.find_by(email: params[:email])
+      if @user.try(:authenticate, params[:password])
+        @user.api_sign_in
       else
-        render json: { error: 'Invalid user credentials.' }, status: :unauthorized
+        raise CowAuth::NotAuthenticatedError.new('Invalid user credentials.')
       end
     end
 
@@ -16,7 +17,7 @@ module CowAuth
       if @current_user.try(:api_sign_out)
         head :ok
       else
-        render json: { error: 'Could not sign user out.' }, status: :unauthorized
+        raise CowAuth::NotAuthenticatedError.new('Could not sign user out.')
       end
     end
   end

data/lib/cow_auth/user.rb

@@ -39,6 +39,10 @@ module CowAuth
       $redis.del(self.redis_key)
     end
 
+    def auth_token
+      return User.fetch_api_key_from_redis(self.sid).try(:[], :auth_token)
+    end
+
     def self.authenticate_from_token(sid, auth_token)
       api_key = User.fetch_api_key_from_redis(sid)
       if api_key.present? && api_key.key?(:auth_token) && api_key.key?(:expires_at) && api_key[:auth_token] == auth_token && api_key[:expires_at] > Time.zone.now
@@ -47,21 +51,6 @@ module CowAuth
       return nil
     end
 
-    def as_json(options = nil)
-      return {
-        uuid: self.uuid,
-        email: self.email,
-        sid: self.sid,
-        auth_token: User.fetch_api_key_from_redis(self.sid).try(:[], :auth_token),
-        first_name: self.first_name,
-        last_name: self.last_name,
-        sign_in_count: self.sign_in_count,
-        is_approved: self.is_approved,
-        created_at: self.created_at,
-        updated_at: self.updated_at
-      }
-    end
-
   protected
 
     def redis_key

data/lib/cow_auth/version.rb

@@ -1,3 +1,3 @@
 module CowAuth
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/cow_auth.rb

@@ -2,9 +2,10 @@ require 'cow_auth/version'
 require 'cow_auth/user'
 require 'cow_auth/session'
 require 'cow_auth/authentication'
+require 'cow_auth/not_authenticated_error'
 
 module CowAuth
-  def self.hi
+  def self.moo
     user = CowAuth::User.new
     puts user
     return user

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cow_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mickey Cowden
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - cow_auth.gemspec
 - lib/cow_auth.rb
 - lib/cow_auth/authentication.rb
+- lib/cow_auth/not_authenticated_error.rb
 - lib/cow_auth/session.rb
 - lib/cow_auth/user.rb
 - lib/cow_auth/version.rb