admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

immediately before implementing new QBOI code for oAuth2 (except did change json.net in qboi project from v10 to v12)

Browse Source
This commit is contained in:
John Cardinal
2019-09-27 16:59:22 +00:00
parent 494bbb0132
commit 479f10cb6a
9 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
utils/AyaImport/AyaImport.csproj
View File

@@ -103,6 +103,37 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<FileAlignment>4096</FileAlignment>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RELEASE AND DEPLOY BUILD|x86'">
<OutputPath>bin\x86\RELEASE AND DEPLOY BUILD\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<Optimize>true</Optimize>
<DebugType />
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

9
utils/AyaImport/AyaImport.csproj.user
View File

@@ -72,4 +72,13 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RELEASE AND DEPLOY BUILD|AnyCPU' ">
<StartWithIE>true</StartWithIE>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<StartWithIE>true</StartWithIE>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<StartWithIE>true</StartWithIE>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RELEASE AND DEPLOY BUILD|x86'">
<StartWithIE>true</StartWithIE>
</PropertyGroup>
</Project>

2
utils/AyaImport/Form1.cs
View File

@@ -4428,7 +4428,7 @@ sLastOp="Saving workorder" + w.WorkorderService.ServiceNumber.ToString();
/// <returns></returns>
private bool DoNewLogin(string Login, string Password)
{
if(!Thread.CurrentPrincipal.Identity.IsAuthenticated)
if(Thread.CurrentPrincipal.Identity==null || !Thread.CurrentPrincipal.Identity.IsAuthenticated)
AyaBizUtils.Login(Login, Password);
if(Thread.CurrentPrincipal.Identity.IsAuthenticated)
{