Skip to content

Take environment into account when checking for existing account#1808

Merged
mpbw2 merged 1 commit intomasterfrom
bugfix-accountcheck
Feb 23, 2022
Merged

Take environment into account when checking for existing account#1808
mpbw2 merged 1 commit intomasterfrom
bugfix-accountcheck

Conversation

@mpbw2
Copy link
Copy Markdown
Contributor

@mpbw2 mpbw2 commented Feb 23, 2022

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

When checking for an already logged-in account, take the environment into account (otherwise identical emails can't be used across different servers)

Code changes

  • LoginPageViewModel.cs: Added BaseUrl comparison to existing account check, and moved switch prompt dialog to dedicated method

Testing requirements

https://app.asana.com/0/1201803072708593/1201873026592841

Before you submit

  • I have added unit tests where it makes sense to do so (encouraged but not required)
  • This change requires a documentation update (notify the documentation team)
  • This change has particular deployment requirements (notify the DevOps team)

@mpbw2 mpbw2 requested review from a team and fedemkr February 23, 2022 20:07
@mpbw2 mpbw2 merged commit 9201da8 into master Feb 23, 2022
@mpbw2 mpbw2 deleted the bugfix-accountcheck branch February 23, 2022 20:30
fedemkr added a commit that referenced this pull request Feb 25, 2022
* master: (82 commits)
  Autosync the updated translations (#1812)
  Apply Disable Favicon setting globally to match desktop (#1811)
  Fix for missing bio unlock on app restart (#1810)
  Changed link on Settings "Change Master Password" and "Two Step Login" to go to the web vault settings. Also refactored a bit to reuse the urls (#1809)
  take environment into account when checking for existing account (#1808)
  Account Switching (#1807)
  Fixes incorrect path in workflow (#1806)
  [BEEEP] - Added workflows to ignored paths (#1802)
  Add dry run option to release workflow (#1801)
  Changed Input keyboard on phone to be the telephone keyboard and also capitalized the keyboard on some fields of add/edit identity (#1800)
  Fix Options being seen in two lines on Add/edit Send (#1798)
  Fix icon image size to be adaptive on Large Font Size Accessibility which fixes row height on large vault (#1795)
  We're Hiring (#1797)
  Moved to new Google Service Account (#1789)
  Moved to new Google Service Account (#1788)
  Move to using shared workflow (#1787)
  Autosync the updated translations (#1786)
  Fixed some Large Font Accessibility issues on Vault and Send screens for Icons Display #1774 (#1785)
  Created initial workflow for workflow linting (#1783)
  Enforce Hold label (#1779)
  ...

# Conflicts:
#	src/App/Pages/Accounts/DeleteAccountViewModel.cs
#	src/App/Pages/Settings/ExportVaultPageViewModel.cs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants