tiddle 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a348d248985933eddf79f194679aa3c1ee6724006f3386a88d143efff7080b0d
-  data.tar.gz: 36f11c54b9cb1829fbbe07e200f404bb8958265582854dd71583a4f90565ef4b
+  metadata.gz: 30c0de8dba83157b465e1455956272549e210830cc8fe296aec744b0d046ca1c
+  data.tar.gz: 53652aefc5c51511b5f43df0c598ae6754e596e78a4be02aa01fa7e3dd40b95b
 SHA512:
-  metadata.gz: b2001e1d59b7fe3596dd7727477e3315f7bc91d4725653ace774bdce0804dd11dceded3908d8be15bf05f8bbcb30e29b90ea8e99366069e693e2eb1ed7526960
-  data.tar.gz: 34064918737c1c9d1da935488fee01b711823cedc9c5b7ccfd411b30a94390b241ca7a9f6106ecb8c9acb7a6847a475ad2f9930a431d39417a495e7a9a4df812
+  metadata.gz: 1ac88d0e37967ad77c5f6b7ffa96646910c90be6cc8fc2d6adead616e73673b8601b2664a0851eec3fbc0eaa2e968a7b5cce7b5ffb89187ca4c77bb12ae6d875
+  data.tar.gz: 55ceda21948c6ca6c872b863e22da925d00014625075a77e195f877f154b00ce31fe0a4e63c18a7e0c43b015a023617b4a33c6d4c23da95bee6f6652cc371a88

data/.rubocop.yml

@@ -26,7 +26,7 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Max: 15
 
-Gemspec/DateAssignment:
+Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 Layout/SpaceBeforeBrackets:
   Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.8.0
+
+Support different touch interval based on expiration time (Daniel André da Silva)
+
 ### 1.7.1
 
 Fix invalid headers generated when model is namespaced (Ariel Agne da Silveira)

data/CONTRIBUTING.md

@@ -9,3 +9,25 @@
 3. Introduce your change. If it's a new feature then write a test for it as well.
 4. Make sure that tests are passing.
 5. Push to your fork and submit a pull request.
+
+#### Docker for development
+
+Alternatively you can use Docker for the development setup. This requires Docker
+and Docker Compose installed.
+
+```
+make build
+make bundle
+```
+
+And in order to run the tests and linter checks:
+
+```
+make test
+```
+
+After you're done, cleanup leftover containers:
+
+```
+make cleanup
+```

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:3.1-alpine
+
+RUN apk add build-base sqlite-dev tzdata git bash
+RUN gem update --system && gem install bundler
+
+WORKDIR /library
+
+ENV BUNDLE_PATH=/vendor/bundle \
+    BUNDLE_BIN=/vendor/bundle/bin \
+    GEM_HOME=/vendor/bundle
+
+ENV PATH="${BUNDLE_BIN}:${PATH}"

data/Makefile

@@ -0,0 +1,16 @@
+.PHONY: build bundle test bash cleanup
+
+build:
+	docker-compose build
+
+bundle:
+	docker-compose run --rm library bundle install
+
+test:
+	docker-compose run --rm library bundle exec rake
+
+bash:
+	docker-compose run --rm library bash
+
+cleanup:
+	docker-compose down

data/docker-compose.yml

@@ -0,0 +1,23 @@
+version: "3.9"
+services:
+  library:
+    build:
+      context: .
+    stdin_open: true
+    tty: true
+    volumes:
+      - ".:/library"
+      - vendor:/vendor
+    depends_on:
+      - redis
+    environment:
+      - REDIS_URL=redis://redis:6379/1
+      - BUNDLE_GEMFILE=gemfiles/rails7.0.gemfile
+  redis:
+    image: "redis:6-alpine"
+    command: redis-server
+    volumes:
+      - "redis:/data"
+volumes:
+  vendor:
+  redis:

data/lib/tiddle/strategy.rb

@@ -57,15 +57,30 @@ module Devise
       end
 
       def touch_token(token)
-        token.update_attribute(:last_used_at, Time.current) if token.last_used_at < 1.hour.ago
+        return unless token.last_used_at < touch_token_interval(token).ago
+
+        token.update_attribute(:last_used_at, Time.current)
       end
 
       def unexpired?(token)
-        return true unless token.respond_to?(:expires_in)
-        return true if token.expires_in.blank? || token.expires_in.zero?
+        return true if expiration_disabled?(token)
 
         Time.current <= token.last_used_at + token.expires_in
       end
+
+      def touch_token_interval(token)
+        return 1.hour if expiration_disabled?(token) || token.expires_in >= 24.hours
+
+        return 5.minutes if token.expires_in >= 1.hour
+
+        1.minute
+      end
+
+      def expiration_disabled?(token)
+        !token.respond_to?(:expires_in) ||
+          token.expires_in.blank? ||
+          token.expires_in.zero?
+      end
     end
   end
 end

data/lib/tiddle/version.rb

@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "1.7.1".freeze
+  VERSION = "1.8.0".freeze
 end

data/spec/strategy_spec.rb

@@ -217,5 +217,89 @@ describe "Authentication using Tiddle strategy", type: :request do
         expect(response.status).to eq 401
       end
     end
+
+    context "with value lower than 24 hours" do
+      before do
+        @token = Tiddle.create_and_return_token(@user, FakeRequest.new, expires_in: 1.hour)
+      end
+
+      context "and token was last used a minute ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 1.minute.ago)
+        end
+
+        it "does not update last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.not_to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+
+      context "and token was last used 5 minutes ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 5.minute.ago)
+        end
+
+        it "updates last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+    end
+
+    context "with value lower than 1 hour" do
+      before do
+        @token = Tiddle.create_and_return_token(@user, FakeRequest.new, expires_in: 30.minutes)
+      end
+
+      context "and token was last used less than a minute ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 30.seconds.ago)
+        end
+
+        it "does not update last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.not_to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+
+      context "and token was last used a minute ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 1.minute.ago)
+        end
+
+        it "updates last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -141,10 +141,13 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Dockerfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - config/locales/en.yml
+- docker-compose.yml
 - gemfiles/rails5.2.gemfile
 - gemfiles/rails6.0.gemfile
 - gemfiles/rails6.1.gemfile