Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Passing the url to conference mapper #11013

Merged
merged 7 commits into from
Feb 28, 2022
Merged

Passing the url to conference mapper #11013

merged 7 commits into from
Feb 28, 2022

Conversation

damencho
Copy link
Member

No description provided.

@damencho damencho requested a review from saghul February 23, 2022 22:08
@damencho damencho force-pushed the confmapper-pass-url branch from f2b4c54 to 6251d71 Compare February 23, 2022 22:10
import { DialInSummary } from '../dial-in-summary';

import NoRoomError from './NoRoomError';

document.addEventListener('DOMContentLoaded', () => {
const { room } = parseURLParams(window.location, true, 'search');
const { href } = window.location;
const ix = href.indexOf(DIAL_IN_INFO_PAGE_PATH_NAME);
const url = (ix > 0 ? href.substring(0, ix) : href) + room;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to get the host and protocol part only with the whole substring logic or we have an use case where we take part of the path as well?

If we want only the host and protocol maybe it will be easier:

const { host, protocol } = location;

// and then it will be:
`${protocol}://${host}/`

@@ -533,7 +534,7 @@ export function getShareInfoText(

numbersPromise = Promise.all([
getDialInNumbers(dialInNumbersUrl, room, mucURL),
getDialInConferenceID(dialInConfCodeUrl, room, mucURL)
getDialInConferenceID(dialInConfCodeUrl, room, mucURL, locationURL.href)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll be passing the whole URL with the params and everything this way. Is this OK? Do we need the whole URL?

@damencho damencho force-pushed the confmapper-pass-url branch from d8f1abe to d0b1423 Compare February 28, 2022 19:18
@damencho damencho force-pushed the confmapper-pass-url branch from d0b1423 to dbfb6dd Compare February 28, 2022 19:25
@damencho damencho merged commit 389d455 into master Feb 28, 2022
@damencho damencho deleted the confmapper-pass-url branch February 28, 2022 20:03
This was referenced Mar 1, 2022
ankit-programmer pushed a commit to ankit-programmer/jitsi-meet that referenced this pull request May 7, 2022
* fix: Moves getDialInConferenceID, so we can reuse conf mapper url generation.

* fix: Moves getDialInNumbers, so we can reuse url generation.

* squash: Moves dialInInfo page path to constants.

* feat: Adds the location address as a param to the conf mapper request.

* feat: Adds option conf mapper and numbers urls to contain parameters (?).

* squash: Adds more doc comments.

* squash: Makes sure we strip url params if any, and they do not reach fetch.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants