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.

Sign up for GitHub

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

Jump to bottom

QR Code Login Flow #2767

Merged
merged 56 commits into from
May 29, 2024
Merged

QR Code Login Flow #2767

merged 56 commits into from
May 29, 2024

Commits on Apr 12, 2024

  1. progress

    @Velin92
    Velin92 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    4a42e4d View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. qr code scanning now works, but the API is still unstable

    @Velin92
    Velin92 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9744e6d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. code improvements

    @Velin92
    Velin92 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    aee72b7 View commit details
    Browse the repository at this point in the history

  2. code improvements

    @Velin92
    Velin92 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    04aa596 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. improved state handling

    @Velin92
    Velin92 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    086cb30 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. improved the flow

    @Velin92
    Velin92 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    223cf43 View commit details
    Browse the repository at this point in the history

  2. the flow can now reach the login state

    @Velin92
    Velin92 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    529d943 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. now the code has also a string representation

    @Velin92
    Velin92 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1ff6cb4 View commit details
    Browse the repository at this point in the history

  2. fix onboarding

    @Velin92
    Velin92 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    107f1fa View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. possible fix

    @Velin92
    Velin92 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    1060bf6 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. qr code flow

    @Velin92
    Velin92 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    00345b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. possible fix

    @Velin92
    Velin92 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    3741c62 View commit details
    Browse the repository at this point in the history

  2. fix for the connecting state not working properly

    @Velin92
    Velin92 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    9d2f179 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/vector-im/element-x-ios … 

    …into mauroromito/qr_code_api_testing

# Conflicts:
#	ElementX/Sources/Application/AppSettings.swift
#	ElementX/Sources/FlowCoordinators/AuthenticationFlowCoordinator.swift
#	ElementX/Sources/Screens/QRCodeLoginScreen/QRCodeLoginScreenViewModel.swift
#	ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift
    @Velin92
    Velin92 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    638c298 View commit details
    Browse the repository at this point in the history

  4. Discard changes to ElementX.xcodeproj/project.xcworkspace/xcshareddat… 

    …a/swiftpm/Package.resolved
    @Velin92
    Velin92 authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    64b7934 View commit details
    Browse the repository at this point in the history

  5. updated copies

    @Velin92
    Velin92 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    45c04c5 View commit details
    Browse the repository at this point in the history

  6. better code in the view model

    @Velin92
    Velin92 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    af91e01 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. accountURL is now async

    @hughns
    hughns committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    94dcff7 View commit details
    Browse the repository at this point in the history

  2. Refix

    @hughns
    hughns committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    5bd9dbb View commit details
    Browse the repository at this point in the history

  3. Revert "Refix" 

    This reverts commit 5bd9dbb.
    @Velin92
    Velin92 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    2beb697 View commit details
    Browse the repository at this point in the history

  4. Revert "accountURL is now async" 

    This reverts commit 94dcff7.
    @Velin92
    Velin92 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    da7af70 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/vector-im/element-x-ios … 

    …into mauroromito/qr_code_api_testing
    @Velin92
    Velin92 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    62bc4b8 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. better error handling for now

    @Velin92
    Velin92 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    6854682 View commit details
    Browse the repository at this point in the history

  2. qr code login sdk update for pr building

    @Velin92
    Velin92 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    94b6798 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into mauroromito/qr_code_api_testing

    @Velin92
    Velin92 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    6ea8cde View commit details
    Browse the repository at this point in the history

  4. updated tests

    @Velin92
    Velin92 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4dd54d8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'mauroromito/qr_code_api_testing' of https://github.com/… 

    …vector-im/element-x-ios into mauroromito/qr_code_api_testing
    @Velin92
    Velin92 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    525979b View commit details
    Browse the repository at this point in the history

  6. added some view model tests

    @Velin92
    Velin92 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    63efacb View commit details
    Browse the repository at this point in the history

  7. test improvement

    @Velin92
    Velin92 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5e652ab View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Merge branch 'develop' of https://github.com/vector-im/element-x-ios … 

    …into mauroromito/qr_code_api_testing

# Conflicts:
#	ElementX.xcodeproj/project.pbxproj
#	ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	project.yml
    @Velin92
    Velin92 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    6adbc02 View commit details
    Browse the repository at this point in the history

  2. updated the branch

    @Velin92
    Velin92 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    85acde7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into mauroromito/qr_code_api_testing

    @Velin92
    Velin92 authored May 7, 2024
    Configuration menu
    Copy the full SHA
    8bdd4f7 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. updated strings

    @Velin92
    Velin92 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    d5b5604 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'develop' of https://github.com/vector-im/element-x-ios … 

    …into mauroromito/qr_code_api_testing

# Conflicts:
#	ElementX.xcodeproj/project.pbxproj
#	ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	PreviewTests/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-en-GB.Initial.png
#	PreviewTests/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPad-pseudo.Initial.png
#	PreviewTests/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-15-en-GB.Initial.png
#	PreviewTests/__Snapshots__/PreviewTests/test_qRCodeLoginScreen-iPhone-15-pseudo.Initial.png
#	project.yml
    @Velin92
    Velin92 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    44acd0a View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Merge branch 'develop' of https://github.com/vector-im/element-x-ios … 

    …into mauroromito/qr_code_api_testing
    @Velin92
    Velin92 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    16fe49f View commit details
    Browse the repository at this point in the history

  2. error handling

    @Velin92
    Velin92 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    b44498e View commit details
    Browse the repository at this point in the history

  3. fixing tests

    @Velin92
    Velin92 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    dd9447d View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. code improvement

    @Velin92
    Velin92 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    6b4d84e View commit details
    Browse the repository at this point in the history

  2. updated qr code login

    @Velin92
    Velin92 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    6b56f17 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge branch 'develop' of https://github.com/vector-im/element-x-ios … 

    …into mauroromito/qr_code_api_testing

# Conflicts:
#	ElementX.xcodeproj/project.pbxproj
#	ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	project.yml
    @Velin92
    Velin92 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a3ac12a View commit details
    Browse the repository at this point in the history

  2. updated previews and added an error for the 

    sliding sync not being supported
    @Velin92
    Velin92 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a60b19a View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Merge branch 'develop' of https://github.com/vector-im/element-x-ios … 

    …into mauroromito/qr_code_api_testing

# Conflicts:
#	ElementX.xcodeproj/project.pbxproj
#	ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	project.yml
    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    26dfc77 View commit details
    Browse the repository at this point in the history

  2. updated sdk

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    1e7b74b View commit details
    Browse the repository at this point in the history

  3. fixed tests

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    ce9dc5e View commit details
    Browse the repository at this point in the history

  4. qr code login enabled is by default false

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    b70c072 View commit details
    Browse the repository at this point in the history

  5. added a new error case

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    8c49170 View commit details
    Browse the repository at this point in the history

  6. Apply suggestions from code review 

    Co-authored-by: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
    @Velin92 @hughns
    Velin92 and hughns authored May 29, 2024
    Configuration menu
    Copy the full SHA
    f7c3bd1 View commit details
    Browse the repository at this point in the history

  7. some pr comments have been addressed

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    6af30f3 View commit details
    Browse the repository at this point in the history

  8. updated proj

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    58587e8 View commit details
    Browse the repository at this point in the history

  9. moved request camera in app mediator

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    e21df9c View commit details
    Browse the repository at this point in the history

  10. added a test for qr code decoding

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    a8b870b View commit details
    Browse the repository at this point in the history

  11. enable the feature for development builds by default

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    10c13e0 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop' into mauroromito/qr_code_api_testing

    @Velin92
    Velin92 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    0c099dc View commit details
    Browse the repository at this point in the history

  13. qr code login always enabled in nightly

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    0129a1b View commit details
    Browse the repository at this point in the history

  14. removed from developer settings

    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    848c6ee View commit details
    Browse the repository at this point in the history

  15. Merge branch 'mauroromito/qr_code_api_testing' of https://github.com/… 

    …vector-im/element-x-ios into mauroromito/qr_code_api_testing
    @Velin92
    Velin92 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    683a534 View commit details
    Browse the repository at this point in the history