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

[2FA] Update link msa/aad account page with legacy password account information. #9408

Merged
merged 4 commits into from
Mar 10, 2023
Merged

[2FA] Update link msa/aad account page with legacy password account information. #9408

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4863da4
Updated page to show legacy account information
dannyjdev Mar 2, 2023
dddf519
email moved to first line.
dannyjdev Mar 6, 2023
a51eb44
let users link msa/aad account after being on exception list.
dannyjdev Mar 8, 2023
b01222c
fix tests
dannyjdev Mar 9, 2023
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
28 changes: 17 additions & 11 deletions src/NuGetGallery/Views/Authentication/LinkExternal.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,35 @@
<section role="main" class="container main-container page-sign-in">
@if (Model.External.FoundExistingUser)
dannyjdev marked this conversation as resolved.
Show resolved Hide resolved
{
<div class="row">
<div class="col-xs-12">
<h1 class="text-center">Link @Model.External.ProviderAccountNoun</h1>
</div>
</div>
<div class="row">
<div class="@ViewHelpers.GetColumnClasses(ViewBag)">
@if (Model.External.ExistingUserCanBeLinked)
{
<div class="row">
<div class="col-xs-12">
<h1 class="text-center">Legacy Account</h1>
dannyjdev marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
<p class="text-center">
We found an account with this email address. Sign in with your NuGet.org password to link with this Microsoft account.
We found an account with this email address that uses legacy password login. Unfortunately, <b>password login has been disabled</b>.
</p>
<p class="text-center">
Note that <b>your existing password login will be disabled</b> and you will need to use this Microsoft account to sign into NuGet.org
</p>
<p class="text-center">
Please <a href="mailto:@Config.Current.GalleryOwner.Address">contact support</a> if you need more assistance.
Some accounts can be recovered through manual proof of ownership.
Please reach out to <a href="mailto:@Config.Current.GalleryOwner.Address">nuget support</a> for assistance.
</p>

@Html.Partial("_SignIn", Model)
<p>
@Html.ShowLabelFor(m => m.SignIn.UserNameOrEmail)<br />
dannyjdev marked this conversation as resolved.
Show resolved Hide resolved
@Model.SignIn.UserNameOrEmail
</p>
}
else
{
<div class="row">
<div class="col-xs-12">
<h1 class="text-center">Link @Model.External.ProviderAccountNoun</h1>
</div>
</div>
switch (Model.External.ExistingUserLinkingError)
{
case AssociateExternalAccountViewModel.ExistingUserLinkingErrorType.AccountIsAlreadyLinked:
Expand Down