apiphobic-authorization 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae49ad16d7ccee68ad832094f557149dffe1b98c82975f31aba512b9f2cec00c
-  data.tar.gz: 6ee28b1abc416e418e27db5d722f8f5d24fc255245f639cc0fc4925c539ff01b
+  metadata.gz: 936fbde0291882daeb50f81249a28d4c50a9762b659049c6495385703c61ab06
+  data.tar.gz: 65febd7701bada72341db5628e500983752376513720f44eb0cf6a9be4dab0cc
 SHA512:
-  metadata.gz: 387c64f4a04f2028fd6ed326b5e855902388054589d7d56db872dad926d8d3506b2eba771704ba6563d3749978a9fd625420b3753aaa36ab5a9e020f00bfd2c5
-  data.tar.gz: 2a60f92f107dbfcdc7d2bdb7008b2df9d0bf1fc63acea278116f923979e041a4ebea5ee41ecce6f6da5372f3322a5d559f6e15890471c56da75b541d6479d611
+  metadata.gz: 2de1a7afe900c518b888bd9f1231d76fcc47208450452c313e06767d259a3470a290d3acf869a6b2dd6c9c3f732f572f0bbed437320e44ecd01f827238c60971
+  data.tar.gz: 23afc8e9bd16eb52fe96b3e93122aef1decdf59e5bd12a8e50a67e1055a1a89c61d075e7781fc133509177d5cb9ac02d6738ab26484b1c76b875079e06a93d2d

data/lib/apiphobic/authorization/authorizers/scope.rb

@@ -37,19 +37,17 @@ class   Scope
   end
 
   def call
-    if scope_user_id
-      user_scope
-    else
+    if user.nil?
       public_scope
+    else
+      user_scope
     end
   end
 
   private
 
   def scope_user_id
-    @scope_user_id ||= raw_parameters
-                         .fetch(:filter, {})
-                         .fetch(user_underscored_class_name, nil)
+    authorized_scope_id(name: user_underscored_class_name, default: user.id)
   end
 
   def user_underscored_class_name
@@ -59,6 +57,16 @@ class   Scope
       base_user_class_name.underscore.downcase
     end
   end
+
+  def authorized_scope_id(name:, default:)
+    if token.admin?
+      raw_parameters
+        .fetch(:filter, {})
+        .fetch("#{name}_id", default)
+    else
+      default
+    end
+  end
 end
 end
 end

data/lib/apiphobic/authorization/version.rb

@@ -2,6 +2,6 @@
 
 module Apiphobic
 module Authorization
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiphobic-authorization
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
   iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
   -----END CERTIFICATE-----
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apiphobic-resource