diff --git a/Fab2ApprovalSystem/Controllers/AccountController.cs b/Fab2ApprovalSystem/Controllers/AccountController.cs index 3b3aae8..a1f8110 100644 --- a/Fab2ApprovalSystem/Controllers/AccountController.cs +++ b/Fab2ApprovalSystem/Controllers/AccountController.cs @@ -85,38 +85,6 @@ namespace Fab2ApprovalSystem.Controllers if (isLoginValid) { - //Check ITAR Permissions from AD group -#if(!DEBUG) - try - { - - bool hasITARAccess = false; - - //========TEMP CODE - NEEDS TO BE DELETED - //Functions.WriteEvent("Using DB for EC Auth for user " + model.LoginID, System.Diagnostics.EventLogEntryType.Information); - //hasITARAccess = userDMO.GetEC_AD_Users(model.LoginID); - //=============END OF TEMP CODE - - - if (GlobalVars.DBConnection.ToUpper() == "TEST" || GlobalVars.DBConnection.ToUpper() == "QUALITY") - { - hasITARAccess = true; - } - else - { - hasITARAccess = Functions.NA_HasITARAccess(model.LoginID, model.Password); - if (!hasITARAccess) // check the IFX domain - hasITARAccess = Functions.IFX_HasITARAccess(model.LoginID, model.Password); - } - userDMO.UpdateInsertITARAccess(model.LoginID, hasITARAccess ? "1" : "0"); - } - catch (Exception ex) - { - ModelState.AddModelError("", "Not a member of the EC Domain" + ex.Message); - return View(model); - } -#endif - LoginModel user = userDMO.GetUser(model.LoginID); if (user != null) { diff --git a/Fab2ApprovalSystem/DMO/AdminDMO.cs b/Fab2ApprovalSystem/DMO/AdminDMO.cs index 4a776f3..18415fe 100644 --- a/Fab2ApprovalSystem/DMO/AdminDMO.cs +++ b/Fab2ApprovalSystem/DMO/AdminDMO.cs @@ -8,12 +8,13 @@ using System.Web; using Dapper; using Fab2ApprovalSystem.Models; using System.Text; +using Fab2ApprovalSystem.Misc; namespace Fab2ApprovalSystem.DMO { public class AdminDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); private static FabApprovalTrainingEntities FabApprovalDB = new FabApprovalTrainingEntities(); /// diff --git a/Fab2ApprovalSystem/DMO/ApprovalLogDMO.cs b/Fab2ApprovalSystem/DMO/ApprovalLogDMO.cs index c2f24cc..34d85fa 100644 --- a/Fab2ApprovalSystem/DMO/ApprovalLogDMO.cs +++ b/Fab2ApprovalSystem/DMO/ApprovalLogDMO.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -7,13 +7,14 @@ using System.Data.SqlClient; using Fab2ApprovalSystem.Models; using Dapper; using System.Configuration; +using Fab2ApprovalSystem.Misc; namespace Fab2ApprovalSystem.DMO { public static class ApprovalLogDMO { - private static IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private static IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); public static void Add(ApprovalLog appLog) { @@ -29,4 +30,4 @@ namespace Fab2ApprovalSystem.DMO } } -} \ No newline at end of file +} diff --git a/Fab2ApprovalSystem/DMO/AuditDMO.cs b/Fab2ApprovalSystem/DMO/AuditDMO.cs index b9ba426..1621553 100644 --- a/Fab2ApprovalSystem/DMO/AuditDMO.cs +++ b/Fab2ApprovalSystem/DMO/AuditDMO.cs @@ -11,12 +11,13 @@ using System.Linq; using System.Text; using System.Transactions; using System.Web; +using Fab2ApprovalSystem.Misc; namespace Fab2ApprovalSystem.DMO { public class AuditDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); WorkflowDMO wfDMO = new WorkflowDMO(); /// diff --git a/Fab2ApprovalSystem/DMO/ChangeControlDMO.cs b/Fab2ApprovalSystem/DMO/ChangeControlDMO.cs index 1bd8842..92e56a5 100644 --- a/Fab2ApprovalSystem/DMO/ChangeControlDMO.cs +++ b/Fab2ApprovalSystem/DMO/ChangeControlDMO.cs @@ -1,4 +1,5 @@ using Dapper; +using Fab2ApprovalSystem.Misc; using Fab2ApprovalSystem.Models; using Fab2ApprovalSystem.ViewModels; using System; @@ -15,7 +16,7 @@ namespace Fab2ApprovalSystem.DMO { public class ChangeControlDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); WorkflowDMO wfDMO = new WorkflowDMO(); /// diff --git a/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs b/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs index c4b8f97..3484780 100644 --- a/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs +++ b/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs @@ -18,7 +18,7 @@ namespace Fab2ApprovalSystem.DMO public class CorrectiveActionDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); WorkflowDMO wfDMO = new WorkflowDMO(); public CorrectiveAction InsertCA(CorrectiveAction ca) diff --git a/Fab2ApprovalSystem/DMO/ECNTypeChangeLogDMO.cs b/Fab2ApprovalSystem/DMO/ECNTypeChangeLogDMO.cs index de2c7cd..6eb323f 100644 --- a/Fab2ApprovalSystem/DMO/ECNTypeChangeLogDMO.cs +++ b/Fab2ApprovalSystem/DMO/ECNTypeChangeLogDMO.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -7,6 +7,7 @@ using System.Data.SqlClient; using Fab2ApprovalSystem.Models; using Dapper; using System.Configuration; +using Fab2ApprovalSystem.Misc; namespace Fab2ApprovalSystem.DMO { @@ -15,7 +16,7 @@ namespace Fab2ApprovalSystem.DMO /// public static class ECNTypeChangeLogDMO { - private static IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private static IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); /// /// @@ -37,4 +38,4 @@ namespace Fab2ApprovalSystem.DMO -} \ No newline at end of file +} diff --git a/Fab2ApprovalSystem/DMO/ECN_DMO.cs b/Fab2ApprovalSystem/DMO/ECN_DMO.cs index 4b35a41..0c90d7e 100644 --- a/Fab2ApprovalSystem/DMO/ECN_DMO.cs +++ b/Fab2ApprovalSystem/DMO/ECN_DMO.cs @@ -18,7 +18,7 @@ namespace Fab2ApprovalSystem.DMO { public class ECN_DMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); WorkflowDMO wfDMO = new WorkflowDMO(); diff --git a/Fab2ApprovalSystem/DMO/EventLogDMO.cs b/Fab2ApprovalSystem/DMO/EventLogDMO.cs index 126e43a..0843e05 100644 --- a/Fab2ApprovalSystem/DMO/EventLogDMO.cs +++ b/Fab2ApprovalSystem/DMO/EventLogDMO.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -18,7 +18,7 @@ namespace Fab2ApprovalSystem.DMO public static class EventLogDMO { - private static IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private static IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); //public static void Add(WinEventLog eventLog) //{ @@ -48,4 +48,4 @@ namespace Fab2ApprovalSystem.DMO } -} \ No newline at end of file +} diff --git a/Fab2ApprovalSystem/DMO/LotDispositionDMO.cs b/Fab2ApprovalSystem/DMO/LotDispositionDMO.cs index b737c97..281b692 100644 --- a/Fab2ApprovalSystem/DMO/LotDispositionDMO.cs +++ b/Fab2ApprovalSystem/DMO/LotDispositionDMO.cs @@ -17,7 +17,7 @@ namespace Fab2ApprovalSystem.DMO { public class LotDispositionDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); //LotDispositionDMO ldDMO = new LotDispositionDMO(); WorkflowDMO wfDMO = new WorkflowDMO(); @@ -1355,7 +1355,7 @@ namespace Fab2ApprovalSystem.DMO internal IEnumerable GetComments(int issueID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); return db.Query("GetComments", new { @IssueID = issueID}, commandType: CommandType.StoredProcedure).ToList(); } diff --git a/Fab2ApprovalSystem/DMO/LotTravelerDMO.cs b/Fab2ApprovalSystem/DMO/LotTravelerDMO.cs index 3e45699..53de567 100644 --- a/Fab2ApprovalSystem/DMO/LotTravelerDMO.cs +++ b/Fab2ApprovalSystem/DMO/LotTravelerDMO.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -17,7 +17,7 @@ namespace Fab2ApprovalSystem.DMO { public class LotTravelerDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); WorkflowDMO wfDMO = new WorkflowDMO(); /// @@ -1648,4 +1648,4 @@ namespace Fab2ApprovalSystem.DMO this.db.Execute("LTReassignOriginator", parameters, commandType: CommandType.StoredProcedure); } } -} \ No newline at end of file +} diff --git a/Fab2ApprovalSystem/DMO/MRB_DMO.cs b/Fab2ApprovalSystem/DMO/MRB_DMO.cs index 313bce2..b6f8ab1 100644 --- a/Fab2ApprovalSystem/DMO/MRB_DMO.cs +++ b/Fab2ApprovalSystem/DMO/MRB_DMO.cs @@ -1,4 +1,4 @@ -using Fab2ApprovalSystem.Models; +using Fab2ApprovalSystem.Models; using System; using System.Collections.Generic; using System.Configuration; @@ -17,7 +17,7 @@ namespace Fab2ApprovalSystem.DMO public class MRB_DMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); WorkflowDMO wfDMO = new WorkflowDMO(); /// /// @@ -1346,4 +1346,4 @@ namespace Fab2ApprovalSystem.DMO } } -} \ No newline at end of file +} diff --git a/Fab2ApprovalSystem/DMO/MiscDMO.cs b/Fab2ApprovalSystem/DMO/MiscDMO.cs index ce4ea63..71b40a0 100644 --- a/Fab2ApprovalSystem/DMO/MiscDMO.cs +++ b/Fab2ApprovalSystem/DMO/MiscDMO.cs @@ -23,7 +23,7 @@ namespace Fab2ApprovalSystem.DMO /// public static IEnumerable SearchLots(string searchText, string searchBy) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); IEnumerable lotList; string sql = ""; @@ -56,7 +56,7 @@ namespace Fab2ApprovalSystem.DMO } public static IEnumerable GetUserIDsBySubRoleID(int subRoleID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); IEnumerable userList; string sql = ""; @@ -74,7 +74,7 @@ namespace Fab2ApprovalSystem.DMO /// public static IEnumerable SearchLTLots(string searchText, string searchBy) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); string sql = ""; @@ -96,7 +96,7 @@ namespace Fab2ApprovalSystem.DMO /// public static IEnumerable SearchLTParts(string searchText) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); StringBuilder sql = new StringBuilder(); sql.Append("SELECT PartNumber + '~' + SiliconPart + '~' + ProcessFlow + '~' + PartDescription AS WIPPartData "); sql.Append("FROM vWIPPartData WHERE PartNumber LIKE '%" + searchText + "%' ORDER BY PartNumber"); @@ -120,8 +120,7 @@ namespace Fab2ApprovalSystem.DMO /// public static void GetLotInformation(Lot lot) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); - //IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnectionProd"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); StringBuilder qryLotInfo = new StringBuilder(); qryLotInfo.Append("SELECT WP_STATUS , WP_LOT_NO, WP_PART_NUMBER, MP_PRODUCT_FAMILY, MP_DESCRIPTION, "); qryLotInfo.Append("WP_CURRENT_QTY, WP_CURRENT_LOCATION, DieLotNumber, DiePartNo, DieCount, MP_QUALITY_CODE FROM SPNLot "); @@ -260,7 +259,7 @@ namespace Fab2ApprovalSystem.DMO public static IEnumerable GetUserList() { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); StringBuilder sql = new StringBuilder(); sql.Append("SELECT FirstName + ' ' + LastName AS FullName, U.UserID AS UserId "); @@ -279,7 +278,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetApproverEmailListByDocument(int issueID, byte step, int documentType) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@DocumentTypeID", documentType); @@ -305,7 +304,7 @@ namespace Fab2ApprovalSystem.DMO public static List GetApproversListByDocument(int issueID, byte step, int documentType) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@DocumentTypeID", documentType); @@ -317,7 +316,7 @@ namespace Fab2ApprovalSystem.DMO public static IEnumerable GetApprovalsByDocument(int issueID, int documentType) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@DocumentTypeID", documentType); @@ -336,7 +335,7 @@ namespace Fab2ApprovalSystem.DMO /// public static IEnumerable GetApprovedApproversListByDocument(int issueID, int currentStep, int documentType) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); return db.Query("GetApprovedApproversListByDocument", new { @DocumentTypeID = documentType, @IssueID = issueID, @Step = currentStep }, commandType: CommandType.StoredProcedure).ToList(); } @@ -351,7 +350,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetPendingApproversListByDocument(int issueID, byte step, int documentType) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@DocumentTypeID", documentType); parameters.Add("@IssueID", issueID); @@ -368,7 +367,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetEmergencyTECNApprovalNotifyList(int ecnNumber) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@ECNNumber", ecnNumber); var approverList = db.Query("ECNGetETECNApprovalNotificationList", parameters, commandType: CommandType.StoredProcedure).ToList(); @@ -382,7 +381,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetTECNCancelledApprovalNotifyList(int ecnNumber) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@ECNNumber", ecnNumber); var approverList = db.Query("ECN_TECNCancelledApprovalNotifyList", parameters, commandType: CommandType.StoredProcedure).ToList(); @@ -397,7 +396,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetFabGroupNotifyList(int workRequestID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@WorkRequestID", workRequestID); var notifyList = db.Query("LTFabGroupApprovalNotificationList", parameters, commandType: CommandType.StoredProcedure).ToList(); @@ -412,7 +411,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetWorkRequestRevisionNotifyList(int notificationType, int workRequestID, int userID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@NotificationType", notificationType); parameters.Add("@UserID", userID); @@ -431,7 +430,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetWorkRequestApprovedNotifyList(int notificationType, int workRequestID, int userID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@NotificationType", notificationType); parameters.Add("@UserID", userID); @@ -449,7 +448,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetLotTravelerCreationAndRevisionNotifyList(int ltLotID, int workRequestID, int userID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@LotID", ltLotID); parameters.Add("@UserID", userID); @@ -470,7 +469,7 @@ namespace Fab2ApprovalSystem.DMO public static int EnableOOOStatus(int oooUserID, int delegatedTo, DateTime startDate, DateTime endDate) { int returnValue = 0; - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@OOOUserID", oooUserID); @@ -498,7 +497,7 @@ namespace Fab2ApprovalSystem.DMO /// public static void ExpireOOOStatus(int oooUserID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@OOOUserID", oooUserID); @@ -512,7 +511,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetDepartments() { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var departments = db.Query("GetDepartments", null, commandType: CommandType.StoredProcedure).ToList(); return departments; @@ -524,7 +523,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List GetModules() { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var modules = db.Query("GetModules", null, commandType: CommandType.StoredProcedure).ToList(); return modules; @@ -537,7 +536,7 @@ namespace Fab2ApprovalSystem.DMO /// public static void GetLTLotInformation(LTLot lot) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); StringBuilder qryLotInfo = new StringBuilder(); //qryLotInfo.Append("SELECT DISTINCT "); //qryLotInfo.Append("WP_LOT_NO, WP_CURRENT_QTY, WP.WP_PART_NUMBER, MP_DESCRIPTION, WP_PROCESS, WO_LOCATION, WO_OPER_NO, WP_STATUS "); @@ -591,7 +590,7 @@ namespace Fab2ApprovalSystem.DMO public static string GetEmail(int? userID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@UserID", userID); var email = db.Query("GetEmail", parameters, commandType: CommandType.StoredProcedure).Single(); @@ -606,7 +605,7 @@ namespace Fab2ApprovalSystem.DMO /// public static List Get8DEmailListForClosureNotification(int issueID) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); @@ -618,7 +617,7 @@ namespace Fab2ApprovalSystem.DMO public static CredentialsStorage GetCredentialsInfo(string serverName, string credentialType) // TODO - need to use an enum for the credentialType { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@ServerName", serverName); parameters.Add("@CredentialType", credentialType); @@ -628,13 +627,13 @@ namespace Fab2ApprovalSystem.DMO public List GetApprovalReminderList() { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var approvals = db.Query("GetApprovalForNotifcation", null, commandType: CommandType.StoredProcedure).ToList(); return approvals; } public void UpdateApprovalNotifyDate(int approvalId) { - IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); var parameters = new DynamicParameters(); parameters.Add("@ApprovalId", approvalId); db.Query("UpdateApprovalLastNotifyDate", param: parameters, commandType: CommandType.StoredProcedure).Single(); diff --git a/Fab2ApprovalSystem/DMO/PartsRequestDMO.cs b/Fab2ApprovalSystem/DMO/PartsRequestDMO.cs index 4917b2f..c778aad 100644 --- a/Fab2ApprovalSystem/DMO/PartsRequestDMO.cs +++ b/Fab2ApprovalSystem/DMO/PartsRequestDMO.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -14,7 +14,7 @@ namespace Fab2ApprovalSystem.DMO { public class PartsRequestDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); WorkflowDMO wfDMO = new WorkflowDMO(); @@ -126,4 +126,4 @@ namespace Fab2ApprovalSystem.DMO } } -} \ No newline at end of file +} diff --git a/Fab2ApprovalSystem/DMO/TrainingDMO.cs b/Fab2ApprovalSystem/DMO/TrainingDMO.cs index 382694a..7cfa18e 100644 --- a/Fab2ApprovalSystem/DMO/TrainingDMO.cs +++ b/Fab2ApprovalSystem/DMO/TrainingDMO.cs @@ -8,12 +8,13 @@ using System.Web; using Dapper; using Fab2ApprovalSystem.Models; using System.Text; +using Fab2ApprovalSystem.Misc; namespace Fab2ApprovalSystem.DMO { public class TrainingDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); private static FabApprovalTrainingEntities FabApprovalDB = new FabApprovalTrainingEntities(); public int Create(int issueId) diff --git a/Fab2ApprovalSystem/DMO/UserAccountDMO.cs b/Fab2ApprovalSystem/DMO/UserAccountDMO.cs index ffbb6c9..b8db94f 100644 --- a/Fab2ApprovalSystem/DMO/UserAccountDMO.cs +++ b/Fab2ApprovalSystem/DMO/UserAccountDMO.cs @@ -8,13 +8,13 @@ using System.Web; using Dapper; using Fab2ApprovalSystem.Models; using System.Text; - +using Fab2ApprovalSystem.Misc; namespace Fab2ApprovalSystem.DMO { public class UserAccountDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); //public List GetUser(string loginID) diff --git a/Fab2ApprovalSystem/DMO/WorkflowDMO.cs b/Fab2ApprovalSystem/DMO/WorkflowDMO.cs index 0568677..9b8cb18 100644 --- a/Fab2ApprovalSystem/DMO/WorkflowDMO.cs +++ b/Fab2ApprovalSystem/DMO/WorkflowDMO.cs @@ -18,7 +18,7 @@ namespace Fab2ApprovalSystem.DMO { public class WorkflowDMO { - private IDbConnection db = new SqlConnection(ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString); + private IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING); //delegate TResult MathFunction(T1 var1, T2 var2); diff --git a/Fab2ApprovalSystem/Global.asax.cs b/Fab2ApprovalSystem/Global.asax.cs index 25372aa..f307255 100644 --- a/Fab2ApprovalSystem/Global.asax.cs +++ b/Fab2ApprovalSystem/Global.asax.cs @@ -25,14 +25,12 @@ namespace Fab2ApprovalSystem RouteConfig.RegisterRoutes(RouteTable.Routes); BundleConfig.RegisterBundles(BundleTable.Bundles); - //string DevAttachmentUrl = ConfigurationManager.AppSettings["DevAttachmentURl"].ToString(); - //string ProdAttachmentUrl = ConfigurationManager.AppSettings["ProdAttachmentURL"].ToString(); - string connectionstring = ConfigurationManager.ConnectionStrings["FabApprovalConnection"].ConnectionString.ToString(); + string hostName = System.Net.Dns.GetHostEntry("").HostName; + GlobalVars.IS_INFINEON_DOMAIN = hostName.ToLower().Contains("infineon"); - GlobalVars.hostURL = HttpRuntime.AppDomainAppVirtualPath; - - string DevWebSiteUrl = ConfigurationManager.AppSettings["DevWebSiteURL"].ToString(); - string ProdWebSiteUrl = ConfigurationManager.AppSettings["ProdWebSiteURL"].ToString(); + string DevWebSiteUrl = ConfigurationManager.AppSettings["DevWebSiteURL"].ToString(); + string ProdWebSiteUrlEC = ConfigurationManager.AppSettings["ProdWebSiteURLEC"].ToString(); + string ProdWebSiteUrlStealth = ConfigurationManager.AppSettings["ProdWebSiteURLStealth"].ToString(); GlobalVars.SENDER_EMAIL = "FabApprovalSystem@Infineon.com"; // put in the Config File if (ConfigurationManager.AppSettings["Notification Sender"] != null) @@ -41,15 +39,24 @@ namespace Fab2ApprovalSystem GlobalVars.NDriveURL = ConfigurationManager.AppSettings["NDrive"].ToString(); GlobalVars.WSR_URL = ConfigurationManager.AppSettings["WSR_URL"].ToString(); GlobalVars.CA_BlankFormsLocation = ConfigurationManager.AppSettings["CA_BlankFormsLocation"].ToString(); - GlobalVars.DBConnection = connectionstring.ToUpper().Contains("TEST") ? "TEST" : connectionstring.ToUpper().Contains("QUALITY") ? "QUALITY" : "PROD"; //GlobalVars.AttachmentUrl = connectionstring.ToUpper().Contains("TEST") ? @"http://" + DevAttachmentUrl + "/" : @"http://" + ProdAttachmentUrl + "/"; ; - GlobalVars.hostURL = connectionstring.ToUpper().Contains("TEST") ? @"https://" + DevWebSiteUrl : @"https://" + ProdWebSiteUrl ; - #if (!DEBUG) OOOTrainingReportJobSchedule.Start(); + + if (GlobalVars.IS_INFINEON_DOMAIN) { + GlobalVars.DB_CONNECTION_STRING = ConfigurationManager.ConnectionStrings["FabApprovalConnectionStealth"].ConnectionString.ToString(); + GlobalVars.hostURL = @"https://" + ProdWebSiteUrlStealth; + } else { + GlobalVars.DB_CONNECTION_STRING = ConfigurationManager.ConnectionStrings["FabApprovalConnectionEC"].ConnectionString.ToString(); + GlobalVars.hostURL = @"https://" + ProdWebSiteUrlEC; + } +#else + GlobalVars.DB_CONNECTION_STRING = ConfigurationManager.ConnectionStrings["FabApprovalConnectionDev"].ConnectionString.ToString(); + GlobalVars.hostURL = @"https://" + DevWebSiteUrl; #endif + GlobalVars.DBConnection = GlobalVars.DB_CONNECTION_STRING.ToUpper().Contains("TEST") ? "TEST" : GlobalVars.DB_CONNECTION_STRING.ToUpper().Contains("QUALITY") ? "QUALITY" : "PROD"; } diff --git a/Fab2ApprovalSystem/Misc/Functions.cs b/Fab2ApprovalSystem/Misc/Functions.cs index 3d8fa4b..cfb490f 100644 --- a/Fab2ApprovalSystem/Misc/Functions.cs +++ b/Fab2ApprovalSystem/Misc/Functions.cs @@ -131,145 +131,6 @@ namespace Fab2ApprovalSystem.Misc } - /// - /// - /// - /// - /// - public static bool CheckITARAccess(string userID) - { - MembershipProvider domainProvider = Membership.Providers["ADMembershipProvider"]; - MembershipUser mu = domainProvider.GetUser(userID, false); - if (mu == null) - return false; - else - return true; - - } - - /// - /// - /// - /// - /// - public static bool NA_HasITARAccess(string userID, string pwd) - { - string ECDomain = ConfigurationManager.AppSettings["ECDomain"]; - string ECADGroup = ConfigurationManager.AppSettings["ECADGroup"]; - string naContainer = ConfigurationManager.AppSettings["NAContainer"]; - string naDomain = ConfigurationManager.AppSettings["NADomain"]; - - - //WriteEvent("NA - Before PrincipalContext for EC for " + userID, System.Diagnostics.EventLogEntryType.Information); - PrincipalContext contextGroup = new PrincipalContext(ContextType.Domain, ECDomain); - //WriteEvent("NA - After PrincipalContext for EC for " + userID, System.Diagnostics.EventLogEntryType.Information); - - //WriteEvent("NA - Before PrincipalContext for NA for " + userID, System.Diagnostics.EventLogEntryType.Information); - PrincipalContext contextUser = new PrincipalContext(ContextType.Domain, - naDomain, - naContainer, - ContextOptions.Negotiate, userID, pwd); - //WriteEvent("NA - After PrincipalContext for NA for " + userID, System.Diagnostics.EventLogEntryType.Information); - - //WriteEvent("NA - Before check user in EC group for " + userID, System.Diagnostics.EventLogEntryType.Information); - GroupPrincipal gp = GroupPrincipal.FindByIdentity(contextGroup, ECADGroup); - //WriteEvent("NA - After check user in EC group for " + userID, System.Diagnostics.EventLogEntryType.Information); - - //WriteEvent("NA - Before check user in NA group for " + userID, System.Diagnostics.EventLogEntryType.Information); - UserPrincipal up = UserPrincipal.FindByIdentity(contextUser, userID); - //WriteEvent("NA - After check user in NA group for " + userID, System.Diagnostics.EventLogEntryType.Information); - - if (null == up) - { - //WriteEvent("NA - User not in NA for " + userID, System.Diagnostics.EventLogEntryType.Information); - return false; - } - else - { - //WriteEvent("NA - Member of EC group is " + up.IsMemberOf(gp).ToString() + " for " + userID, System.Diagnostics.EventLogEntryType.Information); - return up.IsMemberOf(gp); - } - } - //public static bool NA_GetUsers() - //{ - // //string ECDomain = ConfigurationManager.AppSettings["ECDomain"]; - // //string ECADGroup = ConfigurationManager.AppSettings["ECADGroup"]; - // string naContainer = ConfigurationManager.AppSettings["NAContainer"]; - // string naDomain = ConfigurationManager.AppSettings["NADomain"]; - - - // //WriteEvent("NA - Before PrincipalContext for EC for " + userID, System.Diagnostics.EventLogEntryType.Information); - // //PrincipalContext contextGroup = new PrincipalContext(ContextType.Domain, ECDomain); - // //WriteEvent("NA - After PrincipalContext for EC for " + userID, System.Diagnostics.EventLogEntryType.Information); - - // //WriteEvent("NA - Before PrincipalContext for NA for " + userID, System.Diagnostics.EventLogEntryType.Information); - // PrincipalContext contextUser = new PrincipalContext(ContextType.Domain, - // naDomain, - // naContainer, - // ContextOptions.Negotiate, userID, pwd); - // //WriteEvent("NA - After PrincipalContext for NA for " + userID, System.Diagnostics.EventLogEntryType.Information); - - // //WriteEvent("NA - Before check user in EC group for " + userID, System.Diagnostics.EventLogEntryType.Information); - // GroupPrincipal gp = GroupPrincipal.FindByIdentity(contextGroup, ECADGroup); - // //WriteEvent("NA - After check user in EC group for " + userID, System.Diagnostics.EventLogEntryType.Information); - - // //WriteEvent("NA - Before check user in NA group for " + userID, System.Diagnostics.EventLogEntryType.Information); - // UserPrincipal up = UserPrincipal.FindByIdentity(contextUser, userID); - // //WriteEvent("NA - After check user in NA group for " + userID, System.Diagnostics.EventLogEntryType.Information); - - // if (null == up) - // { - // //WriteEvent("NA - User not in NA for " + userID, System.Diagnostics.EventLogEntryType.Information); - // return false; - // } - // else - // { - // //WriteEvent("NA - Member of EC group is " + up.IsMemberOf(gp).ToString() + " for " + userID, System.Diagnostics.EventLogEntryType.Information); - // return up.IsMemberOf(gp); - // } - //} - - public static bool IFX_HasITARAccess(string userID, string pwd) - { - string ECDomain = ConfigurationManager.AppSettings["ECDomain"]; - string ECADGroup = ConfigurationManager.AppSettings["ECADGroup"]; - - - string ifxcontainer = ConfigurationManager.AppSettings["IFXContainer"]; - string ifxdomain = ConfigurationManager.AppSettings["IFXDomain"]; - - //WriteEvent("IFX - Before PrincipalContext for EC for user " + userID, System.Diagnostics.EventLogEntryType.Information); - PrincipalContext contextGroup = new PrincipalContext(ContextType.Domain, ECDomain); - //WriteEvent("IFX - After PrincipalContext for EC for user " + userID, System.Diagnostics.EventLogEntryType.Information); - - //WriteEvent("IFX - Before PrincipalContext for IFX for user " + userID, System.Diagnostics.EventLogEntryType.Information); - PrincipalContext contextUser = new PrincipalContext(ContextType.Domain, - ifxdomain, - ifxcontainer, - ContextOptions.Negotiate, userID, pwd); - - //WriteEvent("IFX - After PrincipalContext for IFX for user " + userID, System.Diagnostics.EventLogEntryType.Information); - - //WriteEvent("IFX - Before check user in EC group for " + userID, System.Diagnostics.EventLogEntryType.Information); - GroupPrincipal gp = GroupPrincipal.FindByIdentity(contextGroup, ECADGroup); - //WriteEvent("IFX - After check user in EC group for " + userID, System.Diagnostics.EventLogEntryType.Information); - - //WriteEvent("IFX - Before check user in IFX for " + userID, System.Diagnostics.EventLogEntryType.Information); - UserPrincipal up = UserPrincipal.FindByIdentity(contextUser, userID); - //WriteEvent("IFX - After check user in IFX for " + userID, System.Diagnostics.EventLogEntryType.Information); - - if (null == up) - { - //WriteEvent("IFX - not a member of IFX for " + userID, System.Diagnostics.EventLogEntryType.Information); - return false; - } - else - { - //WriteEvent("IFX - Member of EC group is " + up.IsMemberOf(gp).ToString() + " for " + userID, System.Diagnostics.EventLogEntryType.Information); - return up.IsMemberOf(gp); - } - } - /// /// /// diff --git a/Fab2ApprovalSystem/Misc/GlobalVars.cs b/Fab2ApprovalSystem/Misc/GlobalVars.cs index 7c7c074..84b1cd1 100644 --- a/Fab2ApprovalSystem/Misc/GlobalVars.cs +++ b/Fab2ApprovalSystem/Misc/GlobalVars.cs @@ -20,8 +20,10 @@ namespace Fab2ApprovalSystem.Misc public const string CAN_CREATE_PARTS_REQUEST = "CanCreatePartsRequest"; public static bool USER_ISADMIN = false; + public static bool IS_INFINEON_DOMAIN = false; public static string hostURL = ""; public static string DBConnection = "TEST"; + public static string DB_CONNECTION_STRING = ""; public static string AttachmentUrl = ""; public static string NDriveURL = ""; diff --git a/Fab2ApprovalSystem/Models/FabApproval.Context.cs b/Fab2ApprovalSystem/Models/FabApproval.Context.cs index 456a77c..d662c03 100644 --- a/Fab2ApprovalSystem/Models/FabApproval.Context.cs +++ b/Fab2ApprovalSystem/Models/FabApproval.Context.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated from a template. // @@ -12,9 +12,16 @@ namespace Fab2ApprovalSystem.Models using System; using System.Data.Entity; using System.Data.Entity.Infrastructure; + using Fab2ApprovalSystem.Misc; public partial class FabApprovalSystemEntitiesAll : DbContext { +#if (DEBUG) + private static string ENTITY_NAME = "FabApprovalSystemEntitiesAllDev"; +#else + private static string ENTITY_NAME = GlobalVars.IS_INFINEON_DOMAIN ? "FabApprovalSystemEntitiesAllInfineon" : "FabApprovalSystemEntitiesAllEC"; +#endif + public FabApprovalSystemEntitiesAll() : base("name=FabApprovalSystemEntitiesAll") { diff --git a/Fab2ApprovalSystem/Models/TrainingDB.Context.cs b/Fab2ApprovalSystem/Models/TrainingDB.Context.cs index f9befe9..b7d955d 100644 --- a/Fab2ApprovalSystem/Models/TrainingDB.Context.cs +++ b/Fab2ApprovalSystem/Models/TrainingDB.Context.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated from a template. // @@ -12,11 +12,18 @@ namespace Fab2ApprovalSystem.Models using System; using System.Data.Entity; using System.Data.Entity.Infrastructure; + using Fab2ApprovalSystem.Misc; public partial class FabApprovalTrainingEntities : DbContext { +#if (DEBUG) + private static string ENTITY_NAME = "FabApprovalTrainingEntitiesDev"; +#else + private static string ENTITY_NAME = GlobalVars.IS_INFINEON_DOMAIN ? "FabApprovalTrainingEntitiesStealth" : "FabApprovalTrainingEntitiesEC"; +#endif + public FabApprovalTrainingEntities() - : base("name=FabApprovalTrainingEntities") + : base("name=" + ENTITY_NAME) { } diff --git a/Fab2ApprovalSystem/Web.config b/Fab2ApprovalSystem/Web.config index 8bcda4c..f0d05c7 100644 --- a/Fab2ApprovalSystem/Web.config +++ b/Fab2ApprovalSystem/Web.config @@ -15,8 +15,9 @@ providerName="System.Data.SqlClient" />--> - - + + + @@ -28,8 +29,12 @@ - - + + + + + + @@ -57,8 +62,9 @@ - - + + +