2fa 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581baafb237e2897facab0f9d6a21a5ce8ed2be2f0f32fd85d2b16de58d32e1c
-  data.tar.gz: e9fa994ebf0cf2d2b6cd9b97859e28e90147e4fc3e62d47650855e2b27437dba
+  metadata.gz: 38c6ee1d02fd641ab961cd51780f30d11b4596c344a1a076fce5d0c1687a679b
+  data.tar.gz: 39087b415fb04ea9049cb5721e8e1117975f005de5411dddfd366d6e557aa789
 SHA512:
-  metadata.gz: 2182301e7efb89cb639a00a4e8038854dc5d59d30996be2bb18c18f9279f3da1793da6a86fca6dd81bead89be94b69a71f09d1396479ca6abff26be6ff0aeeaf
-  data.tar.gz: cb81b21b6a96dd7759e03779c1d067d3c0e28b31fe35e8732e99f7fbe5931699057954d085168573f388c89ba1bea950466ba03801806b7a5f3aeace65fcc8ad
+  metadata.gz: 5795911bb57902b834af94f9181b27e60401082a54d2b53b59db0ba4acaa4fab5b22e2030dc44c9952bd7a955f782797ce92e54c423c8178d9c6ce1a65f92dae
+  data.tar.gz: 03b4ca5e1a4128f5353083258af7a8b20e459f06270e4974488a004ef6721cf9bd0611573669faf477f68aece0d2ccd2635ab0040ef64c7cbe8e4e6fd49fec95

data/app/helpers/tfa/tfa_helper.rb

@@ -29,8 +29,12 @@ module TFA
       controller.redirect_to Engine.routes.url_helpers.tfa_verify_path(@tfa)
     end
 
-    def if_tfa(&block)
-      if params[:tfa_id] && Tfa.find_by(id: params[:tfa_id]).code.to_s == params[:code].to_s && !Tfa.find_by(id: params[:tfa_id]).used
+    def tfa_valid(expected_phone:nil)
+      params[:tfa_id] && Tfa.find_by(id: params[:tfa_id]).code.to_s == params[:code].to_s && !Tfa.find_by(id: params[:tfa_id]).used && (Tfa.find_by(id: params[:tfa_id]).phone == expected_phone || expected_phone == nil)
+    end
+
+    def if_tfa(expected_phone:nil, &block)
+      if tfa_valid(expected_phone: expected_phone)
         @tfa = Tfa.find_by(id: params[:tfa_id])
         @tfa.used = true
         @tfa.save
@@ -39,10 +43,8 @@ module TFA
       end
     end
 
-    def no_tfa(&block)
-      if !params[:tfa_id]
-        block.call
-      elsif Tfa.find_by(id: params[:tfa_id]).code.to_s != params[:code].to_s
+    def no_tfa(expected_phone:nil, &block)
+      if !tfa_valid(expected_phone: expected_phone)
         block.call
       end
     end

data/lib/TFA/version.rb

@@ -2,7 +2,7 @@ module TFA
   @@version = {
     major: 0,
     minor: 0,
-    patch: 1,
+    patch: 2,
     extra: [
     ]
   }

data/readme.md

@@ -33,7 +33,7 @@ def create
   end
 
   helpers.if_tfa do
-    @example = example.new(example_params)
+    @example = Example.new(example_params)
 
     respond_to do |format|
       if @example.save
@@ -49,14 +49,10 @@ end
 ```
 This is just a default scaffolded controller but with tfa auth.
 
-This isn't perfect as in theory someone could pass a different unused tfa by inspecting the form, so to prevent this, you can take in a `|tfa|` argument from the helper to verify that the tfa has the correct phone number.
+This isn't perfect as in theory someone could pass a different unused tfa by inspecting the form, so to prevent this, you can pass a `expected_phone: ` argument to `no_tfa` or `if_tfa` to add that requirement.
 ```rb
-helpers.if_tfa do |tfa|
-  if tfa.phone == @user.phone
-    #...your code here
-  else
-    head 401
-  end 
+helpers.if_tfa(expected_phone: @user.phone) do
+  #...
 end
 ```
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 2fa
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthias Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- 2fa-0.0.1.gem
 - 2fa.gemspec
 - app/controllers/tfa/tfas_controller.rb
 - app/helpers/tfa/tfa_helper.rb