From c450eaf3390977439dbca5dc780cd0cfd3bc5445 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 23 Feb 2017 16:01:31 +0100 Subject: [PATCH] Logging into TBF program in case central users server is not running (and login fails) is fixed, ver. 2.12.481 --- TestBenchFramework/Program.cs | 90 +++++++++++-------- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- 2 files changed, 54 insertions(+), 40 deletions(-) diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index d4fb61b87..72a111096 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Metering Systems /// using System; using System.IO; @@ -230,24 +230,31 @@ namespace TBF } /// Load and authorise user from the UsersDB database - switch (loginDlgBench.Method) - { - default: - case Config.Entities.LoginMethod.UserName: - loadedUser = Users.Entities.User.LoadUserByName(loginDlgBench.Alias, LocalSettings.TestBenches[i].UsersDBSettings); - if (loadedUser != null) authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password); - break; - case Config.Entities.LoginMethod.FullName: - loadedUser = Users.Entities.User.LoadUserByFullName(loginDlgBench.Alias, LocalSettings.TestBenches[i].UsersDBSettings); - if (loadedUser != null) authorized = loadedUser.AuthorizeFullName(loginDlgBench.Alias, loginDlgBench.Password); - break; - case Config.Entities.LoginMethod.Number: - int number; - if (!int.TryParse(loginDlgBench.Alias, out number)) break; - loadedUser = Users.Entities.User.LoadUserByNumber(number, LocalSettings.TestBenches[i].UsersDBSettings); - if (loadedUser != null) authorized = loadedUser.AuthorizeNumber(number, loginDlgBench.Password); - break; - } + try + { + switch (loginDlgBench.Method) + { + default: + case Config.Entities.LoginMethod.UserName: + loadedUser = Users.Entities.User.LoadUserByName(loginDlgBench.Alias, LocalSettings.TestBenches[i].UsersDBSettings); + if (loadedUser != null) authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password); + break; + case Config.Entities.LoginMethod.FullName: + loadedUser = Users.Entities.User.LoadUserByFullName(loginDlgBench.Alias, LocalSettings.TestBenches[i].UsersDBSettings); + if (loadedUser != null) authorized = loadedUser.AuthorizeFullName(loginDlgBench.Alias, loginDlgBench.Password); + break; + case Config.Entities.LoginMethod.Number: + int number; + if (!int.TryParse(loginDlgBench.Alias, out number)) break; + loadedUser = Users.Entities.User.LoadUserByNumber(number, LocalSettings.TestBenches[i].UsersDBSettings); + if (loadedUser != null) authorized = loadedUser.AuthorizeNumber(number, loginDlgBench.Password); + break; + } + } + catch + { + authorized = false; + } if (settingsChanged && authorized) LocalSettings.Save(); } @@ -258,25 +265,32 @@ namespace TBF if (!authorized) { /// Load and authorise user from the Config database - switch (loginDlgBench.Method) - { - default: - case Config.Entities.LoginMethod.UserName: - loadedUser = Config.Entities.User.LoadUserByName(loginDlgBench.Alias, LocalSettings.TestBenches[i].ProceduresDBSettings); - if (loadedUser != null) authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password); - break; - case Config.Entities.LoginMethod.FullName: - loadedUser = Config.Entities.User.LoadUserByFullName(loginDlgBench.Alias, LocalSettings.TestBenches[i].ProceduresDBSettings); - if (loadedUser != null) authorized = loadedUser.AuthorizeFullName(loginDlgBench.Alias, loginDlgBench.Password); - break; - case Config.Entities.LoginMethod.Number: - int number; - if (!int.TryParse(loginDlgBench.Alias, out number)) break; - loadedUser = Config.Entities.User.LoadUserByNumber(number, LocalSettings.TestBenches[i].ProceduresDBSettings); - if (loadedUser != null) authorized = loadedUser.AuthorizeNumber(number, loginDlgBench.Password); - break; - } - } + try + { + switch (loginDlgBench.Method) + { + default: + case Config.Entities.LoginMethod.UserName: + loadedUser = Config.Entities.User.LoadUserByName(loginDlgBench.Alias, LocalSettings.TestBenches[i].ProceduresDBSettings); + if (loadedUser != null) authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password); + break; + case Config.Entities.LoginMethod.FullName: + loadedUser = Config.Entities.User.LoadUserByFullName(loginDlgBench.Alias, LocalSettings.TestBenches[i].ProceduresDBSettings); + if (loadedUser != null) authorized = loadedUser.AuthorizeFullName(loginDlgBench.Alias, loginDlgBench.Password); + break; + case Config.Entities.LoginMethod.Number: + int number; + if (!int.TryParse(loginDlgBench.Alias, out number)) break; + loadedUser = Config.Entities.User.LoadUserByNumber(number, LocalSettings.TestBenches[i].ProceduresDBSettings); + if (loadedUser != null) authorized = loadedUser.AuthorizeNumber(number, loginDlgBench.Password); + break; + } + } + catch + { + authorized = false; + } + } if (authorized) { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index fa0b0e1d8..ba4ef9f7f 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.479.1")] -[assembly: AssemblyFileVersion("2.12.479.1")] +[assembly: AssemblyVersion("2.12.481.1")] +[assembly: AssemblyFileVersion("2.12.481.1")]