hephaestus 0.8.15.5 → 0.8.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 507c05485b78ef114764457b17768d84c9d94e57f1171a7ad8823b0aeaa4ea9c
-  data.tar.gz: 2688ee1d57371e64c8b6677ac249c4c43c5609d7c34067186ad23025ba94915e
+  metadata.gz: 3f26ad9b636b27e03c625f6fec30d2c52b6ae050dd48de9159cf9c415689c8b0
+  data.tar.gz: 4be4cbe1c5bc93f2088d02e02609961ffc11e63eeba3e22069729bd21a2de16b
 SHA512:
-  metadata.gz: 38957f8ca0fddea05fd4a337dbc2632770398d6034fa5635f729ac0b55d2f243bc13283e6076ff245f3e9dc1ee9ff35423a3af809b118798454d5cc00a351ffb
-  data.tar.gz: f90f995a3c9dc816f20d85b3efcf867f8b78a1de92cec1387d7bd30f2c7585b29713dedc7bea07581456afdd72dbf8b6eb4c1da3cd155ebcf80b39eef29e3c71
+  metadata.gz: b9d65aae9cea6fc9b54c51ff92f2b1d286519b2df0bd2cb3485898eca695036d37150a364ef3d836ea59b26c25efaca4a6b96ab636f2c80e6ab50b33ae644532
+  data.tar.gz: 218bc243b86df4b8e73a943df816a3bbd462311972e79e309136206bf01e95f89f64e5104dd9e5b5b758b22c40e7ed29b505c9b6a5b099b0823efe60ba0f45aa

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v0.8.16.1] - 28-01-2025
+## What's Changed
+* correct API URL in test by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/114
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.16...v0.8.16.1
+# [v0.8.16] - 26-01-2025
+## What's Changed
+* Point to new API url by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/105
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.15.5...v0.8.16
 # [v0.8.15.5] - 16-01-2025
 **Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.15.4...v0.8.15.5
 # [v0.8.15.4] - 16-01-2025

data/app/controllers/concerns/hephaestus/validates_from_yetto.rb

@@ -17,7 +17,7 @@ module Hephaestus
       return bad_request unless yetto_signature.start_with?("sha256=")
 
       hmac_header = yetto_signature.split("sha256=").last
-      body = request.env.fetch("RAW_POST_DATA", "")
+      body = request.raw_post
 
       calculated_hmac = OpenSSL::HMAC.hexdigest(SHA256_DIGEST, Hephaestus::YETTO_SIGNING_SECRET, body)
 

data/app/services/hephaestus/yetto_service.rb

@@ -17,7 +17,7 @@ end
 module Hephaestus
   class YettoService
     # Version is set by the consuming plug
-    YETTO_API_VERSION_TLD = "#{Hephaestus::PROTOCOL}#{Hephaestus::YETTO_API_URL}/#{Rails.configuration.yetto_api_version}"
+    YETTO_API_VERSION_URL = "#{Hephaestus::YETTO_API_URL}/#{Rails.configuration.yetto_api_version}"
 
     class << self
       def yetto_client
@@ -29,14 +29,14 @@ module Hephaestus
       end
 
       def perform_token_exchange(plug_installation_id)
-        response = yetto_client.with_headers({ "Authorization" => "Bearer #{encoded_jwt}" }).post("#{YETTO_API_VERSION_TLD}/plug/installations/#{plug_installation_id}/access_tokens")
+        response = yetto_client.with_headers({ "Authorization" => "Bearer #{encoded_jwt}" }).post("#{YETTO_API_VERSION_URL}/plug/installations/#{plug_installation_id}/access_tokens")
         body = response.parsed_json_body
         body["token"]
       end
 
       def get_plug_installation(plug_installation_id)
         token = perform_token_exchange(plug_installation_id)
-        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).get("#{YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}")
+        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).get("#{YETTO_API_VERSION_URL}/installations/#{plug_installation_id}")
       end
 
       def update_plug_installation(plug_installation_id, params)
@@ -46,47 +46,47 @@ module Hephaestus
         plug_installation[:credentials] = params.fetch(:credentials, {})
 
         token = perform_token_exchange(plug_installation_id)
-        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).patch("#{YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}", json: plug_installation)
+        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).patch("#{YETTO_API_VERSION_URL}/installations/#{plug_installation_id}", json: plug_installation)
       end
 
       def get_messages_in_inbox(plug_installation_id, inbox_id, filter: {})
         token = perform_token_exchange(plug_installation_id)
 
-        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).get("#{YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/messages#{to_filter_query(filter)}")
+        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).get("#{YETTO_API_VERSION_URL}/inboxes/#{inbox_id}/messages#{to_filter_query(filter)}")
       end
 
       def get_messages_in_conversation(plug_installation_id, conversation_id, filter: {})
         token = perform_token_exchange(plug_installation_id)
 
-        yetto_client.with_headers("Authorization" => "Bearer #{token}").get("#{YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages#{to_filter_query(filter)}")
+        yetto_client.with_headers("Authorization" => "Bearer #{token}").get("#{YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages#{to_filter_query(filter)}")
       end
 
       def update_message(plug_installation_id, message_id, params)
         token = perform_token_exchange(plug_installation_id)
 
-        yetto_client.with_headers("Authorization" => "Bearer #{token}").patch("#{YETTO_API_VERSION_TLD}/messages/#{message_id}", json: params)
+        yetto_client.with_headers("Authorization" => "Bearer #{token}").patch("#{YETTO_API_VERSION_URL}/messages/#{message_id}", json: params)
       end
 
       def create_conversation(plug_installation_id, inbox_id, params)
         token = perform_token_exchange(plug_installation_id)
 
-        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).post("#{YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/conversations", json: params)
+        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).post("#{YETTO_API_VERSION_URL}/inboxes/#{inbox_id}/conversations", json: params)
       end
 
       def create_message_reply(plug_installation_id, message_id, params)
         token = perform_token_exchange(plug_installation_id)
 
-        yetto_client.with_headers("Authorization" => "Bearer #{token}").post("#{YETTO_API_VERSION_TLD}/messages/#{message_id}/replies", json: params)
+        yetto_client.with_headers("Authorization" => "Bearer #{token}").post("#{YETTO_API_VERSION_URL}/messages/#{message_id}/replies", json: params)
       end
 
       def add_message_to_conversation(plug_installation_id, conversation_id, params)
         token = perform_token_exchange(plug_installation_id)
 
-        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).post("#{YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages", json: params)
+        yetto_client.with_headers({ "Authorization" => "Bearer #{token}" }).post("#{YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages", json: params)
       end
 
       def get_plug_installations(filter: {})
-        yetto_client.with_headers({ "Authorization" => "Bearer #{encoded_jwt}" }).get("#{YETTO_API_VERSION_TLD}/plug/installations#{to_filter_query(filter)}")
+        yetto_client.with_headers({ "Authorization" => "Bearer #{encoded_jwt}" }).get("#{YETTO_API_VERSION_URL}/plug/installations#{to_filter_query(filter)}")
       end
 
       private def to_filter_query(hash)

data/config/initializers/environment.rb

@@ -80,16 +80,30 @@ module Hephaestus
   end
 
   PROTOCOL = Rails.env.development? ? "http://" : "https://"
-  YETTO_URL = if Rails.env.production?
-    "web.yetto.app"
+
+  YETTO_DOMAIN = if Rails.env.production?
+    "yetto.app"
   elsif Rails.env.staging?
-    "web.yetto.dev"
-  elsif Rails.env.development?
+    "yetto.dev"
+  elsif Rails.env.test?
+    "yetto.test"
+  end
+  YETTO_URL = if Rails.env.development?
     "localhost:3000"
+  else
+    "web.#{YETTO_DOMAIN}"
+  end
+
+  YETTO_API_URL = if Rails.env.development?
+    "http://localhost:3000/api"
   elsif Rails.env.test?
-    "web.yetto.test"
+    "http://#{YETTO_URL}/api"
+  else
+    "https://api.#{YETTO_DOMAIN}"
   end
 
+  YETTO_REDIRECT_URL = productionish? ? "#{PROTOCOL}#{YETTO_URL}" : "#{PROTOCOL}127.0.0.1:3000"
+
   # Every plug has secrets; to reduce the amount of API calls to 1Password,
   # we can grab one document that contains all the secrets we need
   if productionish?
@@ -114,9 +128,6 @@ module Hephaestus
     end
   end
 
-  YETTO_API_URL = "#{YETTO_URL}/api"
-  YETTO_REDIRECT_URL = productionish? ? "#{PROTOCOL}#{YETTO_URL}" : "#{PROTOCOL}127.0.0.1:3000"
-
   YETTO_PLUG_PEM = fetch_vault_secret(
     label: "YETTO_PLUG_PEM",
     default: Rails.root.join("test/fixtures/files/fake_pem_file/fake.pem"),

data/lib/hephaestus/support/hephaestus/webmocks/yetto_webmock.rb

@@ -9,7 +9,7 @@ module Hephaestus
       end
 
       def assert_requested_post_access_token(plug_installation_id, times: 1)
-        assert_requested(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/plug/installations/#{plug_installation_id}/access_tokens", times: times)
+        assert_requested(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/plug/installations/#{plug_installation_id}/access_tokens", times: times)
       end
 
       def stub_post_access_token(plug_installation_id)
@@ -17,18 +17,18 @@ module Hephaestus
           token: Faker::Alphanumeric.alphanumeric(number: 26).upcase,
         }
 
-        stub_request(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/plug/installations/#{plug_installation_id}/access_tokens")
+        stub_request(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/plug/installations/#{plug_installation_id}/access_tokens")
           .to_return(
             body: response.to_json,
           )
       end
 
       def assert_requested_get_plug_installation(plug_installation_id, times: 1)
-        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}", times:)
+        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/installations/#{plug_installation_id}", times:)
       end
 
       def stub_get_plug_installation(plug_installation_id, response: {}, status: 200)
-        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}")
+        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/installations/#{plug_installation_id}")
           .to_return(
             status: status,
             headers: { content_type: "application/json; charset=utf-8" },
@@ -37,11 +37,11 @@ module Hephaestus
       end
 
       def assert_requested_update_plug_installation(plug_installation_id)
-        assert_requested(:patch, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}")
+        assert_requested(:patch, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/installations/#{plug_installation_id}")
       end
 
       def assert_not_requested_update_plug_installation(plug_installation_id)
-        assert_requested(:patch, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}", times: 0)
+        assert_requested(:patch, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/installations/#{plug_installation_id}", times: 0)
       end
 
       def stub_update_plug_installation(plug_installation_id, params, response: {}, status: 200)
@@ -49,7 +49,7 @@ module Hephaestus
 
         response[:plug_installation] = { id: plug_installation_id }
 
-        stub_request(:patch, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}")
+        stub_request(:patch, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/installations/#{plug_installation_id}")
           .with(
             body: params,
           )
@@ -61,7 +61,7 @@ module Hephaestus
       end
 
       def assert_requested_create_conversation(plug_installation_id, inbox_id)
-        assert_requested(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/conversations")
+        assert_requested(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/inboxes/#{inbox_id}/conversations")
       end
 
       def stub_create_conversation(plug_installation_id, inbox_id, payload, response: {})
@@ -69,7 +69,7 @@ module Hephaestus
 
         response[:plug_installation] = { id: plug_installation_id }
 
-        stub_request(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/conversations")
+        stub_request(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/inboxes/#{inbox_id}/conversations")
           .with(
             body: payload,
           )
@@ -81,11 +81,11 @@ module Hephaestus
       end
 
       def assert_requested_get_plug_installations(filter: "")
-        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/plug/installations?#{filter}")
+        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/plug/installations?#{filter}")
       end
 
       def stub_get_plug_installations(response, status: 200, filter: "")
-        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/plug/installations?#{filter}")
+        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/plug/installations?#{filter}")
           .to_return(
             status: status,
             headers: { content_type: "application/json; charset=utf-8" },
@@ -94,12 +94,12 @@ module Hephaestus
       end
 
       def assert_requested_get_messages_in_inbox(plug_installation_id, inbox_id, filter: "")
-        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/messages?#{filter}")
+        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/inboxes/#{inbox_id}/messages?#{filter}")
       end
 
       def stub_get_messages_in_inbox(plug_installation_id, inbox_id, response, filter: "")
         stub_post_access_token(plug_installation_id)
-        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/messages?#{filter}")
+        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/inboxes/#{inbox_id}/messages?#{filter}")
           .to_return(
             status: 200,
             body: response.to_json,
@@ -107,13 +107,13 @@ module Hephaestus
       end
 
       def assert_requested_get_messages_in_conversation(plug_installation_id, conversation_id, filter: "")
-        assert_requested(:get, "#{::Hephaestus::YettoService::YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages?#{filter}")
+        assert_requested(:get, "#{::Hephaestus::YettoService::YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages?#{filter}")
       end
 
       def stub_get_messages_in_conversation(plug_installation_id, conversation_id, response, status: 200, filter: "")
         stub_post_access_token(plug_installation_id)
 
-        stub_request(:get, "#{::Hephaestus::YettoService::YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages?#{filter}")
+        stub_request(:get, "#{::Hephaestus::YettoService::YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages?#{filter}")
           .to_return(
             status: status,
             headers: { content_type: "application/json; charset=utf-8" },
@@ -126,7 +126,7 @@ module Hephaestus
 
         response[:plug_installation] = { id: plug_installation_id }
 
-        stub_request(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages")
+        stub_request(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages")
           .with(
             body: payload,
           )
@@ -138,17 +138,17 @@ module Hephaestus
       end
 
       def assert_requested_add_message_to_conversation(plug_installation_id, conversation_id)
-        assert_requested(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages")
+        assert_requested(:post, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages")
       end
 
       def assert_requested_create_message(plug_installation_id, message_id)
-        assert_requested(:post, "#{::Hephaestus::YettoService::YETTO_API_VERSION_TLD}/messages/#{message_id}/replies")
+        assert_requested(:post, "#{::Hephaestus::YettoService::YETTO_API_VERSION_URL}/messages/#{message_id}/replies")
       end
 
       def stub_create_message(plug_installation_id, message_id, payload)
         stub_post_access_token(plug_installation_id)
 
-        stub_request(:post, "#{::Hephaestus::YettoService::YETTO_API_VERSION_TLD}/messages/#{message_id}/replies")
+        stub_request(:post, "#{::Hephaestus::YettoService::YETTO_API_VERSION_URL}/messages/#{message_id}/replies")
           .with(
             body: payload,
           )
@@ -160,12 +160,12 @@ module Hephaestus
       end
 
       def assert_requested_update_message(plug_installation_id, message_id)
-        assert_requested(:patch, "#{::Hephaestus::YettoService::YETTO_API_VERSION_TLD}/messages/#{message_id}")
+        assert_requested(:patch, "#{::Hephaestus::YettoService::YETTO_API_VERSION_URL}/messages/#{message_id}")
       end
 
       def stub_update_message(plug_installation_id, message_id, payload)
         stub_post_access_token(plug_installation_id)
-        stub_request(:patch, "#{::Hephaestus::YettoService::YETTO_API_VERSION_TLD}/messages/#{message_id}")
+        stub_request(:patch, "#{::Hephaestus::YettoService::YETTO_API_VERSION_URL}/messages/#{message_id}")
           .with(
             body: payload,
           )
@@ -177,13 +177,13 @@ module Hephaestus
       end
 
       def assert_requested_find_message_in_conversation_by_metadata(plug_installation_id, conversation_id)
-        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages?#{filter}")
+        assert_requested(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages?#{filter}")
       end
 
       def stub_find_message_in_conversation(plug_installation_id, conversation_id, response, status: 200, filter: "")
         stub_post_access_token(plug_installation_id)
 
-        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_TLD}/conversations/#{conversation_id}/messages?#{filter}")
+        stub_request(:get, "#{Hephaestus::YettoService::YETTO_API_VERSION_URL}/conversations/#{conversation_id}/messages?#{filter}")
           .to_return(
             status: status,
             headers: { content_type: "application/json; charset=utf-8" },

data/lib/hephaestus/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Hephaestus
-  VERSION = "0.8.15.5"
+  VERSION = "0.8.16.1"
   RAILS_VERSION = ">= 8.0"
   RUBY_VERSION = File
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")

data/templates/root/hephaestus_gitignore

@@ -294,4 +294,4 @@ app/javascript/controllers/*.js
 !app/javascript/controllers/index.js
 
 security_results.json
-vendor/cache/
+vendor/cache

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.8.15.5
+  version: 0.8.16.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap