ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remote Test

Browse Source
This commit is contained in:
Rene Evertz
2025-01-29 10:47:18 +01:00
parent 7c15d9d96f
commit f1cc096810
18 changed files with 156 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/Core/BeWoUtils.cs
View File

@@ -279,7 +279,7 @@ namespace BeWo.Core
return navigateUri.Split('?')[0] + "?" + uriValues;
}
private static string RefreshNavigateUriString(string navigateUri)
public static string RefreshNavigateUriString(string navigateUri)
{
if (navigateUri.Contains("tenant"))
navigateUri = RemoveAuthenticationInfoFromUri(navigateUri);

3
BeWo/DebugConfig.cs
View File

@@ -138,6 +138,9 @@ namespace BeWo
AutoLogin = true,
SelectView = UIContext.Finance,
SelectIndex = 7,
Username = "m1",
Password = "bewobewo",
Profilename = "5000000000"
});
return name2config;

13
BeWo/View/Detail/Accounting/InvoiceOverview.xaml
View File

@@ -123,6 +123,19 @@
</Hyperlink>
</TextBlock>
</Button>
<Button
x:Name="btn_xRechnung"
Width="20"
Height="20"
Margin="1"
Padding="0"
VerticalAlignment="Center"
Click="btn_xRechnung_Click"
Content="a"
FontFamily="Webdings"
FontSize="13"
Foreground="#FFFFFF"
ToolTip="Editieren" />
<Button
x:Name="btn_edit"
Width="20"

8
BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
View File

@@ -635,7 +635,11 @@ namespace BeWo.View.Detail.Accounting
BeWoApp.ShowErrorMessage("Fehler: " + res.ResponseString);
else
BeWoUtils.ShowPdfWindow(res.ResponseBytes);
}
}
private void btn_xRechnung_Click(object sender, RoutedEventArgs e)
{
}
}
}

4
BeWo/app.config
View File

@@ -14,13 +14,13 @@
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<!--<security mode="None" />-->
<security mode="None" />
<security mode="Transport" />
<!-- mode="Transport" für https und "None" sonst-->
</binding>
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" transferMode="StreamedRequest" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<!--<security mode="None" />-->
<security mode="None" />
<security mode="Transport" />
<!-- mode="Transport" für https und "None" sonst-->
</binding>
<binding name="QueryServiceEndpoint" closeTimeout="00:10:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">

21
Data/ASPHibernateSessionManager.cs
View File

@@ -221,6 +221,27 @@ namespace BeWo.Data
return true;
}
private static bool TryAuthenticateWithDownloadFile(HttpApplication context)
{
if (context.Request.FilePath.IndexOf("DownloadFile.aspx") == -1)
return false;
var appsettingip = System.Configuration.ConfigurationManager.AppSettings["DownloadFileIpAddress"];
var clientip = GetIP(true);
if (appsettingip != clientip)
return false;
var useroidstr = context.Request.Params["useroid"];
if (!long.TryParse(useroidstr, out long useroid))
return false;
SessionFacade.LoggedInUser = DAOFactory.GenericDAO.LoadByID<ApplicationUser>(useroid);
return true;
}
private static string GetIP(bool CheckForward = false)
{
// https://stackoverflow.com/a/13249280

5
Host/DownloadFile.aspx.cs
View File

@@ -18,6 +18,11 @@ namespace Host
{
try
{
if (!SessionFacade.IsUserLoggedIn())
{
throw new SecurityException("Invalid authentication");
}
var key = this.Request.Params["key"];
if (key != "jhkf4589141324h6543958")

6
Host/GkvAbrechnungClient.aspx.cs
View File

@@ -1,4 +1,5 @@
using BeWo.Data.Access;
using BeWo.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.ServiceImplementations;
using BS.Shared;
@@ -32,6 +33,9 @@ namespace Host
{
try
{
if (!SessionFacade.IsUserLoggedIn())
SendErrorResponse("Anmeldung erforderlich!");
//https://app5.bewoplaner.de/Host/GkvAbrechungServer?tenant=12345
var str = new StreamReader(Request.InputStream).ReadToEnd();

3
Host/ReportView.aspx.cs
View File

@@ -243,7 +243,8 @@ namespace Host
return reportCreator.CreateCustomerInvoiceReport(invoiceOid);
}
private XtraReport CreateAssessmentSheetReport()
,
private XtraReport CreateAssessmentSheetReport()
{
var customerOid = long.Parse(Request.Params["coid"]);
var month = Int32.Parse(Request.Params["m"]);

1
Host/Web.config
View File

@@ -245,6 +245,7 @@
<add key="DakotaPath" value="C:\Program Files (x86)\ITSG\dakotale\dakota30.exe" />
<add key="GkvSecretKey" value="DfDGNGn72PKfSYxSUsmRdzuBtpR9novewlmYU3gsjiFgSkaZZeylUXlbO42cWNqiKgLdMUFtWUNZT962F1raQDR7HGUzCNYsFeC" />
<add key="App8IpAddress" value="88.198.50.220" />
<add key="DownloadFileIpAddress" value="88.198.50.220" />
<add key="SendMailModuleSmtpServer" value="mail.ownsoft.de" />
<add key="SendMailModuleGkvEnabled" value="true" />

1
Service/Ressources/invoicetest.json Normal file
View File

@@ -0,0 +1 @@
{"Invoice":{"Type":"380","Number":"BWP28418","Date":"20141002","Currency":"EUR","Notice":"Rechnung gem\u00e4\u00df Bestellung vom 01.03.2018.","Period":{"Start":"20140101","End":"20140130","Description":"Leistungszeitraum xx bis yy"},"Payment":{"Type":58,"Term":"Zahlbar innerhalb 14 Tagen netto","DueDate":"20140101"}},"Seller":{"Name":"Muster GmbH","ID":null,"TaxID":null,"VatID":"DE123456789","Street":"Musterstr. 1-3","ZipCode":"30674","City":"Frankfurt","EMail":"rechnungen@musterfirma.de","CountryCode":"DE","Contact":{"Name":"Peter Musterfrau","Department":"Buchhaltung","Phone":"+49211171717","EMail":"pm@muster.de"},"BankAccount":{"IBAN":"DE38370501980147522957","BIC":"SSKMDEMMXXX","Owner":"Muster GmbH","Reference":"z.B. Rechnungnummer","ReferenceID":"Gl\u00e4ubigerID"}},"Buyer":{"Name":"Kunde GmbH","ID":null,"Street":"Stra\u00dfe Hausnummer","ZipCode":"Plz","City":"Ort","EMail":"rechnungen@kunde.de","CountryCode":"DE","Reference":"PO-Nummer oder andere Referenz, die Kunde haben will","BankAccount":{"IBAN":"DE38370501980147522957","BIC":"SSKMDEMMXXX","Owner":"Muster GmbH","MandateID":"Mandatsreferenznummer"}},"Position":[{"Quantity":2,"QuantityType":"H87","Text":"Artikel 1","Net":200,"NetTotal":400,"Tax":19,"TaxSum":76,"TaxType":"S"},{"Quantity":4,"QuantityType":"H87","Text":"Artikel 2","Net":10,"NetTotal":40,"Tax":7,"TaxSum":2.8,"TaxType":"S"}]}

3
Service/Service.csproj
View File

@@ -516,6 +516,7 @@
<Compile Include="UnitOfWork\HibernateSessionBehaviorExtension.cs" />
<Compile Include="UnitOfWork\HibernateSessionContextInitializer.cs" />
<Compile Include="Urlaubsplanung\UrlaubsplanungsManager.cs" />
<Compile Include="ServiceUtils\ServiceConfigReader.cs" />
<Compile Include="Vorlagen\VorlagenManager.cs" />
<Compile Include="XAMLInformation\InfoViaXAMLManager.cs" />
</ItemGroup>
@@ -554,7 +555,6 @@
<Folder Include="AI\" />
<Folder Include="ServiceUtils\API\" />
<Folder Include="ServiceUtils\Generell\" />
<Folder Include="Utils\" />
</ItemGroup>
<ItemGroup>
<None Include="..\.editorconfig">
@@ -564,6 +564,7 @@
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<EmbeddedResource Include="Ressources\invoicetest.json" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

10
Service/ServiceImplementations/AccountingServiceImp.cs
View File

@@ -32,6 +32,7 @@ using BeWo.Data.Models.XRechnung;
using BS.Shared.DataContracts.Invoicing.XRechnung;
using BeWo.Service.ServiceUtils.XRechnung;
using System.IO;
using BeWo.Service.ServiceUtils;
namespace BeWo.Service.ServiceImplementations
{
@@ -754,12 +755,17 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
var str = File.ReadAllText(@"C:\dev\invoicetest.json", System.Text.Encoding.UTF8);
var str = ServiceConfigReader.GetInvoiceTestJsonString();
//var str = File.ReadAllText(@"C:\dev\invoicetest.json", System.Text.Encoding.UTF8);
var xrec = JsonConvert.DeserializeObject<XRechnung>(str);
var url = "https://app5.bewoplaner.de/service/DownloadFile.aspx?key=jhkf4589141324h6543958";
var response = XRechnungSender.Send(xrec, url);
var ds = new DownloadServiceImp();
var url2 = ds.CreateTemporaryUrl(url, false);
var response = XRechnungSender.Send(xrec, url2);
return response;
}

10
Service/ServiceImplementations/DownloadServiceImp.cs
View File

@@ -22,6 +22,7 @@ using Utils = BeWo.Service.Core.Utils;
using BeWo.Service.ServiceUtils;
using BS.Shared.Translation;
using BeWo.Service.Reporting;
using BS.Shared.Core;
namespace BeWo.Service.ServiceImplementations
{
@@ -902,6 +903,15 @@ namespace BeWo.Service.ServiceImplementations
return new ExcelDownload(pHeaderCaption, pContent).CreateExcelOutputString();
}
public string CreateTemporaryUrl(string link, bool noExpiration)
{
var token = CreateTemporaryToken(link, noExpiration);
var url = TokenUtils.CreateTemporaryUrlByToken(link, token);
return url;
}
public string CreateTemporaryToken(string link, bool noExpiration)
{
string token = SecurityUtils.CreateToken(noExpiration, link);

31
Service/ServiceUtils/ServiceConfigReader.cs Normal file
View File

@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace BeWo.Service.ServiceUtils
{
public static class ServiceConfigReader
{
/// <summary>
/// https://stackoverflow.com/a/3314213
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public static string GetInvoiceTestJsonString()
{
var assembly = Assembly.GetExecutingAssembly();
var resourceName = assembly.GetManifestResourceNames()
.Single(str => str.EndsWith("invoicetest.json"));
using (Stream stream = assembly.GetManifestResourceStream(resourceName))
using (StreamReader reader = new StreamReader(stream))
{
return reader.ReadToEnd();
}
}
}
}

34
Shared/Core/TokenUtils.cs Normal file
View File

@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace BS.Shared.Core
{
public static class TokenUtils
{
public static string CreateTemporaryUrlByToken(string link, string token)
{
if (link.Contains("tenant"))
link = RemoveAuthenticationInfoFromUri(link);
var addChar = link.Contains("?") ? "&" : "?";
var finalUri = string.Format("{0}{1}token={2}", link, addChar, token);
return finalUri;
}
public static string RemoveAuthenticationInfoFromUri(string navigateUri)
{
var regex = new Regex(@"[\&|\?]?token\=[A-Za-z0-9]+|[\&|\?]?tenant\=[A-Za-z0-9]+|[\&|\?]?username\=[A-Za-z0-9.]+");
var splittedUri = regex.Split(navigateUri.Split('?')[1]);
var cleanedSplittedUri = splittedUri.Where(t => !string.IsNullOrWhiteSpace(t)).ToArray();
var uriValues = cleanedSplittedUri.Aggregate(string.Empty, (current, item) => current + item);
return navigateUri.Split('?')[0] + "?" + uriValues;
}
}
}

19
Shared/DataContracts/InvoiceBaseDC.cs
View File

@@ -45,15 +45,6 @@ namespace BS.Shared.DataContracts
[DataMember] public string Hinweise { get; set; }
[DataMember] public string InvoiceId { get; set; }
[DataMember] public string InvoiceTypeText { get; set; }
public string PeriodString
{
get
{
return this.AccountingPeriodStart.Value.ToShortDateString() + " - "
+ this.AccountingPeriodEnd.Value.ToShortDateString();
}
}
[DataMember] public long? RecipientAddressOid { get; set; }
[DataMember] public long? RecipientAddressVersion { get; set; }
[DataMember] public long? RecipientCostBearerOid { get; set; }
@@ -123,6 +114,16 @@ namespace BS.Shared.DataContracts
}
}
public string PeriodString
{
get
{
return this.AccountingPeriodStart.Value.ToShortDateString() + " - "
+ this.AccountingPeriodEnd.Value.ToShortDateString();
}
}
public bool ContainsRecipientAddressData()
{
return !Utils.AreAllNullOrEmpty(this.RecipientStreet, this.RecipientPostCode, this.RecipientTown);

1
Shared/Shared.csproj
View File

@@ -143,6 +143,7 @@
<Compile Include="Core\ComplexWohnheimbuchungsRelationHelper.cs" />
<Compile Include="Core\AbstractIDSpecificDefaultClass.cs" />
<Compile Include="Core\MailUtils.cs" />
<Compile Include="Core\TokenUtils.cs" />
<Compile Include="Core\Validator.cs" />
<Compile Include="Core\DebugUtils.cs" />
<Compile Include="Core\ImageUtils.cs" />