Merge pull request #8962 from jitsi/tavram/sip-invite-auth

fix(sip-invite) fix sip invite jwt not being sent correctly

react/features/invite/actions.any.js

@@ -104,6 +104,7 @@ export function invite(
         } = state['features/base/config'];
         const inviteUrl = getInviteURL(state);
         const { sipInviteUrl } = state['features/base/config'];
+        const { locationURL } = state['features/base/connection'];
         const { jwt } = state['features/base/jwt'];
         const { name: displayName } = getLocalParticipant(state);
 
@@ -172,6 +173,7 @@ export function invite(
 
         conference && inviteSipEndpoints(
             sipEndpoints,
+            locationURL,
             sipInviteUrl,
             jwt,
             conference.options.name,

react/features/invite/functions.js

@@ -808,6 +808,7 @@ export function isSharingEnabled(sharingFeature: string) {
  * Sends a post request to an invite service.
  *
  * @param {Array} inviteItems - The list of the "sip" type items to invite.
+ * @param {URL} locationURL - The URL of the location.
  * @param {string} sipInviteUrl - The invite service that generates the invitation.
  * @param {string} jwt - The jwt token.
  * @param {string} roomName - The name to the conference.
@@ -816,6 +817,7 @@ export function isSharingEnabled(sharingFeature: string) {
  */
 export function inviteSipEndpoints( // eslint-disable-line max-params
         inviteItems: Array<Object>,
+        locationURL: URL,
         sipInviteUrl: string,
         jwt: string,
         roomName: string,
@@ -825,13 +827,15 @@ export function inviteSipEndpoints( // eslint-disable-line max-params
         return Promise.resolve();
     }
 
+    const baseUrl = locationURL.href.toLowerCase().replace(`/${roomName}`, '');
+
     return fetch(
-       `${sipInviteUrl}?token=${jwt}`,
+       sipInviteUrl,
        {
            body: JSON.stringify({
                callParams: {
                    callUrlInfo: {
-                       baseUrl: window.location.origin,
+                       baseUrl,
                        callName: roomName
                    }
                },
@@ -842,6 +846,7 @@ export function inviteSipEndpoints( // eslint-disable-line max-params
            }),
            method: 'POST',
            headers: {
+               'Authorization': `Bearer ${jwt}`,
                'Content-Type': 'application/json'
            }
        }