arkaan 0.7.18 → 0.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 905077c1bbe8679549f8949e8f90f2132a3e217d
-  data.tar.gz: 31cd85935a4dee853d2b5f176d551e8d63503f0d
+  metadata.gz: 7600e95ffa796c17564879976e258e2be2d93120
+  data.tar.gz: a0703ac0822608b541fc8afc5adc394677de44f4
 SHA512:
-  metadata.gz: 309c732e2dac6be5cf4f91d66838da2ac0d440c60f606da2a65aaa6fc2ce7a4193f2e5e06d11f0a2667e4b3adf130640371bde13f68e603269fd92b322514af8
-  data.tar.gz: 8adf71cff63870589f9291725b2c086170c4bc381bd92c1089f3da343247475e78d89a545e589b8d89eb13ea35833b0de7e4e663680e24a9cfcbc6c99da39c3e
+  metadata.gz: c19ada966e37f2d2028135e36fe7387f8f9c606c8250bb3428cb64a0fcdb6505d0c7593cf0536f812c39d762fd93ee81c08a3b1146c988d6eb2f543e5a92f7bc
+  data.tar.gz: 9df8559123c96edd543cb253269643f26f7810306b93f089e4cb3d44d0251f29764e185fc128f1efeaaa562fd8e4c9ccd62dd85a994b250910acd3606e55d768

data/lib/arkaan/utils/controller.rb

@@ -9,15 +9,12 @@ module Arkaan
         check_presence('token', 'app_key')
 
         gateway = Arkaan::Monitoring::Gateway.where(token: params['token']).first
-        application = Arkaan::OAuth::Application.where(key: params['app_key']).first
-        route = parse_current_route
-
+        @application = Arkaan::OAuth::Application.where(key: params['app_key']).first
+        
         if gateway.nil?
           halt 404, {message: 'gateway_not_found'}.to_json
-        elsif application.nil?
+        elsif @application.nil?
           halt 404, {message: 'application_not_found'}.to_json
-        elsif route && route.premium? && !application.premium?
-          halt 401, {message: 'application_not_authorized'}.to_json
         end
       end
 
@@ -44,7 +41,17 @@ module Arkaan
         unless service.nil? || !service.routes.where(path: path, verb: verb).first.nil?
           Arkaan::Monitoring::Route.create(path: path, verb: verb, premium: premium, service: service)
         end
-        self.public_send(verb, path, &block)
+        if premium
+          self.public_send(verb, path) do
+            @sinatra_route = parse_current_route
+            if !@application.premium?
+              halt 401, {message: 'application_not_authorized'}.to_json
+            end
+            instance_eval(&block)
+          end
+        else
+          self.public_send(verb, path, &block)
+        end
       end
 
       # Checks the presence of several fields given as parameters and halts the execution if it's not present.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.19
 platform: ruby
 authors:
 - Vincent Courtois