fix(authentication): removed old LoginDialog.js file, fixed redirection to the external auth and created actions.any.js #9049
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Calinteodor
changed the title
saghul
requested changes
Apr 21, 2021
| @@ -3,11 +3,14 @@ | |||
| import Logger from 'jitsi-meet-logger'; | |||
|
|
|||
| import { openConnection } from '../../../connection'; | |||
| import { externalAuthDialog } from '../../../react/features/authentication/actions'; | |||
| import { _openLoginDialog } from '../../../react/features/authentication/actions.native'; | |||
There was a problem hiding this comment.
Why are we importing things from native?
There was a problem hiding this comment.
Created actions.any.js for actions used on both web and mobile.
Calinteodor
changed the title
Calinteodor
changed the title
|
We tested this fix on our instance with Shibboleth (external authentification). The login at the beginning of the conference ("Waiting for the host ..." -> "I am the host") works and redirects to the login service. However the login button in the settings under profile (when the conference is running) does nothing and closes the dialog box.
|
saghul
reviewed
Apr 22, 2021
| @@ -10,8 +10,8 @@ import { Dialog } from '../../../base/dialog'; | |||
| import { translate, translateToHTML } from '../../../base/i18n'; | |||
| import { JitsiConnectionErrors } from '../../../base/lib-jitsi-meet'; | |||
| import { connect as reduxConnect } from '../../../base/redux'; | |||
| import { authenticateAndUpgradeRole } from '../../actions.native'; | |||
| import { cancelLogin, hideLoginDialog } from '../../actions.web'; | |||
| import { authenticateAndUpgradeRole } from '../../actions.any'; | |||
There was a problem hiding this comment.
actions.web and actions.native should re-export everything from actions.any, so you only import from one of them.
saghul
reviewed
Apr 22, 2021
| @@ -43,7 +45,7 @@ function doExternalAuth(room, lockPassword) { | |||
| getUrl = room.getExternalAuthUrl(true); | |||
| } | |||
| getUrl.then(url => { | |||
| externalAuthWindow = LoginDialog.showExternalAuthDialog( | |||
| externalAuthWindow = openAuthDialog( | |||
There was a problem hiding this comment.
Will this really work? Currently that will directly open the popup to the given URL, but with your change the WaitForOwnerDialog will be open instead.
There was a problem hiding this comment.
Reverted the change.
… and updated its logic
…openLoginDialog to actions.any
Calinteodor
force-pushed
the
authentication-login-dialog-fix
branch
from
6a89103
to
30e5432
Compare
saghul
approved these changes
Apr 22, 2021
psi-4ward
pushed a commit
to psi-4ward/jitsi-meet
that referenced
this pull request
Apr 30, 2021
…on to the external auth and created actions.any.js (jitsi#9049) * fix(authentication) login dialog now closes when connection is established * fix(authentication) fixed shibboleth auth * fix(authentication) renamed authenticateExternal func to authenticate and updated its logic * fix(authentication)removed logindialog.js and created actions.any * fix(authentication) removed focus from externalauthwindow * fix(authentication) removed private sign from some actions and added openLoginDialog to actions.any * fix(authentication) exported all from actions.any * fix(authentication) reverted change regarding externalAuth * fix(authentication) fixed indentation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.