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

Support for login + E2EE set up with QR #9403

Merged
merged 80 commits into from
Oct 19, 2022
Merged
Changes from 1 commit
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 Oct 12, 2022
ee6df88
Whitespace
hughns Oct 12, 2022
b4222dc
Padding
hughns Oct 12, 2022
0ae60e4
Refactor of fetch
hughns Oct 12, 2022
b5040db
Whitespace
hughns Oct 12, 2022
2789ace
CSS whitespace
hughns Oct 12, 2022
80fef38
Add link to MSC3906
hughns Oct 13, 2022
d97e8a3
Handle incorrect typing in MatrixClientPeg.get()
hughns Oct 13, 2022
5709df6
Use unstable class name
hughns Oct 13, 2022
93b2b6e
fix: use unstable class name
hughns Oct 13, 2022
ac38955
Use default fetch client instead
hughns Oct 13, 2022
8f647e2
Update to revised function name
hughns Oct 13, 2022
996a9cf
Refactor device manager panel and make it work with new sessions manager
hughns Oct 14, 2022
9e505f7
Lint fix
hughns Oct 14, 2022
42a2ec1
Add missing interstitials and update wording
hughns Oct 14, 2022
2c3df97
Linting
hughns Oct 14, 2022
209ce5a
Merge branch 'develop' into hughns/login-with-qr
hughns Oct 14, 2022
ae8a010
i18n
hughns Oct 14, 2022
073f52c
Lint
hughns Oct 14, 2022
fd1aeb3
Use sensible sdk config name for fallback server
hughns Oct 14, 2022
53d14a6
Improve error handling for QR code generation
hughns Oct 14, 2022
87adf05
Refactor feature availability logic
hughns Oct 14, 2022
d31026f
Hide device manager panel if no options available
hughns Oct 14, 2022
f0400f7
Put sign in with QR behind lab setting
hughns Oct 14, 2022
eb88f78
Reduce scope of PR to just showing code on existing device
hughns Oct 15, 2022
3abcaf0
i18n updates
hughns Oct 15, 2022
5142dbc
Handle null features
hughns Oct 15, 2022
ae77a1a
Testing for LoginWithQRSection
hughns Oct 16, 2022
4683d42
Refactor to handle UIA
hughns Oct 16, 2022
1135d3c
Imports
hughns Oct 16, 2022
207cba3
Reduce diff complexity
hughns Oct 16, 2022
d96106b
Remove unnecessary change
hughns Oct 16, 2022
e2ff60f
Remove unused styles
hughns Oct 16, 2022
987bdc5
Support UIA
hughns Oct 16, 2022
18a943e
Tidy up
hughns Oct 16, 2022
f688104
i18n
hughns Oct 16, 2022
20f31ca
Remove additional unused parts of flow
hughns Oct 16, 2022
cbfc1d9
Add extra instruction when showing QR code
hughns Oct 16, 2022
2711538
Add getVersions to server mocks
hughns Oct 16, 2022
e7057b4
Use proper colours for theme support
hughns Oct 16, 2022
d3cda5b
Test cases
hughns Oct 16, 2022
3dcbdd6
Lint
hughns Oct 16, 2022
58dd76a
Merge branch 'develop' into hughns/login-with-qr
hughns Oct 16, 2022
b3d135e
Remove obsolete snapshot
hughns Oct 16, 2022
eed649b
Don't override error if already set
hughns Oct 16, 2022
f103cfd
Remove unused var
hughns Oct 17, 2022
9133206
Update src/components/views/settings/devices/LoginWithQRSection.tsx
hughns Oct 17, 2022
7187f89
Update src/components/views/auth/LoginWithQR.tsx
hughns Oct 17, 2022
e2b9a7f
Update src/components/views/auth/LoginWithQR.tsx
hughns Oct 17, 2022
16a8904
Update src/components/views/auth/LoginWithQR.tsx
hughns Oct 17, 2022
0704865
Update src/components/views/auth/LoginWithQR.tsx
hughns Oct 17, 2022
49fd8f5
Update src/components/views/auth/LoginWithQR.tsx
hughns Oct 17, 2022
1b003f5
Update res/css/views/auth/_LoginWithQR.pcss
hughns Oct 17, 2022
212cd74
Use spacing variables
hughns Oct 17, 2022
0a74bf3
Remove debug
hughns Oct 17, 2022
d9096c4
Style + docs
hughns Oct 17, 2022
782c714
preventDefault
hughns Oct 17, 2022
c8ddbe8
Names of tests
hughns Oct 17, 2022
55d0757
Fixes for js-sdk refactor
hughns Oct 17, 2022
4e28514
Merge branch 'develop' into hughns/login-with-qr
hughns Oct 17, 2022
a48a458
Update snapshots to match test names
hughns Oct 18, 2022
b5e181c
Refactor labs config to make deployment simpler
hughns Oct 18, 2022
25f8bcf
i18n
hughns Oct 18, 2022
479a6e1
Unused imports
hughns Oct 18, 2022
2fa8bc0
Typo
hughns Oct 18, 2022
0794cff
Stateless component
hughns Oct 18, 2022
c6e0628
Whitespace
hughns Oct 18, 2022
343974f
Use context not MatrixClientPeg
hughns Oct 18, 2022
710edf9
Add missing context
hughns Oct 18, 2022
d8c94f2
Type updates to match js-sdk
hughns Oct 18, 2022
984bf72
Wrap click handlers in useCallback
hughns Oct 18, 2022
4e417ad
Update src/components/views/settings/DevicesPanel.tsx
hughns Oct 19, 2022
6b682b5
Wait for DOM update instead of timeout
hughns Oct 19, 2022
4703541
Merge branch 'develop' into hughns/login-with-qr
Oct 19, 2022
c22479c
Add missing snapshot update from last commit
hughns Oct 19, 2022
edbe559
Remove void keyword in favour of then() clauses
hughns Oct 19, 2022
9c7cb2a
Merge branch 'hughns/login-with-qr' of https://github.com/matrix-org/…
hughns Oct 19, 2022
c7532d9
test main paths in LoginWithQR
Oct 19, 2022
f1f621e
Merge branch 'develop' into hughns/login-with-qr
Oct 19, 2022
5de0f4c
Merge branch 'develop' into hughns/login-with-qr
Oct 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CSS whitespace
hughns committed Oct 12, 2022
commit 2789ace03829b2754b8c5ce600c74438ca711749
246 changes: 123 additions & 123 deletions res/css/views/auth/_LoginWithQR.pcss
Original file line number Diff line number Diff line change
@@ -46,9 +46,9 @@ limitations under the License.
}

font-size: $font-15px;
}
}

.mx_UserSettingsDialog .mx_LoginWithQR {
.mx_UserSettingsDialog .mx_LoginWithQR {
.mx_AccessibleButton + .mx_AccessibleButton {
margin-left: 12px;
hughns marked this conversation as resolved.
Show resolved Hide resolved
}
@@ -62,132 +62,132 @@ limitations under the License.

li {
line-height: 1.8;
}
}

.mx_LoginWithQR_QRScanner {
margin: 46px 0;
}
.mx_LoginWithQR_QRScanner {
margin: 46px 0;
}

.mx_QRCode {
padding: 20px 0;
margin: 26px 0;
}
.mx_QRCode {
padding: 20px 0;
margin: 26px 0;
}

.mx_LoginWithQR_buttons {
text-align: center;
}
.mx_LoginWithQR_buttons {
text-align: center;
}

.mx_LoginWithQR_qrWrapper {
display: flex;
}
.mx_LoginWithQR_qrWrapper {
display: flex;
}
}

.mx_LoginWithQR {
min-height: 350px;
display: flex;
flex-direction: column;

h1 > svg {
&.normal {
color: #737D8C;
}
&.error {
color: #FF5B55;
}
&.success {
color: #0DBD8B;
}
height: 1.3em;
margin-right: 8px;
vertical-align: middle;
}

.mx_LoginWithQR_confirmationDigits {
text-align: center;
margin: 50px auto;
font-weight: 600;
font-size: $font-24px;
color: #17191C;
}

.mx_LoginWithQR_confirmationAlert {
border: 1px solid #C1C6CD;
border-radius: 8px;
padding: 8px;
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: #0DBD8B;
}
}

.mx_LoginWithQR_BackButton {
height: 12px;
margin-bottom: 24px;
svg {
height: 100%;
}
}

.mx_LoginWithQR_main {
display: flex;
flex-direction: column;
flex-grow: 1;
}

.mx_QRCode {
border: 1px solid #E3E8F0;
border-radius: 8px;
display: flex;
justify-content: center;
}

.mx_LoginWithQR_QRScanner {
width: 350px;
height: 350px;
background-color: #222;
border-radius: 8px;
border: 1px solid transparent;

.mx_QRViewFinder {
top: 0;
left: 0;
z-index: 1;
box-sizing: border-box;
border: 50px solid rgba(0, 0, 0, 0.2);
position: absolute;
width: 100%;
height: 100%;
stroke-width: 2;
stroke: rgba(255, 255, 255, 1);
}

video {
object-fit: cover;
border-radius: 8px;
border: 1px solid transparent;
}
}

.mx_LoginWithQR_spinner {
flex-grow: 1;
display: flex;
justify-content: center;
align-items: center;
height: 100%;
}
min-height: 350px;
display: flex;
flex-direction: column;

h1 > svg {
&.normal {
color: #737D8C;
}
&.error {
color: #FF5B55;
}
&.success {
color: #0DBD8B;
}
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: #17191C;
}

.mx_LoginWithQR_confirmationAlert {
border: 1px solid #C1C6CD;
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: #0DBD8B;
}
}

.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 #E3E8F0;
border-radius: 8px;
display: flex;
justify-content: center;
}

.mx_LoginWithQR_QRScanner {
width: 350px;
height: 350px;
background-color: #222;
border-radius: 8px;
border: 1px solid transparent;

.mx_QRViewFinder {
top: 0;
left: 0;
z-index: 1;
box-sizing: border-box;
border: 50px solid rgba(0, 0, 0, 0.2);
position: absolute;
width: 100%;
height: 100%;
stroke-width: 2;
stroke: rgba(255, 255, 255, 1);
}

video {
object-fit: cover;
border-radius: 8px;
border: 1px solid transparent;
}
}

.mx_LoginWithQR_spinner {
flex-grow: 1;
display: flex;
justify-content: center;
align-items: center;
height: 100%;
}
}