Merge pull request 'Fix XMPP API POST request' (#17 ) from bugfix/faraday_post into master

Reviewed-on: #17
Fix XMPP API POST request
2020-12-13 13:17:57 +00:00 · 2020-12-13 14:07:25 +01:00 · 2020-12-13 12:57:34 +00:00 · 2020-12-13 13:54:33 +01:00
3 changed files with 4 additions and 12 deletions
--- a/.env.production
+++ b/.env.production
@@ -1 +1 @@
-EJABBERD_API_URL='https://xmpp.kosmos.org/api'
+EJABBERD_API_URL='https://xmpp.kosmos.org:5443/api'
--- a/app/services/ejabberd_api_client.rb
+++ b/app/services/ejabberd_api_client.rb
@@ -4,7 +4,7 @@ class EjabberdApiClient
  end

  def post(endpoint, payload)
-    res = Faraday.post("#{@base_url}/#{endpoint}", payload,
+    res = Faraday.post("#{@base_url}/#{endpoint}", payload.to_json,
                       "Content-Type" => "application/json")

    if res.status != 200
--- a/spec/services/create_account_spec.rb
+++ b/spec/services/create_account_spec.rb
@@ -90,17 +90,9 @@ RSpec.describe CreateAccount, type: :model do
      service.send(:exchange_xmpp_contacts)

      expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem")
-        .with { |req| req.body == {
-          localuser: "isaacnewton", localhost: "kosmos.org",
-          user: "willherschel", host: "kosmos.org",
-          nick: "willherschel", group: "Friends", subs: "both"
-        }}
+        .with { |req| req.body == '{"localuser":"isaacnewton","localhost":"kosmos.org","user":"willherschel","host":"kosmos.org","nick":"willherschel","group":"Friends","subs":"both"}' }
      expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem")
-        .with { |req| req.body == {
-          localuser: "willherschel", localhost: "kosmos.org",
-          user: "isaacnewton", host: "kosmos.org",
-          nick: "isaacnewton", group: "Friends", subs: "both"
-        }}
+        .with { |req| req.body == '{"localuser":"willherschel","localhost":"kosmos.org","user":"isaacnewton","host":"kosmos.org","nick":"isaacnewton","group":"Friends","subs":"both"}' }
    end
  end
 end
Author	SHA1	Message	Date
raucao	8903ae2624	Merge pull request 'Fix XMPP API POST request' (#17 ) from bugfix/faraday_post into master All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details Reviewed-on: #17	2020-12-13 13:17:57 +00:00
Sebastian Kippe	26e9073674	Fix XMPP API POST request All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details Faraday does not turn hashes into JSON by itself apparently.	2020-12-13 14:07:25 +01:00
raucao	73a89c2601	Merge pull request 'Add missing port number to ejabberd API base URL' (#16 ) from bugfix/ejabberd_http_port into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #16	2020-12-13 12:57:34 +00:00
Sebastian Kippe	7d4dee17b7	Add missing port number to ejabberd API base URL All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2020-12-13 13:54:33 +01:00