Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

New guest access #937

Merged
merged 168 commits into from
Jun 7, 2017
Merged

New guest access #937

merged 168 commits into from
Jun 7, 2017

Conversation

ara4n
Copy link
Member

@ara4n ara4n commented May 26, 2017

Creating a PR for new guest access mainly to visualise how merge conflicty this is...

Luke Barnard and others added 30 commits April 28, 2017 13:22
- Replaces SetDisplayNameDialog with SetMxIdDialog. This new dialog will use InteractiveAuth to authenticate a user with their chosen mxid.

De-scoped:
 - style tweaks for the InteractiveAuth in the dialog (capcha) and error message.
 - checking for mxid availability
So that we don't overwrite the existing one every time we try to register.
Initial implementation: SetDisplayName -> SetMxIdDialog
made in #849
Show password nag bar when user is PWLU
Requires matrix-org/matrix-js-sdk#432 for availability checking.

Changes:
 - Redesign the dialog to look more like element-hq/element-web#3604 (comment)
 - Attempt to fix wrong password being stored by generating one per SetMxIdDialog (there's no issue tracking this for now, I shall open one if it persists)
 - Backwards compatible with servers that don't support register/availability - a spinner will appear the first time a username is checked because server support can only be determined after a request.
 - Rate-limited by a 2s debounce
 - General style improvements
Redesign mxID chooser, add availability checking
Conflicts:
	src/component-index.js
Spawn a SetMxIdDialog instead and do nothing.
If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.
Prevent ROUs from creating new chats/new rooms
This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)
This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
MatrixChat didn't actually use the sessionStore, so this is one less prop to pass.
…-user

Invite the welcome user after registration if configured
dbkr and others added 29 commits June 2, 2017 16:33
The room loading spinner will now be displayed if the alias is being resolved (roomLoading) or if the peek is being loaded for the room `peekLoading`.
…inner

Introduce state `peekLoading` to avoid collision with `roomLoading`
There's no point in deferring creating a new DM with the welcome user because the setMxId dialog will do so anyway.
This will bring up the correct UI as intended instead of defaulting to the home page with welcome user in the room list.

Fixes element-hq/element-web#4162
Don't do a deferred start chat if user is welcome user
…-settings

Keep deferred actions for view_user_settings and view_create_chat
…ound

Only view welcome user if we are not looking at a room
In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json
if the set mxid dialog is canceled
Merge develop, add i18n for SetMxIdDialog
Otherwise on any logins after the first,we always think the first
sync has completed.
Reset 'first sync' flag / promise on log in
or 'choose different server'

We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.

Fixes element-hq/element-web#4217
Cancel 'join room' action if 'log in' is clicked
@lukebarnard1 lukebarnard1 merged commit d404177 into develop Jun 7, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
X-Release-Blocker This affects the current release cycle and must be solved for a release to happen
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants