app_rail-airtable 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28964042f95bd7532166f56c9f95550573038d02bf9097eeff287698a2dd261d
-  data.tar.gz: 64ddc07fb9c729ae38940e0111346465bee157ee600a69265b47f9ab4163c51e
+  metadata.gz: 3e4126f9d575a705e24ba998e9adb2ecd3dc95c567e13668a733b246fe9401fc
+  data.tar.gz: 58b0c53b463db9b7689c580b1fc5d7284c0d72ddf10e51f5eeeee1e63a65fc65
 SHA512:
-  metadata.gz: 05efe59ea2696590acf285e0c641f5c1ef42961f42b46aaed2c316d449ef797e06d3f9f15a14488ee4385e29028609bac35e67dcca41fdb6fa44edc35f51a346
-  data.tar.gz: e28840bfed651fee92759cf4102157b7a45472c0bb87b7a0d1e8bafe81afce034b2e8db3e6090045063b01d3c990e8e369ce8d682c5f7fc988e776801968cd0f
+  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.5)
+    app_rail-airtable (0.4.6)
       activesupport
       airrecord
       app_rail-steps

data/lib/app_rail/airtable/authenticatable.rb

@@ -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
@@ -74,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

@@ -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,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

data/lib/app_rail/airtable/version.rb

@@ -2,6 +2,6 @@
 
 module AppRail
   module Airtable
-    VERSION = '0.4.5'
+    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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_rail-airtable
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-02 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