flexite 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d7bada1d5045fd4b95cb1dd115062cd966a1649
-  data.tar.gz: 29c5ae3a83840ff6acb5e77d92df35fd6bcbffd1
+  metadata.gz: 93abeafc1fb15b62e131eead8ee95aa2c947ae1f
+  data.tar.gz: b9d52aa9cf10452949e3c0b79f9313ced090e2a0
 SHA512:
-  metadata.gz: 4b49b3cc5018d207ac1f6517e5d76ffa75fe50ded089e5b7835b874ac9824e933ac5aa9bb7761b793bbd08f4c6dafcc263b198d7948051175343097e53128c02
-  data.tar.gz: 1bbd4ba48643870ae320f184a1cc493c2d21c68a8a3c5aee25200871deb5073af44c5163f47c29681157d400678258bfa36bc480b099d6dfd796942a13649894
+  metadata.gz: d1603f09285642a4c41a5bacc996374fcf88eaa74a81b9aeaabd995623c536fd3794eccfc4d5a9c5639e61b4cc0ec412f291eb7ead7b6977006b34ffbb739052
+  data.tar.gz: de6215c0a7c55e1ca1dabb5472528d3e7711e64b5c1f2b606a9e1e3ea8782830f5dde0248a38390869fbfa1f4c46588f95654d805349393ff1f9f69c778d2bb7

data/app/controllers/flexite/diffs_controller.rb

@@ -8,7 +8,7 @@ module Flexite
     end
 
     def apply
-      render json: ServiceFactory.instance.get(:apply_diff, params[:stage], params[:checksum]).call
+      render json: ServiceFactory.instance.get(:apply_diff, params[:token], params[:stage], params[:checksum]).call
     end
 
     def push

data/app/services/flexite/diff/apply_service.rb

@@ -1,12 +1,17 @@
 module Flexite
   class Diff
     class ApplyService
-      def initialize(stage, checksum)
+      def initialize(token, stage, checksum)
         @stage = stage
+        @token = Token.new(token)
         @checksum = checksum
       end
 
       def call
+        if @token.invalid?
+          return { error: 'Invalid token', code: 401 }
+        end
+
         diffs = Flexite.cache.read("#{Flexite.state_digest}-#{@checksum}-#{@stage}-diffs")
 
         if diffs.blank?

data/app/services/flexite/diff/async_show_service.rb

@@ -9,11 +9,11 @@ module Flexite
         end
 
         expire_old
-        nodes = File.read(File.join(Rails.root, 'tmp', 'nodes.json'))
-        checksum = Digest::MD5.hexdigest(nodes)
+        nodes = Config.t_nodes
+        checksum = Digest::MD5.hexdigest(nodes.to_json)
         Flexite.cache.write("#{Flexite.state_digest}-#{@stage}-diff-checksum", checksum)
-        @remote_diff.check({ token: 'test', tree: JSON.parse(f.read), stage: Flexite.config.stagename, checksum: checksum })
-        ActionService::Result.new(flash: { type: :warning, message: "You will be notified via #{Flexite.config.async_diff_handler.notifier} when difference check will be completed" },
+        @remote_diff.check({ token: Flexite.config.migration_token, tree: nodes, stage: Flexite.config.stagename, checksum: checksum })
+        ActionService::Result.new(flash: { type: :warning, message: "You will be notified via #{Flexite.config.async_diff_handler&.notifier} when difference check will be completed" },
                                   endpoint: { partial: 'flexite/shared/show_flash' })
       end
     end

data/app/services/flexite/diff/push_service.rb

@@ -17,7 +17,7 @@ module Flexite
           return ActionService::Result.new(flash: { type: :warning, message: 'Settings were changed and difference should be revalidated' })
         end
 
-        response = @remote_diff.apply({ stage: Flexite.config.stagename, checksum: checksum })
+        response = @remote_diff.apply({ token: Flexite.config.migration_token, stage: Flexite.config.stagename, checksum: checksum })
 
         if response[:error].blank?
           ActionService::Result.new(flash: { type: :success, message: response[:message] })

data/app/services/flexite/diff/sync_show_service.rb

@@ -12,10 +12,10 @@ module Flexite
 
         if response.nil?
           expire_old
-          nodes = Config.t_nodes.to_json
-          checksum = Digest::MD5.hexdigest(nodes)
+          nodes = Config.t_nodes
+          checksum = Digest::MD5.hexdigest(nodes.to_json)
           Flexite.cache.write("#{@state_digest}-#{@stage}-diff-checksum", checksum)
-          response = @remote_diff.check({ token: Flexite.config.migration_token, tree: JSON.parse(nodes), stage: Flexite.config.stagename, checksum: checksum })
+          response = @remote_diff.check({ token: Flexite.config.migration_token, tree: nodes, stage: Flexite.config.stagename, checksum: checksum })
           Flexite.cache.write("#{@state_digest}-#{@stage}-show-diff", response)
         end
 
@@ -31,6 +31,7 @@ module Flexite
 
       def result(response)
         if response[:error].present?
+          expire_old
           ActionService::Result.new(success: false, flash: { type: :danger, message: response[:error] }, endpoint: { partial: 'flexite/shared/show_flash' })
         else
           ActionService::Result.new(data: response[:diffs], endpoint: { action: :sync_show })

data/lib/flexite/version.rb

@@ -1,3 +1,3 @@
 module Flexite
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end