bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-19 17:53:20 +00:00
Code Issues Releases Wiki Activity

move crypto to a util. create sync util

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-12 12:57:39 -04:00
parent b67918c2cc
commit a46eb796f8
4 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Services/AuthService.cs
View File

@@ -1,4 +1,5 @@
using Bit.Core.Models;
using Bit.Core.Utilities;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -38,12 +39,12 @@ namespace Bit.Core.Services
public async Task<LoginResult> LogInAsync(string email, string masterPassword)
{
var normalizedEmail = email.Trim().ToLower();
var key = CryptoService.Instance.MakeKeyFromPassword(masterPassword, normalizedEmail);
var key = Crypto.MakeKeyFromPassword(masterPassword, normalizedEmail);
var request = new TokenRequest
{
Email = normalizedEmail,
MasterPasswordHash = CryptoService.Instance.HashPasswordBase64(key, masterPassword)
MasterPasswordHash = Crypto.HashPasswordBase64(key, masterPassword)
};
var response = await ApiService.Instance.PostTokenAsync(request);
@@ -74,10 +75,9 @@ namespace Bit.Core.Services
public async Task<LoginResult> LogInTwoFactorAsync(string token, string email, string masterPassword)
{
var normalizedEmail = email.Trim().ToLower();
var key = CryptoService.Instance.MakeKeyFromPassword(masterPassword, normalizedEmail);
var key = Crypto.MakeKeyFromPassword(masterPassword, normalizedEmail);
var result = await LogInTwoFactorWithHashAsync(token, email,
CryptoService.Instance.HashPasswordBase64(key, masterPassword));
var result = await LogInTwoFactorWithHashAsync(token, email, Crypto.HashPasswordBase64(key, masterPassword));
key = null;
masterPassword = null;