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

feat(authentication/native): hide login button for 8x8.vc #13881

Merged
merged 10 commits into from
Oct 2, 2023

Conversation

Calinteodor
Copy link
Contributor

No description provided.

@Calinteodor Calinteodor changed the title feat(authentication): hide login button for 8x8.vc feat(authentication/native): hide login button for 8x8.vc Sep 27, 2023
@damencho
Copy link
Member

Why do we need to hide this only on native? If there is no other option, we should probably add a config and not hardcode domains, wdyt?

@@ -97,9 +106,11 @@ class WaitForOwnerDialog extends Component<IProps> {
*/
function mapStateToProps(state: IReduxState) {
const { membersOnly, lobbyWaitingForHost } = state['features/base/conference'];
const serverURL = getDefaultURL(state);
Copy link
Member

Choose a reason for hiding this comment

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

We don't want the default one, we need to check the current one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was a bit confused because getDefaultURL returns getServerURL that returns the current one. Will update.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, but you can join a meeting in a server which is neither the default nor the configured one. We need to extract it from the current location URL.

Copy link
Contributor Author

@Calinteodor Calinteodor Sep 28, 2023

Choose a reason for hiding this comment

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

Updated.

@Calinteodor Calinteodor requested a review from saghul September 28, 2023 09:46
@@ -106,11 +107,12 @@ class WaitForOwnerDialog extends Component<IProps> {
*/
function mapStateToProps(state: IReduxState) {
const { membersOnly, lobbyWaitingForHost } = state['features/base/conference'];
const serverURL = getServerURL(state);
const { conference } = getConferenceState(state);
const locationURL = conference?.getConnection()[JITSI_CONNECTION_URL_KEY];
Copy link
Member

Choose a reason for hiding this comment

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

Why don't you take it from sthe state? We store it in base/connection. Also, it's a URL, so you should compare the hostname part.

@Calinteodor Calinteodor force-pushed the hide-login-authentication branch from f0caf8e to 6f5b2b0 Compare September 28, 2023 13:16
saghul
saghul previously requested changes Oct 2, 2023
/**
* Location where the current meeting takes place.
*/
_hostname?: string;
Copy link
Member

Choose a reason for hiding this comment

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

Pl make this _confirmHidden and comput it in mapStateToProps instead.

@Calinteodor Calinteodor merged commit 32ac299 into jitsi:master Oct 2, 2023
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.

3 participants