Merge pull request #11959 from mkllnk/connect-app-id

Send semantic id when connecting enterprise to app

app/jobs/connect_app_job.rb

@@ -8,7 +8,7 @@ class ConnectAppJob < ApplicationJob
     event = "connect-app"
     enterprise = app.enterprise
     payload = {
-      enterprise_id: enterprise.id,
+      '@id': DfcBuilder.urls.enterprise_url(enterprise.id),
       access_token: token,
     }
 

spec/fixtures/vcr_cassettes/ConnectAppJob/stores_connection_data_on_the_app.yml

@@ -5,8 +5,8 @@ http_interactions:
     uri: https://n8n.openfoodnetwork.org.uk/webhook/regen/connect-enterprise
     body:
       encoding: UTF-8
-      string: '{"id":"6efbbeea-4078-4bb5-88b1-c8dbf599c520","at":"2023-12-14 12:13:39
-        +1100","event":"connect-app","data":{"enterprise_id":23,"access_token":"b5fa8c7fa1dd5331a2111fcc907040d842c5eb928c512e43"}}'
+      string: '{"id":"27bc9d0a-d95c-4a36-9b16-01fdd8a82b51","at":"2023-12-21 14:54:28
+        +1100","event":"connect-app","data":{"@id":"http://test.host/api/dfc/enterprises/3","access_token":"12345"}}'
     headers:
       User-Agent:
       - openfoodnetwork_webhook/1.0
@@ -24,15 +24,15 @@ http_interactions:
       Server:
       - nginx
       Date:
-      - Thu, 14 Dec 2023 01:13:41 GMT
+      - Thu, 21 Dec 2023 03:54:33 GMT
       Content-Type:
-      - text/html; charset=utf-8
+      - application/json; charset=utf-8
       Content-Length:
-      - '35'
+      - '141'
       Connection:
       - keep-alive
       Etag:
-      - W/"23-GW39X6dSljjgz4GPY7ICa+eNupE"
+      - W/"8d-Lz10bce6zwT2C429xIkj52OBWyk"
       Vary:
       - Accept-Encoding
       Strict-Transport-Security:
@@ -49,6 +49,6 @@ http_interactions:
       - same-origin
     body:
       encoding: UTF-8
-      string: '{"link":"https://example.net/edit"}'
-  recorded_at: Thu, 14 Dec 2023 01:13:40 GMT
+      string: '{"link":"https://example.net/update","destroy":"https://n8n.openfoodnetwork.org.uk/webhook/remove-enterprise?id=recjBXXXXXXXXXXXX&key=12345"}'
+  recorded_at: Thu, 21 Dec 2023 03:54:33 GMT
 recorded_with: VCR 6.2.0

spec/jobs/connect_app_job_spec.rb

@@ -2,18 +2,40 @@
 
 require 'spec_helper'
 
-RSpec.describe ConnectAppJob, type: :job, vcr: true do
-  subject { ConnectAppJob.new(app, token) }
+RSpec.describe ConnectAppJob, type: :job do
+  subject { ConnectAppJob.new(app, user.spree_api_key) }
 
-  let(:app) { ConnectedApp.create!(enterprise: ) }
-  let(:enterprise) { create(:enterprise) }
-  let(:token) { enterprise.owner.spree_api_key }
+  let(:app) { ConnectedApp.new(enterprise: ) }
+  let(:enterprise) { build(:enterprise, id: 3, owner: user) }
+  let(:user) { build(:user, spree_api_key: "12345") }
+  let(:url) { "https://n8n.openfoodnetwork.org.uk/webhook/regen/connect-enterprise" }
 
-  before { enterprise.owner.generate_api_key }
+  it "sends a semantic id and access token" do
+    stub_request(:post, url).to_return(body: '{}')
 
-  it "stores connection data on the app" do
     subject.perform_now
 
-    expect(app.data).to eq({ "link" => "https://example.net/edit" })
+    request = a_request(:post, url).with(
+      body: hash_including(
+        {
+          data: {
+            '@id': "http://test.host/api/dfc/enterprises/3",
+            access_token: "12345",
+          }
+        }
+      )
+    )
+    expect(request).to have_been_made.once
+  end
+
+  it "stores connection data on the app", vcr: true do
+    subject.perform_now
+
+    expect(app.data).to eq(
+      {
+        "link" => "https://example.net/update",
+        "destroy" => "https://n8n.openfoodnetwork.org.uk/webhook/remove-enterprise?id=recjBXXXXXXXXXXXX&key=12345",
+      }
+    )
   end
 end