From 705d15c0c1959d3e50b2f8646830a15372c4797e Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 10 Aug 2023 16:05:14 -0300
Subject: [PATCH] fix: change token attribute from encrypted to normal in Rol
 model #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 22 ++++++++++++++-----
 app/models/rol.rb                             |  1 -
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index a538d99f..1933f24e 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -2,19 +2,31 @@
 
 module Api
     module V1
-      # Recibe webhooks y lanza jobs
+      # Recibe webhooks y lanza un PullJob
       class WebhooksController < BaseController
+        rescue_from ActiveRecord::RecordNotFound, with: :platforms_answer
+
+        def site 
+          @site ||= Site.find_by_name!(params[:site_id])
+        end
+
+        # valida la plataforma del webhook
+        def usuarie
+          # Gitlab 
+          token = request.headers["X-Gitlab-Token"]
+          @usuarie = site.roles.find_by!(temporal: false, rol: 'usuarie', token: token).usuarie
+        end
+
         # Trae los cambios a partir de un post de Webhooks:
         # (Gitlab, Github, Guitea, etc)
         def pull 
-          site = Site.find_by_name!(params[:site_id])
-          usuarie = GitAuthor.new email: "webhook@#{Site.domain}", name: 'Webhook'
           message = I18n.with_locale(site.default_locale) do
             I18n.t('webhooks.pull.message')
           end
-
           GitPullJob.perform_later(site, usuarie, message)
-          
+        end
+
+        def platforms_answer
           head :ok
         end
       end
diff --git a/app/models/rol.rb b/app/models/rol.rb
index f17bf418..37332400 100644
--- a/app/models/rol.rb
+++ b/app/models/rol.rb
@@ -14,7 +14,6 @@ class Rol < ApplicationRecord
 
   validates_inclusion_of :rol, in: ROLES
 
-  encrypts :token
   before_save :add_token_if_missing!
 
   def invitade?