app_rail-airtable 0.4.5 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28964042f95bd7532166f56c9f95550573038d02bf9097eeff287698a2dd261d
-  data.tar.gz: 64ddc07fb9c729ae38940e0111346465bee157ee600a69265b47f9ab4163c51e
+  metadata.gz: 3d413292d55b91966eeed50458ef1cd264cc278add196d53fbab2633dfd406d3
+  data.tar.gz: e16281efca091bc9d9e2dc2abf2f81c4c16416cd9cf27a6b34127bd191899bb0
 SHA512:
-  metadata.gz: 05efe59ea2696590acf285e0c641f5c1ef42961f42b46aaed2c316d449ef797e06d3f9f15a14488ee4385e29028609bac35e67dcca41fdb6fa44edc35f51a346
-  data.tar.gz: e28840bfed651fee92759cf4102157b7a45472c0bb87b7a0d1e8bafe81afce034b2e8db3e6090045063b01d3c990e8e369ce8d682c5f7fc988e776801968cd0f
+  metadata.gz: a4c6b3fe35603c645186b1d45d67d16f4afa1d556500abb1f5467b9ae78be4b29dc847e85a9c3379ecf75ebf0b94894e5d620557096eec9abad06d8e1248017b
+  data.tar.gz: e61beebcf401102669f1707ddc4f2a5b6b9f7d25585b05cbace9198a1d55196739ca22e73297699fc5413c1226d1a050c754cd7f2fdbd49bdc34a436950dd90f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.6
+* Add authenticatable_resource POST / DELETE `/<resource>/session` routes for sign in and sign out
+* Simplify sign in methods & remove Authenticatable#create_session_as_json
+
 # 0.4.0
 
 ### Breaking changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_rail-airtable (0.4.5)
+    app_rail-airtable (0.4.8)
       activesupport
       airrecord
       app_rail-steps
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -23,28 +23,28 @@ GEM
       faraday (>= 1.0, < 3.0)
       faraday-net_http_persistent
       net-http-persistent
-    app_rail-steps (0.2.9)
-    bcrypt (3.1.17)
+    app_rail-steps (0.2.16)
+    bcrypt (3.1.18)
     byebug (11.1.3)
     concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    connection_pool (2.3.0)
     diff-lcs (1.4.4)
-    faraday (2.2.0)
-      faraday-net_http (~> 2.0)
+    faraday (2.6.0)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.2)
-    faraday-net_http_persistent (2.0.1)
-      faraday-net_http
+    faraday-net_http (3.0.1)
+    faraday-net_http_persistent (2.1.0)
+      faraday (~> 2.5)
       net-http-persistent (~> 4.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
-    mustermann (1.1.1)
+    minitest (5.16.3)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
     rack (2.2.3)
-    rack-protection (2.2.0)
+    rack-protection (2.2.2)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -63,14 +63,14 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.2.0)
+      rack-protection (= 2.2.2)
       tilt (~> 2.0)
     thor (1.1.0)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
+    tilt (2.0.11)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS

data/lib/app_rail/airtable/authenticatable.rb

@@ -12,7 +12,7 @@ module AppRail
 
       def self.included(klass)
         klass.extend(ClassMethods)
-        klass.prepend(InstanceMethods) # prepends `initialize` instance method in order to take precedence over Airrecord::Table#initialize
+        klass.prepend(InstanceMethods)
       end
 
       module ClassMethods
@@ -24,15 +24,6 @@ module AppRail
           user
         end
 
-        def create_session_as_json(email:, password:)
-          user = find_by_email_and_password(email, password)
-          return nil unless user
-
-          user['Access Token'] = next_access_token
-          user.save
-          user&.oauth_session
-        end
-
         def find_by_email_and_password(email, password)
           user = find_by_email(email)
           user&.valid_password?(password) ? user : nil
@@ -56,25 +47,31 @@ module AppRail
       end
 
       module InstanceMethods
-        def initialize(*args)
-          if (kwargs = args.first) && kwargs.is_a?(Hash) && kwargs.size == 2 && kwargs.key?(:email) && kwargs.key?(:password)
-            super('Email' => kwargs[:email], 'Password Hash' => self.class.password_hash(kwargs[:password]), 'Access Token' => self.class.next_access_token)
-          else
-            super
-          end
+        def valid_password?(password)
+          BCrypt::Password.new(password_hash) == password
         end
-      end
 
-      def valid_password?(password)
-        BCrypt::Password.new(password_hash) == password
-      end
+        def password_hash
+          self['Password Hash']
+        end
 
-      def password_hash
-        self['Password Hash']
-      end
+        def oauth_session
+          ensure_access_token!
+
+          {
+            access_token: self['Access Token'],
+            scope: :user,
+            token_type: :bearer,
+            expires_in: 31_536_000 # 1 year
+          }
+        end
 
-      def oauth_session
-        { access_token: self['Access Token'], scope: :user, refresh_token: '', token_type: :bearer, expires_in: 60_000 }
+        def ensure_access_token!
+          unless self['Access Token']
+            self['Access Token'] = User.next_access_token
+            save
+          end
+        end
       end
     end
   end

data/lib/app_rail/airtable/authentication_helpers.rb

@@ -22,6 +22,10 @@ module AppRail
         request.env['HTTP_AUTHORIZATION']
       end
 
+      def oauth_client_id
+        ENV.fetch('OAUTH_CLIENT_ID')
+      end
+
       def authenticate!
         halt 401 unless current_user
       end

data/lib/app_rail/airtable/sinatra.rb

@@ -46,6 +46,8 @@ module AppRail
         # Allowing the routes to use `authenticate!` and `current_user`
         helpers AppRail::Airtable::AuthenticationHelpers
 
+        sign_in_route(name)
+        sign_out_route(name)
         resources(name, only: only)
 
         return unless block_given?
@@ -64,6 +66,28 @@ module AppRail
         update_route(name, authenticated_route?) if only.include?(:update)
       end
 
+      def self.sign_in_route(name)
+        post "/#{name}/session" do
+          halt [401, { error: 'Invalid client_id' }.to_json] unless params['client_id'] == oauth_client_id
+
+          resource = name.classify_constantize.authenticate_by_params(params)
+          halt [401, { error: 'Invalid credentials' }.to_json] unless resource
+
+          resource.oauth_session.to_json
+        end
+      end
+
+      def self.sign_out_route(name)
+        delete "/#{name}/session" do
+          authenticate!
+          current_user.access_token = nil
+          current_user.save
+
+          # Assume that the client will reload and trigger a 401
+          [].to_json
+        end
+      end
+
       def self.index_route(name, authenticated_route)
         get "/#{name}" do
           authenticate! if authenticated_route

data/lib/app_rail/airtable/version.rb

@@ -2,6 +2,6 @@
 
 module AppRail
   module Airtable
-    VERSION = '0.4.5'
+    VERSION = '0.4.8'
   end
 end

data/templates/project/Gemfile

@@ -3,10 +3,12 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.4'
+ruby '3.1.2'
 
-gem 'app_rail-airtable', '~> 0.4.0'
+gem 'app_rail-airtable'
 gem 'app_rail-steps'
+gem 'sinatra', '~> 3.0', '>= 3.0.2'
+gem 'puma'
 
 group :development do
   gem 'dotenv'

data/templates/project/boot.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+ENV['RACK_ENV'] ||= 'development'
+
+require 'dotenv/load' if ENV['RACK_ENV'] == 'development'
+
+require 'bundler'
+Bundler.require(:default, ENV['RACK_ENV'].to_sym)

data/templates/project/config.ru

@@ -1,13 +1,6 @@
 # frozen_string_literal: true
 
 $stdout.sync = true
-
-ENV['RACK_ENV'] ||= 'development'
-require 'dotenv/load' if ENV['RACK_ENV'] == 'development'
-require 'bundler'
-Bundler.require(:default, ENV['RACK_ENV'].to_sym)
-
-require 'dotenv/load' if ENV['RACK_ENV'] == 'development'
-
+require './boot'
 require './lib/server'
 run Server

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_rail-airtable
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.8
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,6 +187,7 @@ files:
 - templates/project/.gitignore
 - templates/project/Gemfile
 - templates/project/app.json
+- templates/project/boot.rb
 - templates/project/config.ru
 - templates/project/lib/server.rb.tt
 - templates/project/spec/server_spec.rb.tt
@@ -212,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Gem to help building App Rail servers using Airtable as a backend