forest_liana 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8f25a263a71b665bac3123e7095e02231fcd773
-  data.tar.gz: ca4ec89ea6c0d1721f09786fe17e45bbcc5725e0
+  metadata.gz: a4db7e02922415856e04fdc54fb7b4557853d253
+  data.tar.gz: 392d8c62c9766398b3373b530a77877ee195a78f
 SHA512:
-  metadata.gz: da2a3d664e0beae4a6a90238977490ace3153ba02f7daa8efafab3d77c0cb78ec319de95cec4e145444d24265dffafbec5440c8f2f1a20cd25bbedc95ffec990
-  data.tar.gz: 9053106fdbc35a96b0acd060bb0403efaa253d992ade6a7a27e37b9851083c2a887e5edb11d97a0318696f14bb103d5126cf270fa5f77f0926792233b1459876
+  metadata.gz: 2e330eafe8a7a2c9e81fd37037ea2703bf671821de2161bccb8e903807028f0aa01299bc0cf3edea500bccb3b6ecd984f33e5d3d4cd69922659fe6394b7e9b57
+  data.tar.gz: 03d746ad20c557fcd7ee569c62ab7983103703b38edfff8bce6a968b471dfb49a73a7cd1745eb50c521f9c355bba027438378155a872232b42caf6544d8795d4

data/app/controllers/forest_liana/sessions_controller.rb

@@ -24,6 +24,27 @@ module ForestLiana
       end
     end
 
+    def create_with_google
+      @error_message = nil
+
+      rendering_id = params['renderingId']
+      forest_token = params['forestToken']
+
+      user = GoogleAuthorizedUserGetter.new(rendering_id, forest_token).perform()
+      token = encode_token(user) if user
+
+      if token
+        render json: { token: token }, serializer: nil
+      else
+        if @error_message
+          render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
+            [{ detail: @error_message }]), status: :unauthorized
+        else
+          head :unauthorized
+        end
+      end
+    end
+
     private
 
     def check_user
@@ -43,7 +64,7 @@ module ForestLiana
     end
 
     def fetch_allowed_users
-      AllowedUsersGetter.new.perform(params['renderingId'])
+      AllowedUsersGetter.new(params['renderingId']).perform()
     end
 
     def has_internal_authentication?

data/app/services/forest_liana/allowed_users_getter.rb

@@ -1,45 +1,27 @@
 module ForestLiana
-  class AllowedUsersGetter
-    def perform(renderingId)
-      uri = URI.parse("#{forest_url}/forest/renderings/#{renderingId}/allowed-users")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if forest_url.start_with?('https')
-
-      begin
-        http.start do |client|
-          request = Net::HTTP::Get.new(uri.path)
-          request['Content-Type'] = 'application/json'
-          request['forest-secret-key'] = ForestLiana.env_secret
-          response = client.request(request)
+  class AllowedUsersGetter < UsersGetter
+    def initialize(rendering_id)
+      super('allowed-users', rendering_id)
+    end
 
-          if response.is_a?(Net::HTTPOK)
-            body = JSON.parse(response.body)
-            ForestLiana.allowed_users = body['data'].map do |d|
-              user = d['attributes']
-              user['id'] = d['id']
+    def handle_service_response(response)
+      if response.is_a?(Net::HTTPOK)
+        body = JSON.parse(response.body)
+        ForestLiana.allowed_users = body['data'].map do |d|
+          user = d['attributes']
+          user['id'] = d['id']
 
-              user
-            end
-          elsif response.is_a?(Net::HTTPNotFound)
-            FOREST_LOGGER.error "Cannot retrieve the project you\'re trying " \
-              "to unlock. Can you check that you properly copied the Forest " \
-              "env_secret in the forest_liana initializer?"
-          else
-            FOREST_LOGGER.error "Cannot retrieve any users for the project " \
-              "you\'re trying to unlock. An error occured in Forest API."
-            []
-          end
+          user
         end
-      rescue => exception
+      elsif response.is_a?(Net::HTTPNotFound)
+        FOREST_LOGGER.error "Cannot retrieve the project you\'re trying " \
+          "to unlock. Can you check that you properly copied the Forest " \
+          "env_secret in the forest_liana initializer?"
+      else
         FOREST_LOGGER.error "Cannot retrieve any users for the project " \
-          "you\'re trying to unlock. Forest API seems to be down right now."
+          "you\'re trying to unlock. An error occured in Forest API."
+        []
       end
     end
-
-    private
-
-    def forest_url
-      ENV['FOREST_URL'] || 'https://forestadmin-server.herokuapp.com';
-    end
   end
 end

data/app/services/forest_liana/google_authorized_user_getter.rb

@@ -0,0 +1,28 @@
+module ForestLiana
+  class GoogleAuthorizedUserGetter < UsersGetter
+    def initialize(rendering_id, forest_token)
+      @forest_token = forest_token
+      super('google-authorization', rendering_id)
+    end
+
+    def handle_service_response(response)
+      if response.is_a?(Net::HTTPOK)
+        body = JSON.parse(response.body)
+        body['data']['attributes']
+      elsif response.is_a?(Net::HTTPNotFound)
+        FOREST_LOGGER.error "Cannot retrieve the project you\'re trying " \
+          "to unlock. Can you check that you properly copied the Forest " \
+          "env_secret in the forest_liana initializer?"
+        nil
+      elsif response.is_a?(Net::HTTPUnauthorized)
+        FOREST_LOGGER.error "Cannot retrieve the user for the project " \
+          "you\'re trying to unlock. The google user account seems invalid."
+        nil
+      else
+        FOREST_LOGGER.error "Cannot retrieve the user for the project " \
+          "you\'re trying to unlock. An error occured in Forest API."
+        nil
+      end
+    end
+  end
+end

data/app/services/forest_liana/users_getter.rb

@@ -0,0 +1,39 @@
+module ForestLiana
+  class UsersGetter
+    def initialize(endpoint, rendering_id)
+      @uri = URI.parse("#{forest_url}/forest/renderings/#{rendering_id}/#{endpoint}")
+    end
+
+    def perform
+      http = Net::HTTP.new(@uri.host, @uri.port)
+      http.use_ssl = true if forest_url.start_with?('https')
+
+      begin
+        http.start do |client|
+          request = Net::HTTP::Get.new(@uri.path)
+          request['Content-Type'] = 'application/json'
+          request['forest-secret-key'] = ForestLiana.env_secret
+          request['forest-token'] = @forest_token if @forest_token
+          response = client.request(request)
+
+          handle_service_response(response)
+        end
+      rescue => exception
+        puts exception
+        FOREST_LOGGER.error "Cannot retrieve any users for the project " \
+          "you\'re trying to unlock. Forest API seems to be down right now."
+        nil
+      end
+    end
+
+    private
+
+    def forest_url
+      ENV['FOREST_URL'] || 'https://api.forestadmin.com';
+    end
+
+    def handle_service_response
+      raise 'Abstract class method, this method must be implemented.'
+    end
+  end
+end

data/config/routes.rb

@@ -6,6 +6,7 @@ ForestLiana::Engine.routes.draw do
 
   # Session
   post 'sessions' => 'sessions#create'
+  post 'sessions-google' => 'sessions#create_with_google'
 
   # Associations
   get ':collection/:id/relationships/:association_name' => 'associations#index'

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

data/test/routing/route_test.rb

@@ -20,6 +20,11 @@ module ForestLiana
       }, {
         controller: 'forest_liana/sessions', action: 'create'
       })
+      assert_routing({
+        method: 'post', path: 'sessions-google'
+      }, {
+        controller: 'forest_liana/sessions', action: 'create_with_google'
+      })
 
       # Associations
       assert_routing({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,6 +171,7 @@ files:
 - app/services/forest_liana/base_getter.rb
 - app/services/forest_liana/belongs_to_updater.rb
 - app/services/forest_liana/controller_factory.rb
+- app/services/forest_liana/google_authorized_user_getter.rb
 - app/services/forest_liana/has_many_associator.rb
 - app/services/forest_liana/has_many_dissociator.rb
 - app/services/forest_liana/has_many_getter.rb
@@ -200,6 +201,7 @@ files:
 - app/services/forest_liana/stripe_sources_getter.rb
 - app/services/forest_liana/stripe_subscription_getter.rb
 - app/services/forest_liana/stripe_subscriptions_getter.rb
+- app/services/forest_liana/users_getter.rb
 - app/services/forest_liana/value_stat_getter.rb
 - app/views/layouts/forest_liana/application.html.erb
 - config/initializers/arel-helpers.rb