diff --git a/src/AK.Chore.Application/Properties/AssemblyInfo.cs b/src/AK.Chore.Application/Properties/AssemblyInfo.cs index 7957010..e745f60 100644 --- a/src/AK.Chore.Application/Properties/AssemblyInfo.cs +++ b/src/AK.Chore.Application/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("c412acab-d2c9-4b4b-98a5-b0b894fdd857")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] diff --git a/src/AK.Chore.Application/Services/LoginService.cs b/src/AK.Chore.Application/Services/LoginService.cs index ce719a3..6e11d23 100644 --- a/src/AK.Chore.Application/Services/LoginService.cs +++ b/src/AK.Chore.Application/Services/LoginService.cs @@ -21,9 +21,12 @@ #region Namespace Imports +using AK.Chore.Contracts; using AK.Chore.Contracts.UserProfile; using AK.Commons; +using AK.Commons.Logging; using AK.Commons.Security; +using AK.Commons.Services; using System; using System.ServiceModel; @@ -65,9 +68,11 @@ public class LoginService : ILoginService "
  • Export and import tasks to/from flat data.
    • "; private IUserProfileService userProfileService; + private IAppLogger logger; private LoginSplashInfo loginSplashInfo; public IUserProfileService UserProfileServiceOverride { get; set; } + public IAppLogger LoggerOverride { get; set; } public Uri RequestUriOverride { get; set; } @@ -80,6 +85,11 @@ private IUserProfileService UserProfileService } } + private IAppLogger Logger + { + get { return this.LoggerOverride ?? this.logger ?? (this.logger = AppEnvironment.Logger); } + } + public LoginSplashInfo GetLoginSplashInfo() { return this.loginSplashInfo ?? @@ -88,7 +98,17 @@ public LoginSplashInfo GetLoginSplashInfo() public LoginUserInfo GetUser(string userName) { - var result = this.UserProfileService.GetUserByUserName(userName); + OperationResult result; + try + { + result = this.UserProfileService.GetUserByUserName(userName); + } + catch (Exception ex) + { + this.Logger.Error(ex); + result = new OperationResult(GeneralResult.Error, null, ex.Message); + } + if (result.IsSuccess) { var user = result.Result; @@ -109,7 +129,18 @@ public LoginUserInfo GetUser(string userName) public LoginUserInfo CreateUser(LoginUserInfo userInfo) { - var result = this.UserProfileService.CreateUser(userInfo.UserName, userInfo.DisplayName); + OperationResult result; + + try + { + result = this.UserProfileService.CreateUser(userInfo.UserName, userInfo.DisplayName); + } + catch (Exception ex) + { + this.Logger.Error(ex); + result = new OperationResult(GeneralResult.Error, null, ex.Message); + } + if (!result.IsSuccess) throw new FaultException(new FaultReason(result.Message)); userInfo.UserExists = true; diff --git a/src/AK.Chore.Contracts/Properties/AssemblyInfo.cs b/src/AK.Chore.Contracts/Properties/AssemblyInfo.cs index c446ad3..0627891 100644 --- a/src/AK.Chore.Contracts/Properties/AssemblyInfo.cs +++ b/src/AK.Chore.Contracts/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("2f72ec68-c3c5-454b-966b-a15a1a2afb04")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] \ No newline at end of file diff --git a/src/AK.Chore.Domain/Properties/AssemblyInfo.cs b/src/AK.Chore.Domain/Properties/AssemblyInfo.cs index bab276c..ff510d0 100644 --- a/src/AK.Chore.Domain/Properties/AssemblyInfo.cs +++ b/src/AK.Chore.Domain/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("fcf9ec22-2233-420e-b28f-e3b534497b1f")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] \ No newline at end of file diff --git a/src/AK.Chore.Infrastructure/Properties/AssemblyInfo.cs b/src/AK.Chore.Infrastructure/Properties/AssemblyInfo.cs index c49c1ce..fdd6f03 100644 --- a/src/AK.Chore.Infrastructure/Properties/AssemblyInfo.cs +++ b/src/AK.Chore.Infrastructure/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("b008b443-6468-4f73-87f8-61a11d1e16f9")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] diff --git a/src/AK.Chore.Presentation/AK.Chore.Presentation.csproj b/src/AK.Chore.Presentation/AK.Chore.Presentation.csproj index 61ccf99..933a820 100644 --- a/src/AK.Chore.Presentation/AK.Chore.Presentation.csproj +++ b/src/AK.Chore.Presentation/AK.Chore.Presentation.csproj @@ -49,9 +49,9 @@ False ..\..\lib\AK.Commons.1.0.3\lib\net45\AK.Commons.dll - + False - ..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.0\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll + ..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.2\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll False @@ -82,13 +82,19 @@ True ..\..\lib\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + False - ..\..\lib\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Bson.dll + ..\..\lib\MongoDB.Bson.2.1.0\lib\net45\MongoDB.Bson.dll - + False - ..\..\lib\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Driver.dll + ..\..\lib\MongoDB.Driver.2.1.0\lib\net45\MongoDB.Driver.dll + + + ..\..\lib\MongoDB.Driver.Core.2.1.0\lib\net45\MongoDB.Driver.Core.dll + + + ..\..\lib\mongocsharpdriver.2.1.0\lib\net45\MongoDB.Driver.Legacy.dll False @@ -247,7 +253,9 @@ - + + Designer + diff --git a/src/AK.Chore.Presentation/Properties/AssemblyInfo.cs b/src/AK.Chore.Presentation/Properties/AssemblyInfo.cs index 18f7155..70effa7 100644 --- a/src/AK.Chore.Presentation/Properties/AssemblyInfo.cs +++ b/src/AK.Chore.Presentation/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ [assembly: OwinStartup(typeof(ChoreApplication))] [assembly: ComVisible(false)] [assembly: Guid("32b9e455-47b5-4628-821e-8455ec7621f2")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] \ No newline at end of file diff --git a/src/AK.Chore.Presentation/packages.config b/src/AK.Chore.Presentation/packages.config index 4df5096..30b9d52 100644 --- a/src/AK.Chore.Presentation/packages.config +++ b/src/AK.Chore.Presentation/packages.config @@ -2,7 +2,7 @@ - + @@ -20,7 +20,10 @@ - + + + + \ No newline at end of file diff --git a/src/AK.Chore.Tests/AK.Chore.Tests.csproj b/src/AK.Chore.Tests/AK.Chore.Tests.csproj index cedbf16..07293af 100644 --- a/src/AK.Chore.Tests/AK.Chore.Tests.csproj +++ b/src/AK.Chore.Tests/AK.Chore.Tests.csproj @@ -41,16 +41,24 @@ False ..\..\lib\AK.Commons.1.0.3\lib\net45\AK.Commons.dll - + False - ..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.0\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll + ..\..\lib\AK.Commons.Providers.DataAccess.MongoDb.1.0.2\lib\net45\AK.Commons.Providers.DataAccess.MongoDb.dll - - ..\packages\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Bson.dll + + False + ..\..\lib\MongoDB.Bson.2.1.0\lib\net45\MongoDB.Bson.dll + + + False + ..\..\lib\MongoDB.Driver.2.1.0\lib\net45\MongoDB.Driver.dll + + + ..\..\lib\MongoDB.Driver.Core.2.1.0\lib\net45\MongoDB.Driver.Core.dll - - ..\packages\mongocsharpdriver.1.8.2\lib\net35\MongoDB.Driver.dll + + ..\..\lib\mongocsharpdriver.2.1.0\lib\net45\MongoDB.Driver.Legacy.dll ..\..\lib\Moq.4.2.1402.2112\lib\net40\Moq.dll diff --git a/src/AK.Chore.Tests/Properties/AssemblyInfo.cs b/src/AK.Chore.Tests/Properties/AssemblyInfo.cs index abff125..f20a87b 100644 --- a/src/AK.Chore.Tests/Properties/AssemblyInfo.cs +++ b/src/AK.Chore.Tests/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("2acecedb-faa5-4328-8c96-b91e1cc572e0")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] \ No newline at end of file diff --git a/src/AK.Chore.Tests/packages.config b/src/AK.Chore.Tests/packages.config index 273cc9a..abd097f 100644 --- a/src/AK.Chore.Tests/packages.config +++ b/src/AK.Chore.Tests/packages.config @@ -1,7 +1,10 @@  - - + + + + + \ No newline at end of file diff --git a/src/AK.Chore.sln b/src/AK.Chore.sln index 726299e..318ab4d 100644 --- a/src/AK.Chore.sln +++ b/src/AK.Chore.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2012 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B6578652-E4EC-4451-9F59-8BD5AE870A77}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config