app_rail-airtable 0.2.9 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e09f5f21d40b2186a9b4d985d85305c0f4e54e4066d74ee45a5c43a32a303ad
-  data.tar.gz: 0ab6b313e24780b1f83e2359638e783ff3d7ca7b6958b14c7c80ba479262e07c
+  metadata.gz: b50f647ec9cbe6a4872a61db88b1bdb15eb9c960b90c219fc5023ea38078e940
+  data.tar.gz: ab041ecd7134b4f611460f0e7cacf94fdb1e873066d148d7e69217dc904a018c
 SHA512:
-  metadata.gz: 5cdd4ff73e660d69000ac91e1204047f7637a7d58e351e1253639a60423828ccf3c8417083aeaadf1d4d3660584302cbfab9a39f5f737a5b501257fdf6f0359e
-  data.tar.gz: b9e534d2132bf753fd8cdf8d1126cdf629921177bbaf164e6ca21cabd64b9b207830dcbc9087a09f480c03d0c5ebb8e0101a8ae1d6625da851dc8bc8e589eee3
+  metadata.gz: dbbe3242c32cf4a94a045e58085024224c1b18423936f89228dc00f6672f6c76db979ac6bc242ec89792d3f330626d0a0b900154efd941cb9314545b4109e033
+  data.tar.gz: 2c3827c50ebdda11aebd971160d45d2fedae642628f59f757f43c48ee020607eca527da0cc159ecb6b7387b371e5c74d27660e960746dff5bf4ad06c1f6442d9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_rail-airtable (0.2.9)
+    app_rail-airtable (0.2.13)
       activesupport
       airrecord
       bcrypt

data/lib/app_rail/airtable/authenticatable.rb

@@ -0,0 +1,56 @@
+require 'bcrypt'
+require 'securerandom'
+
+module AppRail
+  module Airtable
+    module Authenticatable
+      include BCrypt
+  
+      def self.included(klass)
+        klass.extend(ClassMethods)
+      end
+      
+      module ClassMethods
+        def create(email:, password:)
+          user = User.new("Email" => email, "Password Hash" => password_hash(password), "Access Token" => access_token)
+          user.create
+          user
+        end
+        
+        def create_session_as_json(email:, password:)
+          user = find_by_email_and_password(email, password)
+          user&.oauth_session
+        end
+  
+        def find_by_email_and_password(email, password)
+          user = all(filter: "{Email} = \"#{email}\"").first
+          user.valid_password?(password) ? user : nil
+        end
+
+        def find_by_access_token(access_token)
+          all(filter: "{Access Token} = \"#{access_token}\"").first 
+        end
+        
+        def password_hash(password)
+          BCrypt::Password.create(password)
+        end   
+        
+        def access_token
+          SecureRandom.hex
+        end    
+      end
+      
+      def valid_password?(password)
+        BCrypt::Password.new(password_hash) == password
+      end
+      
+      def password_hash
+        self["Password Hash"]
+      end
+    
+      def oauth_session
+        { access_token: self["Access Token"], scope: :user, refresh_token: "", token_type: :bearer, expires_in: 60000 }
+      end
+    end
+  end
+end

data/lib/app_rail/airtable/authentication_helpers.rb

@@ -0,0 +1,27 @@
+module AppRail
+  module Airtable
+    module AuthenticationHelpers
+      def current_user
+        @current_user ||= find_current_user
+      end
+  
+      def find_current_user
+        authorization_header && bearer_token ? User.find_by_access_token(bearer_token) : nil
+      end
+  
+      def bearer_token
+        authorization_values = authorization_header.split(" ")
+        return nil unless authorization_values.count > 1
+        authorization_values[1]
+      end
+  
+      def authorization_header
+        request.env["HTTP_AUTHORIZATION"]
+      end
+  
+      def authenticate!
+        halt 401 unless current_user
+      end
+    end
+  end
+end

data/lib/app_rail/airtable/sinatra.rb

@@ -31,7 +31,7 @@ module AppRail
           JSON.parse(request.body.read)
         end
         
-        def params_and_json_body
+        def params_and_body_as_json
           request_body_as_json.merge(params)
         end
       end
@@ -61,7 +61,7 @@ module AppRail
       def self.create_route(name, authenticated)
         post "/#{name.to_s}" do
           authenticate! if authenticated
-          as_json = name.classify_constantize.create_as_json(current_user: authenticated ? current_user : nil, params: params_and_json_body)
+          as_json = name.classify_constantize.create_as_json(current_user: authenticated ? current_user : nil, params: params_and_body_as_json)
           [201, as_json.to_json] 
         end
       end

data/lib/app_rail/airtable/version.rb

@@ -1,5 +1,5 @@
 module AppRail
   module Airtable
-    VERSION = "0.2.9"
+    VERSION = "0.2.13"
   end
 end

data/lib/app_rail/airtable.rb

@@ -1,7 +1,8 @@
 require "app_rail/airtable/version"
 require "app_rail/airtable/string_ext"
 require "app_rail/airtable/application_record"
-require "app_rail/airtable/authentication_record"
+require "app_rail/airtable/authenticatable"
+require "app_rail/airtable/authentication_helpers"
 require "app_rail/airtable/sinatra"
 require "app_rail/airtable/generator"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_rail-airtable
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.13
 platform: ruby
 authors:
 - Matt Brooke-Smith
@@ -130,7 +130,8 @@ files:
 - bin/setup
 - lib/app_rail/airtable.rb
 - lib/app_rail/airtable/application_record.rb
-- lib/app_rail/airtable/authentication_record.rb
+- lib/app_rail/airtable/authenticatable.rb
+- lib/app_rail/airtable/authentication_helpers.rb
 - lib/app_rail/airtable/generator.rb
 - lib/app_rail/airtable/sinatra.rb
 - lib/app_rail/airtable/string_ext.rb

data/lib/app_rail/airtable/authentication_record.rb

@@ -1,27 +0,0 @@
-require 'bcrypt'
-
-module AppRail
-  module Airtable
-    class AuthenticationRecord < ApplicationRecord
-      include BCrypt
-      airtable_attr "Email", "Password Hash", "Access Token"
-  
-      def self.create_session_as_json(email:, password:)
-        user = find_by_email_and_password(email, Password.create(password))
-        user&.oauth_session
-      end
-  
-      def self.find_by_email_and_password(email, password_hash)
-        all(filter: "AND({Email} = \"#{email}\",{Password Hash} = \"#{password_hash}\")").first
-      end
-  
-      def self.find_by_access_token(access_token)
-        all(filter: "{Access Token} = \"#{access_token}\"").first 
-      end
-  
-      def oauth_session
-        { access_token: self["Access Token"], scope: :user, refresh_token: "", token_type: :bearer, expires_in: 60000 }
-      end
-    end
-  end
-end