Skip to content

Commit 0c69ca1

Browse files
clavecoderclavecoder
committed
Merge pull request #15 from latticework/kenbrubaker/ImplementValidationErrors
Kenbrubaker/implement validation errors
2 parents fcd67ec + aee1efd commit 0c69ca1

File tree

57 files changed

+1880
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1880
-277
lines changed

‎Jali.Pcl/Jali.Pcl.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3232
..\makefile.sake = ..\makefile.sake
3333
..\psakebuild.cmd = ..\psakebuild.cmd
3434
..\psakefile.ps1 = ..\psakefile.ps1
35+
..\publish.cmd = ..\publish.cmd
3536
..\publish.ps1 = ..\publish.ps1
3637
..\README.md = ..\README.md
3738
EndProjectSection

‎Jali.Pcl/samples/HelloJali.Web/Views/Shared/Error.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<body>
88
<hgroup>
99
<h1>Error.</h1>
10-
<h2>An error occurred while processing your request.</h2>
10+
<h2>An error occurred while processing your httpRequest.</h2>
1111
</hgroup>
1212
</body>
1313
</html>

‎Jali.Pcl/src/Jali.Pcl/Jali.Pcl.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
<Compile Include="..\..\..\src\Jali\Secure\IAuthorizer.cs">
7373
<Link>Secure\IAuthorizer.cs</Link>
7474
</Compile>
75+
<Compile Include="..\..\..\src\Jali\Secure\JaliClaimTypes.cs">
76+
<Link>Secure\JaliClaimTypes.cs</Link>
77+
</Compile>
7578
<Compile Include="..\..\..\src\Jali\Secure\SecurityContext.cs">
7679
<Link>Secure\SecurityContext.cs</Link>
7780
</Compile>

‎Jali.Pcl/src/Jali.Serve.AspNet.Mvc.Net45/Jali.Serve.AspNet.Mvc.Net45.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
<Reference Include="System.Xml" />
9595
</ItemGroup>
9696
<ItemGroup>
97+
<Compile Include="..\..\..\src\Jali.Serve.AspNet.Mvc.Net45\AspNetExecutionContext.cs">
98+
<Link>AspNetExecutionContext.cs</Link>
99+
</Compile>
97100
<Compile Include="..\..\..\src\Jali.Serve.AspNet.Mvc.Net45\JaliHttpConfigurationExtensions.cs">
98101
<Link>JaliHttpConfigurationExtensions.cs</Link>
99102
</Compile>

‎Jali.Pcl/src/Jali.Serve.Pcl/Jali.Serve.Pcl.csproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
<Compile Include="..\..\..\src\Jali.Serve\Definition\ActionDirection.cs">
6969
<Link>Definition\ActionDirection.cs</Link>
7070
</Compile>
71+
<Compile Include="..\..\..\src\Jali.Serve\Definition\AuthenticationRequirement.cs">
72+
<Link>Definition\AuthenticationRequirement.cs</Link>
73+
</Compile>
7174
<Compile Include="..\..\..\src\Jali.Serve\Definition\DataTransmissionModes.cs">
7275
<Link>Definition\DataTransmissionModes.cs</Link>
7376
</Compile>
@@ -110,6 +113,9 @@
110113
<Compile Include="..\..\..\src\Jali.Serve\Definition\SchemaReference.cs">
111114
<Link>Definition\SchemaReference.cs</Link>
112115
</Compile>
116+
<Compile Include="..\..\..\src\Jali.Serve\Definition\SchemaReferenceOptions.cs">
117+
<Link>Definition\SchemaReferenceOptions.cs</Link>
118+
</Compile>
113119
<Compile Include="..\..\..\src\Jali.Serve\Definition\SchemaType.cs">
114120
<Link>Definition\SchemaType.cs</Link>
115121
</Compile>
@@ -128,6 +134,12 @@
128134
<Compile Include="..\..\..\src\Jali.Serve\EndpointPartition.cs">
129135
<Link>EndpointPartition.cs</Link>
130136
</Compile>
137+
<Compile Include="..\..\..\src\Jali.Serve\ExecuteProcedureResult.cs">
138+
<Link>ExecuteProcedureResult.cs</Link>
139+
</Compile>
140+
<Compile Include="..\..\..\src\Jali.Serve\HttpRequestParseResult.cs">
141+
<Link>HttpRequestParseResult.cs</Link>
142+
</Compile>
131143
<Compile Include="..\..\..\src\Jali.Serve\IResource.cs">
132144
<Link>IResource.cs</Link>
133145
</Compile>
@@ -173,6 +185,12 @@
173185
<Compile Include="..\..\..\src\Jali.Serve\RoutineProcedureContext.cs">
174186
<Link>RoutineProcedureContext.cs</Link>
175187
</Compile>
188+
<Compile Include="..\..\..\src\Jali.Serve\Secure\AuthenticationOperations.cs">
189+
<Link>Secure\AuthenticationOperations.cs</Link>
190+
</Compile>
191+
<Compile Include="..\..\..\src\Jali.Serve\Secure\AuthenticationResult.cs">
192+
<Link>Secure\AuthenticationResult.cs</Link>
193+
</Compile>
176194
<Compile Include="..\..\..\src\Jali.Serve\Secure\DefaultAuthenticator.cs">
177195
<Link>Secure\DefaultAuthenticator.cs</Link>
178196
</Compile>
@@ -280,9 +298,13 @@
280298
<Link>Definition\jaliservice.schema.json</Link>
281299
</None>
282300
<None Include="app.config" />
301+
<None Include="LICENSE" />
283302
<None Include="packages.config" />
284303
</ItemGroup>
285304
<ItemGroup>
305+
<Reference Include="jose-jwt">
306+
<HintPath>..\..\packages\jose-jwt.1.9.0\lib\4.0\jose-jwt.dll</HintPath>
307+
</Reference>
286308
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
287309
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
288310
<Private>True</Private>

‎Jali.Pcl/src/Jali.Serve.Pcl/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="jose-jwt" version="1.9.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
34
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
45
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable45-net45+win8+wp8+wpa81" />
56
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />

‎Jali.Pcl/src/Jali.Serve.Server.Pcl/Jali.Serve.Server.Pcl.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<None Include="packages.config" />
4444
</ItemGroup>
4545
<ItemGroup>
46+
<Compile Include="..\..\..\src\Jali.Serve.Server\Common\ServerResourceBase.cs">
47+
<Link>Common\ServerResourceBase.cs</Link>
48+
</Compile>
49+
<Compile Include="..\..\..\src\Jali.Serve.Server\Common\ServerRoutineBase.cs">
50+
<Link>Common\ServerRoutineBase.cs</Link>
51+
</Compile>
4652
<Compile Include="..\..\..\src\Jali.Serve.Server\JaliHttpMessageResponseBuilder.cs">
4753
<Link>JaliHttpMessageResponseBuilder.cs</Link>
4854
</Compile>
@@ -88,6 +94,15 @@
8894
<Compile Include="..\..\..\src\Jali.Serve.Server\StageManager.cs">
8995
<Link>StageManager.cs</Link>
9096
</Compile>
97+
<Compile Include="..\..\..\src\Jali.Serve.Server\User\GetUserRoutine.cs">
98+
<Link>User\GetUserRoutine.cs</Link>
99+
</Compile>
100+
<Compile Include="..\..\..\src\Jali.Serve.Server\User\User.cs">
101+
<Link>User\User.cs</Link>
102+
</Compile>
103+
<Compile Include="..\..\..\src\Jali.Serve.Server\User\UserResource.cs">
104+
<Link>User\UserResource.cs</Link>
105+
</Compile>
91106
<Compile Include="Properties\AssemblyInfo.cs" />
92107
</ItemGroup>
93108
<ItemGroup>

‎build/Jali.Serve/Jali.Serve.nuspec

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,35 @@
1414
<dependencies>
1515
<group targetFramework="net45">
1616
<dependency id="Jali" version="$version$" />
17+
<dependency id="jose-jwt" version="1.9.0" />
1718
</group>
1819
<group targetFramework="wp8">
1920
<dependency id="Jali" version="$version$" />
21+
<dependency id="jose-jwt" version="1.9.0" />
2022
</group>
2123
<group targetFramework="win8">
2224
<dependency id="Jali" version="$version$" />
25+
<dependency id="jose-jwt" version="1.9.0" />
2326
</group>
2427
<group targetFramework="wpa81">
2528
<dependency id="Jali" version="$version$" />
29+
<dependency id="jose-jwt" version="1.9.0" />
2630
</group>
2731
<group targetFramework="xamarin.ios">
2832
<dependency id="Jali" version="$version$" />
33+
<dependency id="jose-jwt" version="1.9.0" />
2934
</group>
3035
<group targetFramework="monotouch">
3136
<dependency id="Jali" version="$version$" />
37+
<dependency id="jose-jwt" version="1.9.0" />
3238
</group>
3339
<group targetFramework="monoandroid">
3440
<dependency id="Jali" version="$version$" />
41+
<dependency id="jose-jwt" version="1.9.0" />
3542
</group>
3643
<group targetFramework=".NETPlatform5.0">
3744
<dependency id="Jali" version="$version$" />
45+
<dependency id="jose-jwt" version="1.9.0" />
3846
</group>
3947
</dependencies>
4048
</metadata>

‎psakefile.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ properties {
33
$zipFileName = "Jali00r1.zip"
44
$majorVersion = "0.0"
55
$majorWithReleaseVersion = "0.0.1"
6-
$nugetPrelease = "prealpha5"
6+
$nugetPrelease = "prealpha506"
77
$version = GetVersion $majorWithReleaseVersion
88
$signAssemblies = $false
99
# $signKeyPath = "C:\Development\Releases\newtonsoft.snk"

‎publish.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
3+
powershell "%~dpn0.ps1" %*

0 commit comments

Comments
 (0)