This repository was archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 819
Support for login + E2EE set up with QR #9403
Merged
Merged
Changes from 45 commits
Commits
Show all changes
80 commits
Select commit
Hold shift + click to select a range
85cfabc
Support for login + E2EE set up with QR
hughns ee6df88
Whitespace
hughns b4222dc
Padding
hughns 0ae60e4
Refactor of fetch
hughns b5040db
Whitespace
hughns 2789ace
CSS whitespace
hughns 80fef38
Add link to MSC3906
hughns d97e8a3
Handle incorrect typing in MatrixClientPeg.get()
hughns 5709df6
Use unstable class name
hughns 93b2b6e
fix: use unstable class name
hughns ac38955
Use default fetch client instead
hughns 8f647e2
Update to revised function name
hughns 996a9cf
Refactor device manager panel and make it work with new sessions manager
hughns 9e505f7
Lint fix
hughns 42a2ec1
Add missing interstitials and update wording
hughns 2c3df97
Linting
hughns 209ce5a
Merge branch 'develop' into hughns/login-with-qr
hughns ae8a010
i18n
hughns 073f52c
Lint
hughns fd1aeb3
Use sensible sdk config name for fallback server
hughns 53d14a6
Improve error handling for QR code generation
hughns 87adf05
Refactor feature availability logic
hughns d31026f
Hide device manager panel if no options available
hughns f0400f7
Put sign in with QR behind lab setting
hughns eb88f78
Reduce scope of PR to just showing code on existing device
hughns 3abcaf0
i18n updates
hughns 5142dbc
Handle null features
hughns ae77a1a
Testing for LoginWithQRSection
hughns 4683d42
Refactor to handle UIA
hughns 1135d3c
Imports
hughns 207cba3
Reduce diff complexity
hughns d96106b
Remove unnecessary change
hughns e2ff60f
Remove unused styles
hughns 987bdc5
Support UIA
hughns 18a943e
Tidy up
hughns f688104
i18n
hughns 20f31ca
Remove additional unused parts of flow
hughns cbfc1d9
Add extra instruction when showing QR code
hughns 2711538
Add getVersions to server mocks
hughns e7057b4
Use proper colours for theme support
hughns d3cda5b
Test cases
hughns 3dcbdd6
Lint
hughns 58dd76a
Merge branch 'develop' into hughns/login-with-qr
hughns b3d135e
Remove obsolete snapshot
hughns eed649b
Don't override error if already set
hughns f103cfd
Remove unused var
hughns 9133206
Update src/components/views/settings/devices/LoginWithQRSection.tsx
hughns 7187f89
Update src/components/views/auth/LoginWithQR.tsx
hughns e2b9a7f
Update src/components/views/auth/LoginWithQR.tsx
hughns 16a8904
Update src/components/views/auth/LoginWithQR.tsx
hughns 0704865
Update src/components/views/auth/LoginWithQR.tsx
hughns 49fd8f5
Update src/components/views/auth/LoginWithQR.tsx
hughns 1b003f5
Update res/css/views/auth/_LoginWithQR.pcss
hughns 212cd74
Use spacing variables
hughns 0a74bf3
Remove debug
hughns d9096c4
Style + docs
hughns 782c714
preventDefault
hughns c8ddbe8
Names of tests
hughns 55d0757
Fixes for js-sdk refactor
hughns 4e28514
Merge branch 'develop' into hughns/login-with-qr
hughns a48a458
Update snapshots to match test names
hughns b5e181c
Refactor labs config to make deployment simpler
hughns 25f8bcf
i18n
hughns 479a6e1
Unused imports
hughns 2fa8bc0
Typo
hughns 0794cff
Stateless component
hughns c6e0628
Whitespace
hughns 343974f
Use context not MatrixClientPeg
hughns 710edf9
Add missing context
hughns d8c94f2
Type updates to match js-sdk
hughns 984bf72
Wrap click handlers in useCallback
hughns 4e417ad
Update src/components/views/settings/DevicesPanel.tsx
hughns 6b682b5
Wait for DOM update instead of timeout
hughns 4703541
Merge branch 'develop' into hughns/login-with-qr
c22479c
Add missing snapshot update from last commit
hughns edbe559
Remove void keyword in favour of then() clauses
hughns 9c7cb2a
Merge branch 'hughns/login-with-qr' of https://github.com/matrix-org/…
hughns c7532d9
test main paths in LoginWithQR
f1f621e
Merge branch 'develop' into hughns/login-with-qr
5de0f4c
Merge branch 'develop' into hughns/login-with-qr
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,168 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
.mx_LoginWithQRSection .mx_AccessibleButton { | ||
margin-right: 10px; | ||
} | ||
|
||
.mx_AuthPage .mx_LoginWithQR { | ||
.mx_AccessibleButton { | ||
display: block !important; | ||
} | ||
|
||
.mx_AccessibleButton + .mx_AccessibleButton { | ||
margin-top: 8px; | ||
hughns marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
.mx_LoginWithQR_separator { | ||
display: flex; | ||
align-items: center; | ||
text-align: center; | ||
|
||
&::before, &::after { | ||
content: ''; | ||
flex: 1; | ||
border-bottom: 1px solid $quinary-content; | ||
} | ||
|
||
&:not(:empty) { | ||
&::before { | ||
margin-right: 1em; | ||
} | ||
&::after { | ||
margin-left: 1em; | ||
} | ||
} | ||
} | ||
|
||
font-size: $font-15px; | ||
} | ||
|
||
.mx_UserSettingsDialog .mx_LoginWithQR { | ||
.mx_AccessibleButton + .mx_AccessibleButton { | ||
margin-left: 12px; | ||
hughns marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
font-size: $font-14px; | ||
|
||
h1 { | ||
font-size: $font-24px; | ||
margin-bottom: 0; | ||
} | ||
|
||
li { | ||
line-height: 1.8; | ||
} | ||
|
||
.mx_QRCode { | ||
padding: 12px 40px; | ||
margin: 26px 0; | ||
} | ||
|
||
.mx_LoginWithQR_buttons { | ||
text-align: center; | ||
} | ||
|
||
.mx_LoginWithQR_qrWrapper { | ||
display: flex; | ||
} | ||
} | ||
|
||
.mx_LoginWithQR { | ||
min-height: 350px; | ||
display: flex; | ||
flex-direction: column; | ||
|
||
.mx_LoginWithQR_centreTitle { | ||
h1 { | ||
text-align: centre; | ||
} | ||
} | ||
|
||
h1 > svg { | ||
&.normal { | ||
color: $secondary-content; | ||
} | ||
&.error { | ||
color: $alert; | ||
} | ||
&.success { | ||
color: $accent; | ||
} | ||
height: 1.3em; | ||
margin-right: 8px; | ||
hughns marked this conversation as resolved.
Show resolved
Hide resolved
hughns marked this conversation as resolved.
Show resolved
Hide resolved
|
||
vertical-align: middle; | ||
} | ||
|
||
.mx_LoginWithQR_confirmationDigits { | ||
text-align: center; | ||
margin: 50px auto; | ||
font-weight: 600; | ||
font-size: $font-24px; | ||
color: $primary-content; | ||
} | ||
|
||
.mx_LoginWithQR_confirmationAlert { | ||
border: 1px solid $quaternary-content; | ||
border-radius: 8px; | ||
padding: 8px; | ||
hughns marked this conversation as resolved.
Show resolved
Hide resolved
|
||
line-height: 1.5em; | ||
display: flex; | ||
|
||
svg { | ||
height: 30px; | ||
} | ||
} | ||
|
||
.mx_LoginWithQR_separator { | ||
margin: 1em 0; | ||
} | ||
|
||
ol { | ||
list-style-position: inside; | ||
padding-inline-start: 0; | ||
|
||
li::marker { | ||
color: $accent; | ||
} | ||
} | ||
|
||
.mx_LoginWithQR_BackButton { | ||
height: 12px; | ||
margin-bottom: 24px; | ||
hughns marked this conversation as resolved.
Show resolved
Hide resolved
|
||
svg { | ||
height: 100%; | ||
} | ||
} | ||
|
||
.mx_LoginWithQR_main { | ||
display: flex; | ||
flex-direction: column; | ||
flex-grow: 1; | ||
} | ||
|
||
.mx_QRCode { | ||
border: 1px solid $quinary-content; | ||
border-radius: 8px; | ||
display: flex; | ||
justify-content: center; | ||
} | ||
|
||
.mx_LoginWithQR_spinner { | ||
flex-grow: 1; | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
height: 100%; | ||
} | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.