app_rail-airtable 0.4.3 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f789fb754083245cc062131945cb235ac19070edd2e3ae154e5a233b1533f76b
-  data.tar.gz: '08a45094b4ba5b5882a8a1baed2acc39c3345adaa8d8557b8ae2daaa3a2bb96c'
+  metadata.gz: 3e4126f9d575a705e24ba998e9adb2ecd3dc95c567e13668a733b246fe9401fc
+  data.tar.gz: 58b0c53b463db9b7689c580b1fc5d7284c0d72ddf10e51f5eeeee1e63a65fc65
 SHA512:
-  metadata.gz: e9bdf986a03d4ce2e00368f7a4ac5048a8b2271778647d1ea27adce3c8b8fa185854e339b2769ee0e0acfce5bfb6dc985cdafc3b4787a8f78fad2da5fdda1681
-  data.tar.gz: 995431a75366484398c7d90e1e12a3950ac47c23ca6ebe78b9410320dd17224cf08d401df7f613f60b62dca8458103f506d5ebe3e6d5bb0aea0a60a726cce2dc
+  metadata.gz: f5969fbe95e911778f4b44104137c6ffe13163e55ea0a57aa13d6b03746ea4ef00daec15b6af9eb1a1c5d58fd2da5903e6cc2e90c71d7cd222dbacfa69b9f11f
+  data.tar.gz: b73be3571e4711e835b2a287a38132e8b38c071d433672de505ccce12c2e1658206fb35fdf4985dcc7ef6b32853cf69996e81589ac50fbfec431b6fed261cfe1

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.3)
+    app_rail-airtable (0.4.6)
       activesupport
       airrecord
       app_rail-steps
@@ -14,16 +14,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.2.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    airrecord (1.0.9)
-      faraday (>= 0.10, < 3.0)
+    airrecord (1.0.10)
+      faraday (>= 1.0, < 3.0)
       faraday-net_http_persistent
       net-http-persistent
-    app_rail-steps (0.2.0)
+    app_rail-steps (0.2.9)
     bcrypt (3.1.17)
     byebug (11.1.3)
     concurrent-ruby (1.1.10)

data/app_rail-airtable.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.executables << 'ara_generator'
 
   spec.require_paths = ['lib']
-  spec.add_dependency 'app_rail-steps'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'airrecord'
+  spec.add_dependency 'app_rail-steps'
   spec.add_dependency 'bcrypt'
   spec.add_dependency 'faraday', '~> 2.2'
   spec.add_dependency 'faraday-net_http_persistent', '~> 2.0' # workaround to make Faraday work after upgrading to 2.2.0

data/lib/app_rail/airtable/authenticatable.rb

@@ -6,6 +6,8 @@ require 'securerandom'
 module AppRail
   module Airtable
     module Authenticatable
+      class AlreadyExistsError < StandardError; end
+
       include BCrypt
 
       def self.included(klass)
@@ -15,25 +17,22 @@ module AppRail
 
       module ClassMethods
         def create(email:, password:)
+          raise AlreadyExistsError if find_by_email(email)
+
           user = new('Email' => email, 'Password Hash' => password_hash(password), 'Access Token' => next_access_token)
           user.create
           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 = all(filter: "{Email} = \"#{email}\"").first
+          user = find_by_email(email)
           user&.valid_password?(password) ? user : nil
         end
 
+        def find_by_email(email)
+          all(filter: "{Email} = \"#{email}\"").first
+        end
+
         def find_by_access_token(access_token)
           all(filter: "{Access Token} = \"#{access_token}\"").first
         end
@@ -66,7 +65,21 @@ module AppRail
       end
 
       def oauth_session
-        { access_token: self['Access Token'], scope: :user, refresh_token: '', token_type: :bearer, expires_in: 60_000 }
+        ensure_access_token!
+
+        {
+          access_token: self['Access Token'],
+          scope: :user,
+          token_type: :bearer,
+          expires_in: 31_536_000 # 1 year
+        }
+      end
+
+      def ensure_access_token!
+        unless self['Access Token']
+          self['Access Token'] = User.next_access_token
+          save
+        end
       end
     end
   end

data/lib/app_rail/airtable/sinatra.rb

@@ -12,6 +12,10 @@ class Symbol
     ActiveSupport::Inflector.pluralize(self)
   end
 
+  def singularize
+    ActiveSupport::Inflector.singularize(self)
+  end
+
   def classify
     ActiveSupport::Inflector.classify(self)
   end
@@ -42,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?
@@ -60,6 +66,26 @@ module AppRail
         update_route(name, authenticated_route?) if only.include?(:update)
       end
 
+      def self.sign_in_route(name)
+        post "/#{name}/session" do
+          resource = name.classify_constantize.authenticate_by_params(params)
+          halt 401 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
@@ -77,9 +103,13 @@ module AppRail
       def self.create_route(name, authenticated_route)
         post "/#{name}" do
           authenticate! if authenticated_route
-          as_json = name.classify_constantize.create_as_json(current_user: authenticated_route ? current_user : nil,
-                                                             params: params_and_body_as_json)
-          [201, as_json.to_json]
+          begin
+            as_json = name.classify_constantize.create_as_json(current_user: authenticated_route ? current_user : nil,
+                                                               params: params_and_body_as_json)
+            [201, as_json.to_json]
+          rescue AppRail::Airtable::Authenticatable::AlreadyExistsError
+            [422, { error: "#{name.singularize} already exists" }.to_json]
+          end
         end
       end
 

data/lib/app_rail/airtable/version.rb

@@ -2,6 +2,6 @@
 
 module AppRail
   module Airtable
-    VERSION = '0.4.3'
+    VERSION = '0.4.6'
   end
 end

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,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: app_rail-airtable
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.6
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: app_rail-steps
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: airrecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: airrecord
+  name: app_rail-steps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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