aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 22:44:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the Facade concept

Browse Source
This commit is contained in:
nicolas.dorier
2019-04-11 23:54:58 +09:00
parent 359d8c5c6a
commit 4067d4b00f
17 changed files with 4 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Tests/UnitTest1.cs
View File

@@ -518,7 +518,6 @@ namespace BTCPayServer.Tests
var controller = acc.GetController<StoresController>();
var token = (RedirectToActionResult)controller.CreateToken(new Models.StoreViewModels.CreateTokenViewModel()
{
Facade = Facade.Merchant.ToString(),
Label = "bla",
PublicKey = null
}).GetAwaiter().GetResult();
@@ -972,7 +971,6 @@ namespace BTCPayServer.Tests
var storeController = user.GetController<StoresController>();
storeController.CreateToken(new CreateTokenViewModel()
{
Facade = Facade.Merchant.ToString(),
Label = "test2",
StoreId = user.StoreId
}).GetAwaiter().GetResult();

5
BTCPayServer/Authentication/BitToken.cs
View File

@@ -8,10 +8,6 @@ namespace BTCPayServer.Authentication
{
public class BitTokenEntity
{
public string Facade
{
get; set;
}
public string Value
{
get; set;
@@ -39,7 +35,6 @@ namespace BTCPayServer.Authentication
return new BitTokenEntity()
{
Label = Label,
Facade = Facade,
StoreId = StoreId,
PairingTime = PairingTime,
SIN = SIN,

5
BTCPayServer/Authentication/PairingCodeEntity.cs
View File

@@ -11,11 +11,6 @@ namespace BTCPayServer.Authentication
get;
set;
}
public string Facade
{
get;
set;
}
public string Label
{
get;

4
BTCPayServer/Authentication/TokenRepository.cs
View File

@@ -90,7 +90,6 @@ namespace BTCPayServer.Authentication
return new BitTokenEntity()
{
Label = data.Label,
Facade = data.Facade,
Value = data.Id,
SIN = data.SIN,
PairingTime = data.PairingTime,
@@ -129,7 +128,6 @@ namespace BTCPayServer.Authentication
{
var pairingCode = await ctx.PairingCodes.FindAsync(pairingCodeEntity.Id);
pairingCode.Label = pairingCodeEntity.Label;
pairingCode.Facade = pairingCodeEntity.Facade;
await ctx.SaveChangesAsync();
return CreatePairingCodeEntity(pairingCode);
}
@@ -178,7 +176,6 @@ namespace BTCPayServer.Authentication
{
Id = pairingCode.TokenValue,
PairingTime = DateTime.UtcNow,
Facade = pairingCode.Facade,
Label = pairingCode.Label,
StoreDataId = pairingCode.StoreDataId,
SIN = pairingCode.SIN
@@ -213,7 +210,6 @@ namespace BTCPayServer.Authentication
return null;
return new PairingCodeEntity()
{
Facade = data.Facade,
Id = data.Id,
Label = data.Label,
Expiration = data.Expiration,

5
BTCPayServer/Controllers/AccessTokenController.cs
View File

@@ -42,15 +42,12 @@ namespace BTCPayServer.Controllers
{
if (string.IsNullOrEmpty(request.Id) || !NBitpayClient.Extensions.BitIdExtensions.ValidateSIN(request.Id))
throw new BitpayHttpException(400, "'id' property is required");
if (string.IsNullOrEmpty(request.Facade))
throw new BitpayHttpException(400, "'facade' property is required");
var pairingCode = await _TokenRepository.CreatePairingCodeAsync();
await _TokenRepository.PairWithSINAsync(pairingCode, request.Id);
pairingEntity = await _TokenRepository.UpdatePairingCode(new PairingCodeEntity()
{
Id = pairingCode,
Facade = request.Facade,
Label = request.Label
});
@@ -86,7 +83,7 @@ namespace BTCPayServer.Controllers
PairingCode = pairingEntity.Id,
PairingExpiration = pairingEntity.Expiration,
DateCreated = pairingEntity.CreatedTime,
Facade = pairingEntity.Facade,
Facade = "merchant",
Token = pairingEntity.TokenValue,
Label = pairingEntity.Label
}

5
BTCPayServer/Controllers/StoresController.cs
View File

@@ -613,7 +613,6 @@ namespace BTCPayServer.Controllers
model.StoreNotConfigured = StoreNotConfigured;
model.Tokens = tokens.Select(t => new TokenViewModel()
{
Facade = t.Facade,
Label = t.Label,
SIN = t.SIN,
Id = t.Value
@@ -698,7 +697,6 @@ namespace BTCPayServer.Controllers
var tokenRequest = new TokenRequest()
{
Facade = model.Facade,
Label = model.Label,
Id = model.PublicKey == null ? null : NBitpayClient.Extensions.BitIdExtensions.GetBitIDSIN(new PubKey(model.PublicKey))
};
@@ -710,7 +708,6 @@ namespace BTCPayServer.Controllers
await _TokenRepository.UpdatePairingCode(new PairingCodeEntity()
{
Id = tokenRequest.PairingCode,
Facade = model.Facade,
Label = model.Label,
});
await _TokenRepository.PairWithStoreAsync(tokenRequest.PairingCode, storeId);
@@ -750,7 +747,6 @@ namespace BTCPayServer.Controllers
}
}
var model = new CreateTokenViewModel();
model.Facade = "merchant";
ViewBag.HidePublicKey = storeId == null;
ViewBag.ShowStores = storeId == null;
ViewBag.ShowMenu = storeId != null;
@@ -802,7 +798,6 @@ namespace BTCPayServer.Controllers
return View(new PairingModel()
{
Id = pairing.Id,
Facade = pairing.Facade,
Label = pairing.Label,
SIN = pairing.SIN ?? "Server-Initiated Pairing",
SelectedStore = selectedStore ?? stores.FirstOrDefault()?.Id,

5
BTCPayServer/Data/PairedSINData.cs
View File

@@ -12,11 +12,6 @@ namespace BTCPayServer.Data
get; set;
}
public string Facade
{
get; set;
}
public string StoreDataId
{
get; set;

2
BTCPayServer/Data/PairingCodeData.cs
View File

@@ -11,7 +11,7 @@ namespace BTCPayServer.Data
{
get; set;
}
[Obsolete("Unused")]
public string Facade
{
get; set;

2
BTCPayServer/Models/GetTokensResponse.cs
View File

@@ -39,7 +39,7 @@ namespace BTCPayServer.Models
{
JObject item = new JObject();
jarray.Add(item);
JProperty jProp = new JProperty(token.Facade);
JProperty jProp = new JProperty("merchant");
item.Add(jProp);
jProp.Value = token.Value;
}

4
BTCPayServer/Models/StoreViewModels/PairingModel.cs
View File

@@ -27,10 +27,6 @@ namespace BTCPayServer.Models.StoreViewModels
{
get; set;
}
public string Facade
{
get; set;
}
public string SIN
{
get; set;

10
BTCPayServer/Models/StoreViewModels/TokensViewModel.cs
View File

@@ -21,12 +21,6 @@ namespace BTCPayServer.Models.StoreViewModels
get; set;
}
[Required]
public string Facade
{
get; set;
}
[Required]
public string StoreId
{
@@ -52,10 +46,6 @@ namespace BTCPayServer.Models.StoreViewModels
{
get; set;
}
public string Facade
{
get; set;
}
}
public class TokensViewModel
{

5
BTCPayServer/Models/TokenRequest.cs
View File

@@ -20,11 +20,6 @@ namespace BTCPayServer.Models
{
get; set;
}
[JsonProperty(PropertyName = "facade")]
public string Facade
{
get; set;
}
[JsonProperty(PropertyName = "count")]
public int Count
{

30
BTCPayServer/Security/BitpayAuthentication.cs
View File

@@ -148,7 +148,7 @@ namespace BTCPayServer.Security
if (token != null)
{
var bitToken = await GetTokenPermissionAsync(sin, token);
var bitToken = (await _TokenRepository.GetTokens(sin)).FirstOrDefault();
if (bitToken == null)
{
return (null, false);
@@ -184,34 +184,6 @@ namespace BTCPayServer.Security
}
return await _TokenRepository.GetStoreIdFromAPIKey(apiKey);
}
private async Task<BitTokenEntity> GetTokenPermissionAsync(string sin, string expectedToken)
{
var actualTokens = (await _TokenRepository.GetTokens(sin)).ToArray();
actualTokens = actualTokens.SelectMany(t => GetCompatibleTokens(t)).ToArray();
var actualToken = actualTokens.FirstOrDefault(a => a.Value.Equals(expectedToken, StringComparison.Ordinal));
if (expectedToken == null || actualToken == null)
{
Logs.PayServer.LogDebug($"No token found for facade {Facade.Merchant} for SIN {sin}");
return null;
}
return actualToken;
}
private IEnumerable<BitTokenEntity> GetCompatibleTokens(BitTokenEntity token)
{
if (token.Facade == Facade.Merchant.ToString())
{
yield return token.Clone(Facade.User);
yield return token.Clone(Facade.PointOfSale);
}
if (token.Facade == Facade.PointOfSale.ToString())
{
yield return token.Clone(Facade.User);
}
yield return token;
}
}
internal static void AddAuthentication(IServiceCollection services, Action<BitpayAuthOptions> bitpayAuth = null)
{

8
BTCPayServer/Views/Stores/CreateToken.cshtml
View File

@@ -28,14 +28,6 @@
<input asp-for="PublicKey" class="form-control" />
<span asp-validation-for="PublicKey" class="text-danger"></span>
</div>}
<div class="form-group">
<label asp-for="Facade"></label>
<select asp-for="Facade" class="form-control">
<option value="merchant">merchant</option>
<option value="pos">pos</option>
</select>
<span asp-validation-for="Facade" class="text-danger"></span>
</div>
@if(ViewBag.ShowStores)
{

2
BTCPayServer/Views/Stores/ListTokens.cshtml
View File

@@ -25,7 +25,6 @@
<thead>
<tr>
<th>Label</th>
<th>Facade</th>
<th class="text-right">Actions</th>
</tr>
</thead>
@@ -34,7 +33,6 @@
{
<tr>
<td>@token.Label</td>
<td>@token.Facade</td>
<td class="text-right">
<a asp-action="ShowToken" asp-route-tokenId="@token.Id">See information</a> - <a asp-action="RevokeToken" asp-route-tokenId="@token.Id">Revoke</a>
</td>

4
BTCPayServer/Views/Stores/RequestPairing.cshtml
View File

@@ -20,10 +20,6 @@
<th>Label</th>
<td style="text-align:right;">@Model.Label</td>
</tr>
<tr>
<th>Facade</th>
<td style="text-align:right;">@Model.Facade</td>
</tr>
<tr>
<th>SIN</th>
<td style="text-align:right;">@Model.SIN</td>

4
BTCPayServer/Views/Stores/ShowToken.cshtml
View File

@@ -20,10 +20,6 @@
<th>Token</th>
<td>@Model.Value</td>
</tr>
<tr>
<th>Facade</th>
<td>@Model.Facade</td>
</tr>
</table>
</div>
</div>