Fix merge conflicts

Author: jyoung488

app/controllers/callbacks_controller.rb

@@ -1,6 +1,20 @@
 class CallbacksController < ApplicationController
+  skip_before_action :verify_authenticity_token
+
   def index
-    @event = params
-    render json: @event, status: 200
+    @event = JSON.parse(params.to_json, symbolize_names: true)
+  end
+
+  def create
+    event = JSON.parse(params["json"], symbolize_names: true)
+    # event = @response["json"]
+    # object = JSON.parse(event, symbolize_names: true)
+    # p "***** EVENT TYPE"
+    # p event_type = object[:event][:event_type]
+
+    # client = Sign.initiate_client
+
+    event_type = event[:event][:event_type]
+
   end
 end

app/views/callbacks/create.html.erb

@@ -0,0 +1,3 @@
+Hello API event received
+
+<%= @event %>

app/views/callbacks/index.html.erb

@@ -1,5 +1 @@
 <h1>Hello API event received</h1>
-
-<div class="response-data">
-  <%= @event %>
-</div>

config/routes.rb

@@ -1,12 +1,15 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   resources :signs
-  resources :callbacks
+  # resources :callbacks
 
   root 'signs#index'
 
   post '/' => 'signs#index'
 
+  get '/callbacks' => 'callbacks#index'
+  post '/callbacks' => 'callbacks#create'
+
   get 'account' => 'signs#account'
   get 'signature-request' => 'signs#signature_request'
   get 'all-requests' => 'signs#all_requests'
@@ -26,5 +29,4 @@
   get '/embeddeds/unclaimed-draft-template' => 'embeddeds#unclaimed_draft_template'
   get '/embeddeds/template-draft' => 'embeddeds#template_draft'
 
-  post '/callbacks' => 'callbacks#index'
 end