softwear-lib 1.5.6 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557217d84e460a14db3f2e7fdaa3f8d23baab04b
-  data.tar.gz: 6ed4d9f028f3e2ff0ed9a82f0a881531d8f53be1
+  metadata.gz: 4f0b0ffdf353b1125791532b04b4c69178f3848d
+  data.tar.gz: b5ffb662dafdbd0ced2e2b3fda77c68314ed4a9e
 SHA512:
-  metadata.gz: 50776b3c2a6b20ad8c6a817e9924b5ee183d39f887bab0106a763d8fdfa593bbefb0f8aa16e9dc8414f94f2c1a958f2ead01d686da635046afb40968dadc905b
-  data.tar.gz: 599f451f5d2102733836e5c43c3aade4b70e578dde3ee5db92e214295b82f22943cc976623cf465dfc2d57afaca6afbf99d5bbefdefb56046aa02411676787b9
+  metadata.gz: 51397655427dfd487c7690028a486f73e2b35bd4a5fa4bfd7a92b02a3b5f1cfe651d63d26238c4f5d0e5f3620e263264d8535abc8eb6f2bf9678921354fda310
+  data.tar.gz: 536a85856023e46c1897ba453764710d257cc940beb5923b6510c1f3ff9ffaf40ab7c605443a469f927c9b3f4d0c6c25720f6ca64a43f537e16a3d36d2447a65

data/lib/softwear/auth/token_authentication.rb

@@ -0,0 +1,56 @@
+module Softwear
+  module Auth
+    module TokenAuthentication
+      extend ActiveSupport::Concern
+
+      included do
+        cattr_accessor :user_class
+        cattr_accessor :token_auth_options
+      end
+
+      def token_authenticate_user!
+        user_class = self.class.user_class || base_class.user_class || User
+        options    = (self.class.token_auth_options || base_class.token_auth_options || {}).with_indifferent_access
+        params_options  = (options[:params]  || {}).with_indifferent_access
+        headers_options = (options[:headers] || {}).with_indifferent_access
+
+        email_param  = params_options[:email]                 || 'user_email'
+        token_param  = params_options[:authentication_token]  || 'user_token'
+        email_header = headers_options[:email]                || 'X-User-Email'
+        token_header = headers_options[:authentication_token] || 'X-User-Token'
+
+        email = params[email_param] || headers[email_header]
+        token = params[token_param] || headers[token_header]
+
+        return render_unauthorized if email.blank? || token.blank?
+
+        case user_class.query "token #{Figaro.env.hub_app_name} #{email} #{token}"
+        when 'no'      then render_unauthorized
+        when 'invaild' then render_unauthorized
+        when 'sorry'   then render_internal_server_error
+        when 'yes'     then true
+        end
+      end
+
+      private
+
+      def render_unauthorized
+        respond_to do |format|
+          format.json do
+            render status: :unauthorized,
+                   json: { error: "Invalid or missing credentials" }
+          end
+        end
+      end
+
+      def render_internal_server_error
+        respond_to do |format|
+          format.json do
+            render status: :internal_server_error,
+                   json: { error: "Authentication server broke" }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/softwear/lib.rb

@@ -7,6 +7,7 @@ require "softwear/auth/helper"
 require "softwear/auth/model"
 require "softwear/auth/belongs_to_user"
 require "softwear/auth/spec"
+require "softwear/auth/token_authentication"
 
 module Softwear
   module Lib

data/lib/softwear/lib/api_controller.rb

@@ -19,6 +19,17 @@ module Softwear
       self.class_attribute :resource_class, :instance_writer => false unless self.respond_to? :resource_class
       self.class_attribute :parents_symbols,  :resources_configuration, :instance_writer => false
 
+      def self.base_class
+        Softwear::Lib::ApiController
+      end
+
+      def self.token_authenticate(user_class, options = {})
+        include Softwear::Auth::TokenAuthentication
+        self.user_class = user_class
+        self.token_auth_options = options
+        prepend_before_filter :token_authenticate_user!
+      end
+
       def index(&block)
         yield if block_given?
 
@@ -77,6 +88,10 @@ module Softwear
 
       protected
 
+      def base_class
+        self.class.base_class
+      end
+
       def render_json(options = {})
         proc do
           if options.is_a?(Hash)

data/lib/softwear/lib/controller_authentication.rb

@@ -32,7 +32,7 @@ module Softwear
       # Action called when a NotSignedInError is raised.
       # ====================
       def user_not_signed_in
-        redirect_to Figaro.env.softwear_hub_url + "/users/sign_in?#{{return_to: request.original_url}.to_param}"
+        redirect_to softwear_hub_url + "/users/sign_in?#{{return_to: request.original_url}.to_param}"
       end
 
       # ====================
@@ -97,21 +97,21 @@ module Softwear
       end
 
       def destroy_user_session_path
-        Figaro.env.softwear_hub_url + "/users/sign_out"
+        softwear_hub_url + "/users/sign_out"
       end
 
       def user_path(user)
         user_id = user.is_a?(user_class) ? user.id : user
-        Figaro.env.softwear_hub_url + "/users/#{user_id}"
+        softwear_hub_url + "/users/#{user_id}"
       end
 
       def edit_user_path(user)
         user_id = user.is_a?(user_class) ? user.id : user
-        Figaro.env.softwear_hub_url + "/users/#{user_id}/edit"
+        softwear_hub_url + "/users/#{user_id}/edit"
       end
 
       def users_path
-        Figaro.env.softwear_hub_url + "/users"
+        softwear_hub_url + "/users"
       end
 
       private

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.5.6"
+    VERSION = "1.5.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.8
 platform: ruby
 authors:
 - Nigel Baillie
@@ -88,6 +88,7 @@ files:
 - lib/softwear/auth/helper.rb
 - lib/softwear/auth/model.rb
 - lib/softwear/auth/spec.rb
+- lib/softwear/auth/token_authentication.rb
 - lib/softwear/lib.rb
 - lib/softwear/lib/api_controller.rb
 - lib/softwear/lib/authentication.rb