mirror of
https://github.com/bitwarden/server.git
synced 2025-05-28 23:04:50 -05:00
change duo username to email
This commit is contained in:
parent
f598b78ecb
commit
65a7d0001e
@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Identity;
|
|||||||
using Bit.Core.Models.Table;
|
using Bit.Core.Models.Table;
|
||||||
using Bit.Core.Enums;
|
using Bit.Core.Enums;
|
||||||
using Bit.Core.Utilities.Duo;
|
using Bit.Core.Utilities.Duo;
|
||||||
using System;
|
|
||||||
using Bit.Core.Models;
|
using Bit.Core.Models;
|
||||||
|
|
||||||
namespace Bit.Core.Identity
|
namespace Bit.Core.Identity
|
||||||
@ -43,7 +42,7 @@ namespace Bit.Core.Identity
|
|||||||
}
|
}
|
||||||
|
|
||||||
var signatureRequest = DuoWeb.SignRequest((string)provider.MetaData["IKey"], (string)provider.MetaData["SKey"],
|
var signatureRequest = DuoWeb.SignRequest((string)provider.MetaData["IKey"], (string)provider.MetaData["SKey"],
|
||||||
_globalSettings.Duo.AKey, user.Id.ToString());
|
_globalSettings.Duo.AKey, user.Email);
|
||||||
return Task.FromResult(signatureRequest);
|
return Task.FromResult(signatureRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,13 +62,7 @@ namespace Bit.Core.Identity
|
|||||||
var response = DuoWeb.VerifyResponse((string)provider.MetaData["IKey"], (string)provider.MetaData["SKey"],
|
var response = DuoWeb.VerifyResponse((string)provider.MetaData["IKey"], (string)provider.MetaData["SKey"],
|
||||||
_globalSettings.Duo.AKey, token);
|
_globalSettings.Duo.AKey, token);
|
||||||
|
|
||||||
Guid userId;
|
return Task.FromResult(response == user.Email);
|
||||||
if(!Guid.TryParse(response, out userId))
|
|
||||||
{
|
|
||||||
return Task.FromResult(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Task.FromResult(userId == user.Id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool HasProperMetaData(TwoFactorProvider provider)
|
private bool HasProperMetaData(TwoFactorProvider provider)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user