diff --git a/server/AyaNova/ControllerHelpers/Authorized.cs b/server/AyaNova/ControllerHelpers/Authorized.cs index d9397953..0471554d 100644 --- a/server/AyaNova/ControllerHelpers/Authorized.cs +++ b/server/AyaNova/ControllerHelpers/Authorized.cs @@ -13,7 +13,7 @@ namespace AyaNova.Api.ControllerHelpers { /// - /// User has any role limited or full + /// User has any role restricted or full /// /// /// @@ -25,7 +25,7 @@ namespace AyaNova.Api.ControllerHelpers } /// - /// User has any role limited or full + /// User has any role restricted or full /// /// /// diff --git a/server/AyaNova/Controllers/AuthController.cs b/server/AyaNova/Controllers/AuthController.cs index 0485c87e..6bcc8fc0 100644 --- a/server/AyaNova/Controllers/AuthController.cs +++ b/server/AyaNova/Controllers/AuthController.cs @@ -294,8 +294,8 @@ namespace AyaNova.Api.Controllers //If the server is ops only then this user needs to be ops or else they are not allowed in if (serverState.IsOpsOnly && - !u.Roles.HasFlag(Biz.AuthorizationRoles.OpsAdminFull) && - !u.Roles.HasFlag(Biz.AuthorizationRoles.OpsAdminLimited)) + !u.Roles.HasFlag(Biz.AuthorizationRoles.OpsAdmin) && + !u.Roles.HasFlag(Biz.AuthorizationRoles.OpsAdminRestricted)) { return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); } diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs index 81d74bfa..4685c16e 100644 --- a/server/AyaNova/Controllers/EnumListController.cs +++ b/server/AyaNova/Controllers/EnumListController.cs @@ -330,44 +330,44 @@ namespace AyaNova.Api.Controllers { // TranslationKeysToFetch.Add("AuthorizationRoleNoRole"); - TranslationKeysToFetch.Add("AuthorizationRoleBizAdminLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleBizAdminFull"); - TranslationKeysToFetch.Add("AuthorizationRoleDispatchLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleDispatchFull"); - TranslationKeysToFetch.Add("AuthorizationRoleInventoryLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleInventoryFull"); - TranslationKeysToFetch.Add("AuthorizationRoleAccountingFull"); - TranslationKeysToFetch.Add("AuthorizationRoleTechLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleTechFull"); - TranslationKeysToFetch.Add("AuthorizationRoleSubContractorLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleSubContractorFull"); - TranslationKeysToFetch.Add("AuthorizationRoleCustomerLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleCustomerFull"); - TranslationKeysToFetch.Add("AuthorizationRoleOpsAdminLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleOpsAdminFull"); - TranslationKeysToFetch.Add("AuthorizationRoleSalesLimited"); - TranslationKeysToFetch.Add("AuthorizationRoleSalesFull"); + TranslationKeysToFetch.Add("AuthorizationRoleBizAdminRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleBizAdmin"); + TranslationKeysToFetch.Add("AuthorizationRoleServiceRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleService"); + TranslationKeysToFetch.Add("AuthorizationRoleInventoryRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleInventory"); + TranslationKeysToFetch.Add("AuthorizationRoleAccounting"); + TranslationKeysToFetch.Add("AuthorizationRoleTechRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleTech"); + TranslationKeysToFetch.Add("AuthorizationRoleSubContractorRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleSubContractor"); + TranslationKeysToFetch.Add("AuthorizationRoleCustomerRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleCustomer"); + TranslationKeysToFetch.Add("AuthorizationRoleOpsAdminRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleOpsAdmin"); + TranslationKeysToFetch.Add("AuthorizationRoleSalesRestricted"); + TranslationKeysToFetch.Add("AuthorizationRoleSales"); // TranslationKeysToFetch.Add("AuthorizationRoleAll"); var LT = await TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, translationId); // ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleNoRole"], Id = (long)AuthorizationRoles.NoRole }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdminLimited"], Id = (long)AuthorizationRoles.BizAdminLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdminFull"], Id = (long)AuthorizationRoles.BizAdminFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleDispatchLimited"], Id = (long)AuthorizationRoles.DispatchLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleDispatchFull"], Id = (long)AuthorizationRoles.DispatchFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventoryLimited"], Id = (long)AuthorizationRoles.InventoryLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventoryFull"], Id = (long)AuthorizationRoles.InventoryFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleAccountingFull"], Id = (long)AuthorizationRoles.AccountingFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTechLimited"], Id = (long)AuthorizationRoles.TechLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTechFull"], Id = (long)AuthorizationRoles.TechFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractorLimited"], Id = (long)AuthorizationRoles.SubContractorLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractorFull"], Id = (long)AuthorizationRoles.SubContractorFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomerLimited"], Id = (long)AuthorizationRoles.CustomerLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomerFull"], Id = (long)AuthorizationRoles.CustomerFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdminLimited"], Id = (long)AuthorizationRoles.OpsAdminLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdminFull"], Id = (long)AuthorizationRoles.OpsAdminFull }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSalesLimited"], Id = (long)AuthorizationRoles.SalesLimited }); - ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSalesFull"], Id = (long)AuthorizationRoles.SalesFull }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdminRestricted"], Id = (long)AuthorizationRoles.BizAdminRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdmin"], Id = (long)AuthorizationRoles.BizAdmin }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleServiceRestricted"], Id = (long)AuthorizationRoles.ServiceRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleService"], Id = (long)AuthorizationRoles.Service }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventoryRestricted"], Id = (long)AuthorizationRoles.InventoryRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventory"], Id = (long)AuthorizationRoles.Inventory }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleAccounting"], Id = (long)AuthorizationRoles.Accounting }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTechRestricted"], Id = (long)AuthorizationRoles.TechRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTech"], Id = (long)AuthorizationRoles.Tech }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractorRestricted"], Id = (long)AuthorizationRoles.SubContractorRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractor"], Id = (long)AuthorizationRoles.SubContractor }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomerRestricted"], Id = (long)AuthorizationRoles.CustomerRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomer"], Id = (long)AuthorizationRoles.Customer }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdminRestricted"], Id = (long)AuthorizationRoles.OpsAdminRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdmin"], Id = (long)AuthorizationRoles.OpsAdmin }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSalesRestricted"], Id = (long)AuthorizationRoles.SalesRestricted }); + ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSales"], Id = (long)AuthorizationRoles.Sales }); // ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleAll"], Id = (long)AuthorizationRoles.All }); } diff --git a/server/AyaNova/DataList/EventDataList.cs b/server/AyaNova/DataList/EventDataList.cs index fa8f7d00..a4887186 100644 --- a/server/AyaNova/DataList/EventDataList.cs +++ b/server/AyaNova/DataList/EventDataList.cs @@ -6,7 +6,7 @@ namespace AyaNova.DataList { public EventDataList() { - //NOTE: used this type because it's full BizFull and read only BizLimited only which is appropriate and there is no event type + //NOTE: used this type because it's full BizFull and read only Bizrestricted only which is appropriate and there is no event type DefaultListAType = AyaType.Global; SQLFrom = "from aevent left join auser on (aevent.userid=auser.id)"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); diff --git a/server/AyaNova/DataList/ReviewDataList.cs b/server/AyaNova/DataList/ReviewDataList.cs index dfaa85e7..2b442abd 100644 --- a/server/AyaNova/DataList/ReviewDataList.cs +++ b/server/AyaNova/DataList/ReviewDataList.cs @@ -165,11 +165,11 @@ namespace AyaNova.DataList { List ret = new List(); bool HasSupervisorRole = - userRoles.HasFlag(AuthorizationRoles.BizAdminFull) - || userRoles.HasFlag(AuthorizationRoles.DispatchFull) - || userRoles.HasFlag(AuthorizationRoles.InventoryFull) - || userRoles.HasFlag(AuthorizationRoles.SalesFull) - || userRoles.HasFlag(AuthorizationRoles.AccountingFull); + userRoles.HasFlag(AuthorizationRoles.BizAdmin) + || userRoles.HasFlag(AuthorizationRoles.Service) + || userRoles.HasFlag(AuthorizationRoles.Inventory) + || userRoles.HasFlag(AuthorizationRoles.Sales) + || userRoles.HasFlag(AuthorizationRoles.Accounting); if (!HasSupervisorRole) { diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index 6825177c..d59de5b7 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -593,7 +593,7 @@ namespace AyaNova ServerGlobalOpsSettingsCache.Initialize(dbContext); //Ensure translations are present, not missing any keys and that there is a server default translation that exists - TranslationBiz lb = new TranslationBiz(dbContext, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.OpsAdminFull); + TranslationBiz lb = new TranslationBiz(dbContext, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.OpsAdmin); lb.ValidateTranslationsAsync().Wait(); diff --git a/server/AyaNova/biz/AuthorizationRoles.cs b/server/AyaNova/biz/AuthorizationRoles.cs index 5d3e5328..762c56e4 100644 --- a/server/AyaNova/biz/AuthorizationRoles.cs +++ b/server/AyaNova/biz/AuthorizationRoles.cs @@ -14,50 +14,50 @@ namespace AyaNova.Biz ///No role set NoRole = 0, - ///BizAdminLimited - BizAdminLimited = 1, - ///BizAdminFull - BizAdminFull = 2, - ///DispatchLimited - DispatchLimited = 4, - ///DispatchFull - DispatchFull = 8, - ///InventoryLimited - InventoryLimited = 16, - ///InventoryFull - InventoryFull = 32, - ///AccountingFull - AccountingFull = 64,//No limited role, not sure if there is a need - ///TechLimited - TechLimited = 128, - ///TechFull - TechFull = 256, - ///SubContractorLimited - SubContractorLimited = 512, //same as tech but restricted by further business rules (more fine grained) - ///SubContractorFull - SubContractorFull = 1024,//same as tech limited but restricted by further business rules (more fine grained) - ///ClientLimited - CustomerLimited = 2048, - ///ClientFull - CustomerFull = 4096, - ///OpsAdminLimited - OpsAdminLimited = 8192, - ///OpsAdminFull - OpsAdminFull = 16384, - ///SalesFull - SalesFull = 32768, - ///SalesLimited - SalesLimited = 65536, + ///BizAdminRestricted + BizAdminRestricted = 1, + ///BizAdmin + BizAdmin = 2, + ///ServiceRestricted + ServiceRestricted = 4, + ///Service + Service = 8, + ///InventoryRestricted + InventoryRestricted = 16, + ///Inventory + Inventory = 32, + ///Accounting + Accounting = 64,//No limited role, not sure if there is a need + ///TechRestricted + TechRestricted = 128, + ///Tech + Tech = 256, + ///SubContractorRestricted + SubContractorRestricted = 512, //same as tech but restricted by further business rules (more fine grained) + ///SubContractor + SubContractor = 1024,//same as tech limited but restricted by further business rules (more fine grained) + ///ClientRestricted + CustomerRestricted = 2048, + ///Client + Customer = 4096, + ///OpsAdminRestricted + OpsAdminRestricted = 8192, + ///OpsAdmin + OpsAdmin = 16384, + ///Sales + Sales = 32768, + ///SalesRestricted + SalesRestricted = 65536, ///Anyone of any role - All = BizAdminLimited | BizAdminFull | DispatchLimited | DispatchFull | InventoryLimited | - InventoryFull | AccountingFull | TechLimited | TechFull | SubContractorLimited | - SubContractorFull | CustomerLimited | CustomerFull | OpsAdminLimited | OpsAdminFull | SalesFull | SalesLimited, + All = BizAdminRestricted | BizAdmin | ServiceRestricted | Service | InventoryRestricted | + Inventory | Accounting | TechRestricted | Tech | SubContractorRestricted | + SubContractor | CustomerRestricted | Customer | OpsAdminRestricted | OpsAdmin | Sales | SalesRestricted, - AllInsideUserRoles = BizAdminLimited | BizAdminFull | DispatchLimited | DispatchFull | InventoryLimited | - InventoryFull | AccountingFull | TechLimited | TechFull | SubContractorLimited | - SubContractorFull | SalesFull | SalesLimited | OpsAdminLimited | OpsAdminFull + AllInsideUserRoles = BizAdminRestricted | BizAdmin | ServiceRestricted | Service | InventoryRestricted | + Inventory | Accounting | TechRestricted | Tech | SubContractorRestricted | + SubContractor | Sales | SalesRestricted | OpsAdminRestricted | OpsAdmin diff --git a/server/AyaNova/biz/BizRoles.cs b/server/AyaNova/biz/BizRoles.cs index 1bf5ffb8..2428ea1b 100644 --- a/server/AyaNova/biz/BizRoles.cs +++ b/server/AyaNova/biz/BizRoles.cs @@ -46,15 +46,15 @@ namespace AyaNova.Biz // (any change copy to customer notes, head office) roles.Add(AyaType.Customer, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull - | AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin + | AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -63,15 +63,15 @@ namespace AyaNova.Biz // (duplicate of customer above but required to be here to allow various code to not bomb) roles.Add(AyaType.CustomerNote, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull - | AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin + | AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -80,15 +80,15 @@ namespace AyaNova.Biz // roles.Add(AyaType.Contract, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull - | AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin + | AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -97,15 +97,15 @@ namespace AyaNova.Biz // roles.Add(AyaType.HeadOffice, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull - | AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin + | AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -114,15 +114,15 @@ namespace AyaNova.Biz // roles.Add(AyaType.LoanUnit, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull - | AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin + | AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -135,13 +135,13 @@ namespace AyaNova.Biz // roles.Add(AyaType.Part, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull - | AuthorizationRoles.BizAdminFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.InventoryLimited - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited, + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, Select = AuthorizationRoles.All }); @@ -150,13 +150,13 @@ namespace AyaNova.Biz // roles.Add(AyaType.PartInventory, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull - | AuthorizationRoles.BizAdminFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.InventoryLimited - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited, + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, Select = AuthorizationRoles.All }); @@ -168,13 +168,13 @@ namespace AyaNova.Biz // roles.Add(AyaType.PartWarehouse, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull - | AuthorizationRoles.BizAdminFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.InventoryLimited - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited, + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, Select = AuthorizationRoles.All }); @@ -183,13 +183,13 @@ namespace AyaNova.Biz // roles.Add(AyaType.PartAssembly, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull - | AuthorizationRoles.BizAdminFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.InventoryLimited - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited, + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, Select = AuthorizationRoles.All }); @@ -199,13 +199,13 @@ namespace AyaNova.Biz // roles.Add(AyaType.PurchaseOrder, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull - | AuthorizationRoles.BizAdminFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.InventoryLimited - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited, + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, Select = AuthorizationRoles.All }); @@ -215,13 +215,13 @@ namespace AyaNova.Biz // roles.Add(AyaType.PartInventoryRequest, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull - | AuthorizationRoles.BizAdminFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.InventoryLimited - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited, + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, Select = AuthorizationRoles.All }); @@ -231,13 +231,13 @@ namespace AyaNova.Biz // roles.Add(AyaType.PartInventoryRestock, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull - | AuthorizationRoles.BizAdminFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.InventoryLimited - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited, + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, Select = AuthorizationRoles.All }); @@ -247,15 +247,15 @@ namespace AyaNova.Biz // roles.Add(AyaType.PM, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull - | AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin + | AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -264,8 +264,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.PMItem, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -274,8 +274,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.PMTemplate, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -284,8 +284,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.PMTemplateItem, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -294,15 +294,15 @@ namespace AyaNova.Biz // roles.Add(AyaType.Project, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull - | AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin + | AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -312,14 +312,14 @@ namespace AyaNova.Biz // roles.Add(AyaType.ServiceRate, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -329,14 +329,14 @@ namespace AyaNova.Biz // roles.Add(AyaType.TravelRate, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -345,14 +345,14 @@ namespace AyaNova.Biz // roles.Add(AyaType.TaxCode, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.DispatchFull - | AuthorizationRoles.SalesFull - | AuthorizationRoles.TechFull - | AuthorizationRoles.BizAdminLimited - | AuthorizationRoles.DispatchLimited - | AuthorizationRoles.SalesLimited - | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.Sales + | AuthorizationRoles.Tech + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted + | AuthorizationRoles.SalesRestricted + | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -367,16 +367,16 @@ namespace AyaNova.Biz // //when deducting from the bank the role required is for the object that is being banked // //Subcontractors are deliberately excluded here // //on the fence about sales as it's conceivable that a salesman sells bank time and then enters it but - // //that's really in the realm of accounting, bizadmin or most obviously dispatch - // Change = AuthorizationRoles.BizAdminFull - // | AuthorizationRoles.DispatchFull - // | AuthorizationRoles.AccountingFull, - // ReadFullRecord = AuthorizationRoles.BizAdminLimited - // | AuthorizationRoles.DispatchLimited - // | AuthorizationRoles.SalesLimited - // | AuthorizationRoles.TechLimited - // | AuthorizationRoles.SalesFull - // | AuthorizationRoles.TechFull, + // //that's really in the realm of accounting, bizadmin or most obviously Service + // Change = AuthorizationRoles.BizAdm inFu ll + // | AuthorizationRoles.Servi ceFul l + // | AuthorizationRoles.Account ingFu ll, + // ReadFullRecord = AuthorizationRoles.Biz AdminLim ited + // | AuthorizationRoles.Se rviceLim ited + // | AuthorizationRoles.Sa lesLim ited + // | AuthorizationRoles.Te chLi mited + // | AuthorizationRoles.Sa lesF ull + // | AuthorizationRoles.Te chFu ll, // Select = AuthorizationRoles.All // }); @@ -385,8 +385,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.Quote, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -395,8 +395,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.QuoteItem, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -405,8 +405,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.QuoteTemplate, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -415,8 +415,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.QuoteTemplateItem, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -425,8 +425,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.Unit, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -435,8 +435,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.UnitModel, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -445,8 +445,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.Vendor, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull | AuthorizationRoles.InventoryFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting | AuthorizationRoles.Inventory, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -457,7 +457,7 @@ namespace AyaNova.Biz // roles.Add(AyaType.TaskGroup, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service, ReadFullRecord = AuthorizationRoles.All, Select = AuthorizationRoles.All }); @@ -469,7 +469,7 @@ namespace AyaNova.Biz // roles.Add(AyaType.WorkOrderStatus, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull,//powerful feature, only want people directly in charge of service to change these + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service,//powerful feature, only want people directly in charge of service to change these ReadFullRecord = AuthorizationRoles.All, Select = AuthorizationRoles.All//sub restricted by client and biz rules as status has it's own role settings so just keep it open for everyone to potentially access }); @@ -479,9 +479,9 @@ namespace AyaNova.Biz // roles.Add(AyaType.WorkOrderItemStatus, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited | AuthorizationRoles.CustomerLimited | AuthorizationRoles.CustomerFull, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted | AuthorizationRoles.CustomerRestricted | AuthorizationRoles.Customer, Select = AuthorizationRoles.All }); @@ -490,9 +490,9 @@ namespace AyaNova.Biz // roles.Add(AyaType.WorkOrderItemPriority, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited | AuthorizationRoles.CustomerLimited | AuthorizationRoles.CustomerFull, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted | AuthorizationRoles.CustomerRestricted | AuthorizationRoles.Customer, Select = AuthorizationRoles.All }); @@ -501,96 +501,96 @@ namespace AyaNova.Biz // roles.Add(AyaType.WorkOrder, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited | AuthorizationRoles.CustomerLimited | AuthorizationRoles.CustomerFull, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted | AuthorizationRoles.CustomerRestricted | AuthorizationRoles.Customer, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItem, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited | AuthorizationRoles.CustomerLimited | AuthorizationRoles.CustomerFull, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted | AuthorizationRoles.CustomerRestricted | AuthorizationRoles.Customer, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemExpense, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemLabor, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemLoan, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemPart, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemPartRequest, new BizRoleSet() { - Change = AuthorizationRoles.InventoryFull | AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.InventoryLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.Inventory | AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.InventoryRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemScheduledUser, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemTask, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemTravel, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemUnit, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); roles.Add(AyaType.WorkOrderItemOutsideService, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.TechFull | AuthorizationRoles.SubContractorFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | AuthorizationRoles.SubContractorLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Tech | AuthorizationRoles.SubContractor | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | AuthorizationRoles.SubContractorRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); //--- @@ -601,8 +601,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.WorkOrderTemplate, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -611,8 +611,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.WorkOrderTemplateItem, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.SalesFull | AuthorizationRoles.TechFull | AuthorizationRoles.AccountingFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.SalesLimited | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); @@ -624,8 +624,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.Global, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited + Change = AuthorizationRoles.BizAdmin, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted }); @@ -634,8 +634,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.GlobalOps, new BizRoleSet() { - Change = AuthorizationRoles.OpsAdminFull, - ReadFullRecord = AuthorizationRoles.OpsAdminLimited + Change = AuthorizationRoles.OpsAdmin, + ReadFullRecord = AuthorizationRoles.OpsAdminRestricted }); @@ -644,8 +644,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.User, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited, + Change = AuthorizationRoles.BizAdmin, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted, Select = AuthorizationRoles.All }); @@ -655,8 +655,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.UserOptions, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited + Change = AuthorizationRoles.BizAdmin, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted }); @@ -666,8 +666,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.Widget, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.InventoryFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.InventoryLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Inventory, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.InventoryRestricted, Select = AuthorizationRoles.All }); @@ -676,7 +676,7 @@ namespace AyaNova.Biz // roles.Add(AyaType.ServerState, new BizRoleSet() { - Change = AuthorizationRoles.OpsAdminFull, + Change = AuthorizationRoles.OpsAdmin, ReadFullRecord = AuthorizationRoles.All }); @@ -686,8 +686,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.License, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited + Change = AuthorizationRoles.BizAdmin, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted }); //////////////////////////////////////////////////////////// @@ -695,8 +695,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.TrialSeeder, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.OpsAdminFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.OpsAdminLimited + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.OpsAdmin, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.OpsAdminRestricted }); //////////////////////////////////////////////////////////// @@ -705,7 +705,7 @@ namespace AyaNova.Biz roles.Add(AyaType.LogFile, new BizRoleSet() { Change = AuthorizationRoles.NoRole, - ReadFullRecord = AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited + ReadFullRecord = AuthorizationRoles.OpsAdmin | AuthorizationRoles.OpsAdminRestricted }); @@ -715,8 +715,8 @@ namespace AyaNova.Biz //ops and biz admin can view Backup roles.Add(AyaType.Backup, new BizRoleSet() { - Change = AuthorizationRoles.OpsAdminFull, - ReadFullRecord = AuthorizationRoles.OpsAdminLimited | AuthorizationRoles.BizAdminFull | AuthorizationRoles.BizAdminLimited + Change = AuthorizationRoles.OpsAdmin, + ReadFullRecord = AuthorizationRoles.OpsAdminRestricted | AuthorizationRoles.BizAdmin | AuthorizationRoles.BizAdminRestricted }); @@ -728,8 +728,8 @@ namespace AyaNova.Biz // who are not allowed to see biz data roles.Add(AyaType.FileAttachment, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull,//Need full rights only here because this is the rights checked for batch delete etc so it's simpler than checking all the parent object rights if you know they already have all rights - ReadFullRecord = AuthorizationRoles.BizAdminFull | AuthorizationRoles.BizAdminLimited + Change = AuthorizationRoles.BizAdmin,//Need full rights only here because this is the rights checked for batch delete etc so it's simpler than checking all the parent object rights if you know they already have all rights + ReadFullRecord = AuthorizationRoles.BizAdmin | AuthorizationRoles.BizAdminRestricted }); @@ -739,8 +739,8 @@ namespace AyaNova.Biz //ops and biz admin can view operations roles.Add(AyaType.ServerJob, new BizRoleSet() { - Change = AuthorizationRoles.OpsAdminFull, - ReadFullRecord = AuthorizationRoles.OpsAdminLimited | AuthorizationRoles.BizAdminFull | AuthorizationRoles.BizAdminLimited + Change = AuthorizationRoles.OpsAdmin, + ReadFullRecord = AuthorizationRoles.OpsAdminRestricted | AuthorizationRoles.BizAdmin | AuthorizationRoles.BizAdminRestricted }); //////////////////////////////////////////////////////////// @@ -749,8 +749,8 @@ namespace AyaNova.Biz //ops and biz admin can view operations roles.Add(AyaType.OpsNotificationSettings, new BizRoleSet() { - Change = AuthorizationRoles.OpsAdminFull, - ReadFullRecord = AuthorizationRoles.OpsAdminLimited | AuthorizationRoles.BizAdminFull | AuthorizationRoles.BizAdminLimited + Change = AuthorizationRoles.OpsAdmin, + ReadFullRecord = AuthorizationRoles.OpsAdminRestricted | AuthorizationRoles.BizAdmin | AuthorizationRoles.BizAdminRestricted }); @@ -759,8 +759,8 @@ namespace AyaNova.Biz // roles.Add(AyaType.ServerMetrics, new BizRoleSet() { - Change = AuthorizationRoles.OpsAdminFull,//this is to turn on extra metrics (profiler) - ReadFullRecord = AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited + Change = AuthorizationRoles.OpsAdmin,//this is to turn on extra metrics (profiler) + ReadFullRecord = AuthorizationRoles.OpsAdmin | AuthorizationRoles.OpsAdminRestricted }); @@ -769,10 +769,10 @@ namespace AyaNova.Biz // roles.Add(AyaType.Translation, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, + Change = AuthorizationRoles.BizAdmin, //Anyone can read it because they need to to open a form, but also in UI - //only the bizadminlimited actually gets a link to see the customization page - ReadFullRecord = AuthorizationRoles.BizAdminLimited, + //only the BizAdminRestricted actually gets a link to see the customization page + ReadFullRecord = AuthorizationRoles.BizAdminRestricted, Select = AuthorizationRoles.All }); @@ -782,7 +782,7 @@ namespace AyaNova.Biz // roles.Add(AyaType.DataListSavedFilter, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, + Change = AuthorizationRoles.BizAdmin, ReadFullRecord = AuthorizationRoles.All }); @@ -794,9 +794,9 @@ namespace AyaNova.Biz roles.Add(AyaType.FormCustom, new BizRoleSet() { //Only BizAdminFull can modify forms - Change = AuthorizationRoles.BizAdminFull, + Change = AuthorizationRoles.BizAdmin, //Anyone can read it because they need to to open a form, but also in UI - //only the bizadminlimited actually gets a link to see the customization page + //only the BizAdminRestricted actually gets a link to see the customization page ReadFullRecord = AuthorizationRoles.All }); @@ -805,7 +805,7 @@ namespace AyaNova.Biz // roles.Add(AyaType.PickListTemplate, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, + Change = AuthorizationRoles.BizAdmin, ReadFullRecord = AuthorizationRoles.All }); @@ -814,11 +814,11 @@ namespace AyaNova.Biz // todo: deprecate? Not used for anything as of nov 2020 roles.Add(AyaType.BizMetrics, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull, - ReadFullRecord = AuthorizationRoles.BizAdminLimited | - AuthorizationRoles.SalesFull | - AuthorizationRoles.SalesLimited | - AuthorizationRoles.AccountingFull + Change = AuthorizationRoles.BizAdmin, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | + AuthorizationRoles.Sales | + AuthorizationRoles.SalesRestricted | + AuthorizationRoles.Accounting }); //////////////////////////////////////////////////////////// @@ -844,7 +844,7 @@ namespace AyaNova.Biz // roles.Add(AyaType.Report, new BizRoleSet() { - Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.BizAdminLimited, + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.BizAdminRestricted, ReadFullRecord = AuthorizationRoles.All, Select = AuthorizationRoles.All }); @@ -854,9 +854,9 @@ namespace AyaNova.Biz // roles.Add(AyaType.CustomerServiceRequest, new BizRoleSet() { - Change = AuthorizationRoles.CustomerFull | AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull, - ReadFullRecord = AuthorizationRoles.CustomerLimited | AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | - AuthorizationRoles.TechFull | AuthorizationRoles.TechLimited, + Change = AuthorizationRoles.Customer | AuthorizationRoles.BizAdmin | AuthorizationRoles.Service, + ReadFullRecord = AuthorizationRoles.CustomerRestricted | AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | + AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted, Select = AuthorizationRoles.All }); diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs index acf25710..ee262bcd 100644 --- a/server/AyaNova/biz/ContractBiz.cs +++ b/server/AyaNova/biz/ContractBiz.cs @@ -86,7 +86,7 @@ MULTIPLE discount / markup ITEMS if (httpContext != null) return new ContractBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new ContractBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new ContractBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs index bdac5a35..4bf0b052 100644 --- a/server/AyaNova/biz/CustomerBiz.cs +++ b/server/AyaNova/biz/CustomerBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new CustomerBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new CustomerBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new CustomerBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/CustomerNoteBiz.cs b/server/AyaNova/biz/CustomerNoteBiz.cs index 52b73be9..f3147d1d 100644 --- a/server/AyaNova/biz/CustomerNoteBiz.cs +++ b/server/AyaNova/biz/CustomerNoteBiz.cs @@ -27,7 +27,7 @@ namespace AyaNova.Biz if (httpContext != null) return new CustomerNoteBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new CustomerNoteBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new CustomerNoteBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/CustomerServiceRequestBiz.cs b/server/AyaNova/biz/CustomerServiceRequestBiz.cs index 13d0eeba..b0bff845 100644 --- a/server/AyaNova/biz/CustomerServiceRequestBiz.cs +++ b/server/AyaNova/biz/CustomerServiceRequestBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new CustomerServiceRequestBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new CustomerServiceRequestBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new CustomerServiceRequestBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/DashboardViewBiz.cs b/server/AyaNova/biz/DashboardViewBiz.cs index e3df2997..000763f6 100644 --- a/server/AyaNova/biz/DashboardViewBiz.cs +++ b/server/AyaNova/biz/DashboardViewBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new DashboardViewBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new DashboardViewBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new DashboardViewBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/DataListColumnViewBiz.cs b/server/AyaNova/biz/DataListColumnViewBiz.cs index e4d8ca9a..fdc697df 100644 --- a/server/AyaNova/biz/DataListColumnViewBiz.cs +++ b/server/AyaNova/biz/DataListColumnViewBiz.cs @@ -29,7 +29,7 @@ namespace AyaNova.Biz if (httpContext != null) return new DataListColumnViewBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new DataListColumnViewBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new DataListColumnViewBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/DataListSavedFilterBiz.cs b/server/AyaNova/biz/DataListSavedFilterBiz.cs index 2899cdf6..e3254860 100644 --- a/server/AyaNova/biz/DataListSavedFilterBiz.cs +++ b/server/AyaNova/biz/DataListSavedFilterBiz.cs @@ -30,7 +30,7 @@ namespace AyaNova.Biz if (httpContext != null) return new DataListSavedFilterBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new DataListSavedFilterBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new DataListSavedFilterBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/FormCustomBiz.cs b/server/AyaNova/biz/FormCustomBiz.cs index 7570d7fb..e64590a9 100644 --- a/server/AyaNova/biz/FormCustomBiz.cs +++ b/server/AyaNova/biz/FormCustomBiz.cs @@ -29,7 +29,7 @@ namespace AyaNova.Biz if (httpContext != null) return new FormCustomBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else//when called internally for internal ops there will be no context so need to set default values for that - return new FormCustomBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new FormCustomBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/GlobalBizSettingsBiz.cs b/server/AyaNova/biz/GlobalBizSettingsBiz.cs index 2984ed4f..d8df839c 100644 --- a/server/AyaNova/biz/GlobalBizSettingsBiz.cs +++ b/server/AyaNova/biz/GlobalBizSettingsBiz.cs @@ -24,7 +24,7 @@ namespace AyaNova.Biz if (httpContext != null) return new GlobalBizSettingsBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new GlobalBizSettingsBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new GlobalBizSettingsBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs b/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs index f5438300..90b52200 100644 --- a/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs +++ b/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs @@ -25,7 +25,7 @@ namespace AyaNova.Biz if (httpContext != null) return new GlobalOpsBackupSettingsBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new GlobalOpsBackupSettingsBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new GlobalOpsBackupSettingsBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/GlobalOpsNotificationSettingsBiz.cs b/server/AyaNova/biz/GlobalOpsNotificationSettingsBiz.cs index de44f3b1..d4091d1b 100644 --- a/server/AyaNova/biz/GlobalOpsNotificationSettingsBiz.cs +++ b/server/AyaNova/biz/GlobalOpsNotificationSettingsBiz.cs @@ -25,7 +25,7 @@ namespace AyaNova.Biz if (httpContext != null) return new GlobalOpsNotificationSettingsBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new GlobalOpsNotificationSettingsBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new GlobalOpsNotificationSettingsBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs index 18c164aa..d2a48d17 100644 --- a/server/AyaNova/biz/HeadOfficeBiz.cs +++ b/server/AyaNova/biz/HeadOfficeBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new HeadOfficeBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new HeadOfficeBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new HeadOfficeBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/LoanUnitBiz.cs b/server/AyaNova/biz/LoanUnitBiz.cs index 6bd0247f..f3b99ef4 100644 --- a/server/AyaNova/biz/LoanUnitBiz.cs +++ b/server/AyaNova/biz/LoanUnitBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new LoanUnitBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new LoanUnitBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new LoanUnitBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/MemoBiz.cs b/server/AyaNova/biz/MemoBiz.cs index b6b17187..be96f689 100644 --- a/server/AyaNova/biz/MemoBiz.cs +++ b/server/AyaNova/biz/MemoBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new MemoBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new MemoBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new MemoBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/NotifySubscriptionBiz.cs b/server/AyaNova/biz/NotifySubscriptionBiz.cs index 0cc9caa5..1c11286f 100644 --- a/server/AyaNova/biz/NotifySubscriptionBiz.cs +++ b/server/AyaNova/biz/NotifySubscriptionBiz.cs @@ -22,7 +22,7 @@ namespace AyaNova.Biz if (httpContext != null) return new NotifySubscriptionBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new NotifySubscriptionBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new NotifySubscriptionBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index fdfcb210..76fc62c8 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -11,7 +11,7 @@ namespace AyaNova.Biz internal class PMBiz : BizObject, ISearchAbleObject { //Feature specific roles - internal static AuthorizationRoles RolesAllowedToChangeSerial = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.AccountingFull; + internal static AuthorizationRoles RolesAllowedToChangeSerial = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Accounting; internal PMBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles) { @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PMBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else//when called internally for internal ops there will be no context so need to set default values for that - return new PMBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PMBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/PMTemplateBiz.cs b/server/AyaNova/biz/PMTemplateBiz.cs index 51529393..45ff6334 100644 --- a/server/AyaNova/biz/PMTemplateBiz.cs +++ b/server/AyaNova/biz/PMTemplateBiz.cs @@ -23,7 +23,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PMTemplateBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new PMTemplateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PMTemplateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/PartAssemblyBiz.cs b/server/AyaNova/biz/PartAssemblyBiz.cs index 3d62f00f..13ff4887 100644 --- a/server/AyaNova/biz/PartAssemblyBiz.cs +++ b/server/AyaNova/biz/PartAssemblyBiz.cs @@ -29,7 +29,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PartAssemblyBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new PartAssemblyBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PartAssemblyBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/PartBiz.cs b/server/AyaNova/biz/PartBiz.cs index 2acef4e3..b48b1fc1 100644 --- a/server/AyaNova/biz/PartBiz.cs +++ b/server/AyaNova/biz/PartBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PartBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new PartBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PartBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/PartInventoryBiz.cs b/server/AyaNova/biz/PartInventoryBiz.cs index 3a92b04d..a22029e4 100644 --- a/server/AyaNova/biz/PartInventoryBiz.cs +++ b/server/AyaNova/biz/PartInventoryBiz.cs @@ -26,7 +26,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PartInventoryBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new PartInventoryBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PartInventoryBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/PartWarehouseBiz.cs b/server/AyaNova/biz/PartWarehouseBiz.cs index e198c699..1a29898a 100644 --- a/server/AyaNova/biz/PartWarehouseBiz.cs +++ b/server/AyaNova/biz/PartWarehouseBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PartWarehouseBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new PartWarehouseBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PartWarehouseBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/PickListBiz.cs b/server/AyaNova/biz/PickListBiz.cs index 6c7406c1..55e3c4db 100644 --- a/server/AyaNova/biz/PickListBiz.cs +++ b/server/AyaNova/biz/PickListBiz.cs @@ -30,7 +30,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PickListBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new PickListBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PickListBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/PrimeData.cs b/server/AyaNova/biz/PrimeData.cs index f56bfd57..435ed7e5 100644 --- a/server/AyaNova/biz/PrimeData.cs +++ b/server/AyaNova/biz/PrimeData.cs @@ -25,7 +25,7 @@ namespace AyaNova.Biz u.Salt = Hasher.GenerateSalt(); u.Login = "superuser"; u.Password = Hasher.hash(u.Salt, "l3tm3in"); - u.Roles = AuthorizationRoles.All;//AuthorizationRoles.BizAdminFull | AuthorizationRoles.OpsAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.InventoryFull; + u.Roles = AuthorizationRoles.All;//AuthorizationRoles.BizAdminFull | AuthorizationRoles.OpsAdminFull | AuthorizationRoles.ServiceFull | AuthorizationRoles.InventoryFull; u.UserType = UserType.NotService; diff --git a/server/AyaNova/biz/ProjectBiz.cs b/server/AyaNova/biz/ProjectBiz.cs index 00dec913..869ef56e 100644 --- a/server/AyaNova/biz/ProjectBiz.cs +++ b/server/AyaNova/biz/ProjectBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new ProjectBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new ProjectBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new ProjectBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index 853156e4..f00b1250 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new PurchaseOrderBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new PurchaseOrderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new PurchaseOrderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs index cfd92b29..de9af252 100644 --- a/server/AyaNova/biz/QuoteBiz.cs +++ b/server/AyaNova/biz/QuoteBiz.cs @@ -11,7 +11,7 @@ namespace AyaNova.Biz internal class QuoteBiz : BizObject, ISearchAbleObject { //Feature specific roles - internal static AuthorizationRoles RolesAllowedToChangeSerial = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.AccountingFull; + internal static AuthorizationRoles RolesAllowedToChangeSerial = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Accounting; internal QuoteBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles) { @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new QuoteBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else//when called internally for internal ops there will be no context so need to set default values for that - return new QuoteBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new QuoteBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/QuoteTemplateBiz.cs b/server/AyaNova/biz/QuoteTemplateBiz.cs index b3a6b9ca..9b21c3cb 100644 --- a/server/AyaNova/biz/QuoteTemplateBiz.cs +++ b/server/AyaNova/biz/QuoteTemplateBiz.cs @@ -26,7 +26,7 @@ namespace AyaNova.Biz if (httpContext != null) return new QuoteTemplateBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else//when called internally for internal ops there will be no context so need to set default values for that - return new QuoteTemplateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new QuoteTemplateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/ReminderBiz.cs b/server/AyaNova/biz/ReminderBiz.cs index bd944a5c..ba66bbff 100644 --- a/server/AyaNova/biz/ReminderBiz.cs +++ b/server/AyaNova/biz/ReminderBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new ReminderBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new ReminderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new ReminderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index c633816a..fb1ac3db 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -30,7 +30,7 @@ namespace AyaNova.Biz if (httpContext != null) return new ReportBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new ReportBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new ReportBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/ReviewBiz.cs b/server/AyaNova/biz/ReviewBiz.cs index e2fbe711..b4ca2c53 100644 --- a/server/AyaNova/biz/ReviewBiz.cs +++ b/server/AyaNova/biz/ReviewBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new ReviewBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new ReviewBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new ReviewBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -227,20 +227,20 @@ namespace AyaNova.Biz private async Task ValidateAsync(Review proposedObj, Review currentObj) { /* - - RULE Roles: BizAdminFull, DispatchFull, InventoryFull, Accounting, SalesFull can create and assign to anyone else. + - RULE Roles: BizAdminFull, ServiceFull, InventoryFull, Accounting, SalesFull can create and assign to anyone else. - RULE Any other inside role can create for themselves only. (outside roles have no rights to this object so no need to check) - - RULE Limited roles can only set completed date and enter completion notes not otherwise change or create or delete. - - BIZ RULE users with more than limited roles can assign other users + - RULE Restricted roles can only set completed date and enter completion notes not otherwise change or create or delete. + - BIZ RULE users with more than restricted roles can assign other users */ bool isNew = currentObj == null; bool SelfAssigned = proposedObj.AssignedByUserId == UserId && proposedObj.UserId == UserId; bool HasSupervisorRole = - CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdminFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.DispatchFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.InventoryFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.SalesFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.AccountingFull); + CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdmin) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Service) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Inventory) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Sales) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Accounting); //Checks for non supervisors if (!HasSupervisorRole) @@ -313,11 +313,11 @@ namespace AyaNova.Biz { bool SelfAssigned = inObj.AssignedByUserId == UserId && inObj.UserId == UserId; bool HasSupervisorRole = - CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdminFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.DispatchFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.InventoryFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.SalesFull) || - CurrentUserRoles.HasFlag(AuthorizationRoles.AccountingFull); + CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdmin) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Service) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Inventory) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Sales) || + CurrentUserRoles.HasFlag(AuthorizationRoles.Accounting); if (!SelfAssigned && !HasSupervisorRole) AddError(ApiErrorCode.NOT_AUTHORIZED); } diff --git a/server/AyaNova/biz/ServiceRateBiz.cs b/server/AyaNova/biz/ServiceRateBiz.cs index f0220121..4917a443 100644 --- a/server/AyaNova/biz/ServiceRateBiz.cs +++ b/server/AyaNova/biz/ServiceRateBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new ServiceRateBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new ServiceRateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new ServiceRateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/TagBiz.cs b/server/AyaNova/biz/TagBiz.cs index 2c85cd45..1dc8c637 100644 --- a/server/AyaNova/biz/TagBiz.cs +++ b/server/AyaNova/biz/TagBiz.cs @@ -27,7 +27,7 @@ namespace AyaNova.Biz if (httpContext != null) return new TagBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new TagBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new TagBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/TaskGroupBiz.cs b/server/AyaNova/biz/TaskGroupBiz.cs index 10512d58..7984e993 100644 --- a/server/AyaNova/biz/TaskGroupBiz.cs +++ b/server/AyaNova/biz/TaskGroupBiz.cs @@ -31,7 +31,7 @@ namespace AyaNova.Biz if (httpContext != null) return new TaskGroupBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new TaskGroupBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new TaskGroupBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/TaxCodeBiz.cs b/server/AyaNova/biz/TaxCodeBiz.cs index eedeb6a0..bbe16114 100644 --- a/server/AyaNova/biz/TaxCodeBiz.cs +++ b/server/AyaNova/biz/TaxCodeBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new TaxCodeBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new TaxCodeBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new TaxCodeBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/TranslationBiz.cs b/server/AyaNova/biz/TranslationBiz.cs index e66614a0..b041d9e2 100644 --- a/server/AyaNova/biz/TranslationBiz.cs +++ b/server/AyaNova/biz/TranslationBiz.cs @@ -29,7 +29,7 @@ namespace AyaNova.Biz if (httpContext != null) return new TranslationBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new TranslationBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new TranslationBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/TravelRateBiz.cs b/server/AyaNova/biz/TravelRateBiz.cs index 60715993..6f16d1ae 100644 --- a/server/AyaNova/biz/TravelRateBiz.cs +++ b/server/AyaNova/biz/TravelRateBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new TravelRateBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new TravelRateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new TravelRateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs index 492ac6a7..455348ff 100644 --- a/server/AyaNova/biz/UnitBiz.cs +++ b/server/AyaNova/biz/UnitBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new UnitBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new UnitBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new UnitBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/UnitModelBiz.cs b/server/AyaNova/biz/UnitModelBiz.cs index 5295ad10..7ca9b6e8 100644 --- a/server/AyaNova/biz/UnitModelBiz.cs +++ b/server/AyaNova/biz/UnitModelBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new UnitModelBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new UnitModelBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new UnitModelBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index fd70a905..89385369 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -216,7 +216,7 @@ namespace AyaNova.Biz if (httpContext != null) return new UserBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else//when called internally for internal ops there will be no context so need to set default values for that - return new UserBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new UserBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/VendorBiz.cs b/server/AyaNova/biz/VendorBiz.cs index 4f32fb81..110574f6 100644 --- a/server/AyaNova/biz/VendorBiz.cs +++ b/server/AyaNova/biz/VendorBiz.cs @@ -28,7 +28,7 @@ namespace AyaNova.Biz if (httpContext != null) return new VendorBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new VendorBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new VendorBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index c8875c5c..3a475c9c 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -31,7 +31,7 @@ namespace AyaNova.Biz if (httpContext != null) return new WidgetBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new WidgetBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new WidgetBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 3307f62c..0f2f835d 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -17,7 +17,7 @@ namespace AyaNova.Biz internal class WorkOrderBiz : BizObject, IJobObject, ISearchAbleObject, IReportAbleObject, IExportAbleObject { // //Feature specific roles - // internal static AuthorizationRoles RolesAllowedToChangeSerial = AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.AccountingFull; + // internal static AuthorizationRoles RolesAllowedToChangeSerial = AuthorizationRoles.BizAdminFull | AuthorizationRoles.ServiceFull | AuthorizationRoles.AccountingFull; internal WorkOrderBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles) { @@ -33,7 +33,7 @@ namespace AyaNova.Biz if (httpContext != null) return new WorkOrderBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new WorkOrderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new WorkOrderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs b/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs index 4730017f..3b334863 100644 --- a/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs +++ b/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs @@ -22,7 +22,7 @@ namespace AyaNova.Biz if (httpContext != null) return new WorkOrderItemPriorityBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new WorkOrderItemPriorityBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new WorkOrderItemPriorityBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs index d76510e8..7be891e4 100644 --- a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs +++ b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs @@ -22,7 +22,7 @@ namespace AyaNova.Biz if (httpContext != null) return new WorkOrderItemStatusBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new WorkOrderItemStatusBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new WorkOrderItemStatusBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/WorkOrderStatusBiz.cs b/server/AyaNova/biz/WorkOrderStatusBiz.cs index 12aa1b58..569ab5b8 100644 --- a/server/AyaNova/biz/WorkOrderStatusBiz.cs +++ b/server/AyaNova/biz/WorkOrderStatusBiz.cs @@ -22,7 +22,7 @@ namespace AyaNova.Biz if (httpContext != null) return new WorkOrderStatusBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new WorkOrderStatusBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new WorkOrderStatusBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/WorkorderTemplateBiz.cs b/server/AyaNova/biz/WorkorderTemplateBiz.cs index fa5685b9..277743ab 100644 --- a/server/AyaNova/biz/WorkorderTemplateBiz.cs +++ b/server/AyaNova/biz/WorkorderTemplateBiz.cs @@ -27,7 +27,7 @@ namespace AyaNova.Biz if (httpContext != null) return new WorkOrderTemplateBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else//when called internally for internal ops there will be no context so need to set default values for that - return new WorkOrderTemplateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); + return new WorkOrderTemplateBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 29d2f4bd..2c35b164 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1697,23 +1697,23 @@ "UserTypeServiceContractor": "Subunternehmer", "AuthorizationRoles": "Autorisierungsrollen", "AuthorizationRoleNoRole": "Keine Rolle", - "AuthorizationRoleBizAdminLimited": "Geschäftsverwaltung - beschränkt", - "AuthorizationRoleBizAdminFull": "Business administration - unbeschränkt", - "AuthorizationRoleDispatchLimited": "Versand - beschränkt", - "AuthorizationRoleDispatchFull": "Versand - unbeschränkt", - "AuthorizationRoleInventoryLimited": "Inventar - beschränkt", - "AuthorizationRoleInventoryFull": "Inventar - unbeschränkt", - "AuthorizationRoleAccountingFull": "Buchhaltung", - "AuthorizationRoleTechLimited": "Servicetechniker - beschränkt", - "AuthorizationRoleTechFull": "Servicetechniker - unbeschränkt", - "AuthorizationRoleSubContractorLimited": "Subunternehmer - beschränkt", - "AuthorizationRoleSubContractorFull": "Subunternehmer - unbeschränkt", - "AuthorizationRoleCustomerLimited": "Kundenbenutzer - beschränkt", - "AuthorizationRoleCustomerFull": "Kundenbenutzer - unbeschränkt", - "AuthorizationRoleOpsAdminLimited": "Systemvorgänge - beschränkt", - "AuthorizationRoleOpsAdminFull": "Systemvorgänge - unbeschränkt", - "AuthorizationRoleSalesLimited": "Verkaufsabteilung - beschränkt", - "AuthorizationRoleSalesFull": "Verkaufsabteilung - unbeschränkt", + "AuthorizationRoleBizAdminRestricted": "Betriebswirtschaftslehre - eingeschränkt", + "AuthorizationRoleBizAdmin": "Betriebswirtschaftslehre", + "AuthorizationRoleServiceRestricted": "Service - eingeschränkt", + "AuthorizationRoleService": "Service", + "AuthorizationRoleInventoryRestricted": "Inventar - eingeschränkt", + "AuthorizationRoleInventory": "Inventar", + "AuthorizationRoleAccounting": "Buchhaltung", + "AuthorizationRoleTechRestricted": "Servicetechniker - eingeschränkt", + "AuthorizationRoleTech": "Servicetechniker", + "AuthorizationRoleSubContractorRestricted": "Subunternehmer - eingeschränkt", + "AuthorizationRoleSubContractor": "Subunternehmer", + "AuthorizationRoleCustomerRestricted": "Kundenbenutzer - eingeschränkt", + "AuthorizationRoleCustomer": "Kundenbenutzer", + "AuthorizationRoleOpsAdminRestricted": "Systemvorgänge - eingeschränkt", + "AuthorizationRoleOpsAdmin": "Systemvorgänge", + "AuthorizationRoleSalesRestricted": "Verkaufsabteilung - eingeschränkt", + "AuthorizationRoleSales": "Verkaufsabteilung", "AuthorizationRoleAll": "Alle rollen", "Welcome": "Willkommen in AyaNova", "ThankYouForEvaluating": "Vielen Dank, dass Sie AyaNova ausprobiert haben. Verwenden Sie die folgenden Links, um AyaNova zu erkunden und festzustellen, ob es zu Ihrer Organisation passt.", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 2f116bf3..e0ee2cf9 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1697,23 +1697,23 @@ "UserTypeServiceContractor": "SubContractor user", "AuthorizationRoles": "Authorization roles", "AuthorizationRoleNoRole": "No role", - "AuthorizationRoleBizAdminLimited": "Business administration - limited", - "AuthorizationRoleBizAdminFull": "Business administration - full", - "AuthorizationRoleDispatchLimited": "Dispatch - limited", - "AuthorizationRoleDispatchFull": "Dispatch - full", - "AuthorizationRoleInventoryLimited": "Inventory - limited", - "AuthorizationRoleInventoryFull": "Inventory - full", - "AuthorizationRoleAccountingFull": "Accounting", - "AuthorizationRoleTechLimited": "Service technician - limited", - "AuthorizationRoleTechFull": "Service technician - full", - "AuthorizationRoleSubContractorLimited": "Subcontractor - limited", - "AuthorizationRoleSubContractorFull": "Subcontractor - full", - "AuthorizationRoleCustomerLimited": "Customer user - limited", - "AuthorizationRoleCustomerFull": "Customer user - full", - "AuthorizationRoleOpsAdminLimited": "System operations - limited", - "AuthorizationRoleOpsAdminFull": "System operations - full", - "AuthorizationRoleSalesLimited": "Sales - limited", - "AuthorizationRoleSalesFull": "Sales - full", + "AuthorizationRoleBizAdminRestricted": "Business administration - restricted", + "AuthorizationRoleBizAdmin": "Business administration", + "AuthorizationRoleServiceRestricted": "Service - restricted", + "AuthorizationRoleService": "Service", + "AuthorizationRoleInventoryRestricted": "Inventory - restricted", + "AuthorizationRoleInventory": "Inventory", + "AuthorizationRoleAccounting": "Accounting", + "AuthorizationRoleTechRestricted": "Service technician - restricted", + "AuthorizationRoleTech": "Service technician", + "AuthorizationRoleSubContractorRestricted": "Subcontractor - restricted", + "AuthorizationRoleSubContractor": "Subcontractor", + "AuthorizationRoleCustomerRestricted": "Customer user - restricted", + "AuthorizationRoleCustomer": "Customer user", + "AuthorizationRoleOpsAdminRestricted": "System operations - restricted", + "AuthorizationRoleOpsAdmin": "System operations", + "AuthorizationRoleSalesRestricted": "Sales - restricted", + "AuthorizationRoleSales": "Sales", "AuthorizationRoleAll": "All roles", "Welcome": "Welcome to AyaNova", "ThankYouForEvaluating": "Thank you for trying AyaNova. Please use the following links to help explore AyaNova and see if it is a good match for your organization.", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index cd72264a..d9101e98 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1697,23 +1697,23 @@ "UserTypeServiceContractor": "Subcontratista", "AuthorizationRoles": "Roles de autorización", "AuthorizationRoleNoRole": "Sin rol", - "AuthorizationRoleBizAdminLimited": "Administracion de empresas - limitada", - "AuthorizationRoleBizAdminFull": "Administración de empresas - completa", - "AuthorizationRoleDispatchLimited": "Despachador - limitada", - "AuthorizationRoleDispatchFull": "Despachador - completo", - "AuthorizationRoleInventoryLimited": "Inventario - limitada", - "AuthorizationRoleInventoryFull": "Inventario - completo", - "AuthorizationRoleAccountingFull": "Contabilidad", - "AuthorizationRoleTechLimited": "Técnico de servicio - limitada", - "AuthorizationRoleTechFull": "Técnico de servicio - completo", - "AuthorizationRoleSubContractorLimited": "Subcontratista - limitada", - "AuthorizationRoleSubContractorFull": "Subcontratista - completo", - "AuthorizationRoleCustomerLimited": "Usuario cliente - limitada", - "AuthorizationRoleCustomerFull": "Usuario cliente - completo", - "AuthorizationRoleOpsAdminLimited": "Operaciones del sistema - limitada", - "AuthorizationRoleOpsAdminFull": "Operaciones del sistema - completo", - "AuthorizationRoleSalesLimited": "Ventas - limitada", - "AuthorizationRoleSalesFull": "Ventas - completo", + "AuthorizationRoleBizAdminRestricted": "Administración de empresas - restringido", + "AuthorizationRoleBizAdmin": "Administración de empresas", + "AuthorizationRoleServiceRestricted": "Servicio - restringido", + "AuthorizationRoleService": "Servicio", + "AuthorizationRoleInventoryRestricted": "Inventario - restringido", + "AuthorizationRoleInventory": "Inventario", + "AuthorizationRoleAccounting": "Contabilidad", + "AuthorizationRoleTechRestricted": "Técnico de servicio - restringido", + "AuthorizationRoleTech": "Técnico de servicio", + "AuthorizationRoleSubContractorRestricted": "Subcontratista - restringido", + "AuthorizationRoleSubContractor": "Subcontratista", + "AuthorizationRoleCustomerRestricted": "Usuario cliente - restringido", + "AuthorizationRoleCustomer": "Usuario cliente", + "AuthorizationRoleOpsAdminRestricted": "Operaciones del sistema - restringidas", + "AuthorizationRoleOpsAdmin": "Operaciones del sistema", + "AuthorizationRoleSalesRestricted": "Ventas - restringidas", + "AuthorizationRoleSales": "Ventas", "AuthorizationRoleAll": "Todos los roles", "Welcome": "Bienvenido a AyaNova", "ThankYouForEvaluating": "Gracias por probar AyaNova. Utilice los siguientes enlaces para ayudar a explorar AyaNova y ver si es una buena opción para su organización.", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 2c586c38..f61731f2 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1697,23 +1697,23 @@ "UserTypeServiceContractor": "Sous-traitant", "AuthorizationRoles": "Rôles d'autorisation", "AuthorizationRoleNoRole": "Pas de rôle", - "AuthorizationRoleBizAdminLimited": "Administration des affaires - limitée", - "AuthorizationRoleBizAdminFull": "Administration des affaires - complète", - "AuthorizationRoleDispatchLimited": "Répartir - limitée", - "AuthorizationRoleDispatchFull": "Répartir - complète", - "AuthorizationRoleInventoryLimited": "Personnel d'inventaire - limité", - "AuthorizationRoleInventoryFull": "Personnel d'inventaire - complète", - "AuthorizationRoleAccountingFull": "Comptabilité", - "AuthorizationRoleTechLimited": "Technicien de service - limité", - "AuthorizationRoleTechFull": "Technicien de service - complète", - "AuthorizationRoleSubContractorLimited": "Sous-traitant - limité", - "AuthorizationRoleSubContractorFull": "Sous-traitant - complète", - "AuthorizationRoleCustomerLimited": "Customer utilisateur - limité", - "AuthorizationRoleCustomerFull": "Customer utilisateur - complète", - "AuthorizationRoleOpsAdminLimited": "Opérations du système - limited", - "AuthorizationRoleOpsAdminFull": "Opérations du système - complète", - "AuthorizationRoleSalesLimited": "Ventes - limité", - "AuthorizationRoleSalesFull": "Ventes - complète", + "AuthorizationRoleBizAdminRestricted": "Administration des affaires - restreint", + "AuthorizationRoleBizAdmin": "Administration des affaires", + "AuthorizationRoleServiceRestricted": "Service - restreint", + "AuthorizationRoleService": "Service", + "AuthorizationRoleInventoryRestricted": "Inventaire - restreint", + "AuthorizationRoleInventory": "Inventaire", + "AuthorizationRoleAccounting": "Comptabilité", + "AuthorizationRoleTechRestricted": "Technicien de service - restreint", + "AuthorizationRoleTech": "Technicien de service", + "AuthorizationRoleSubContractorRestricted": "Sous-traitant - restreint", + "AuthorizationRoleSubContractor": "Sous-traitant", + "AuthorizationRoleCustomerRestricted": "Customer utilisateur - restreint", + "AuthorizationRoleCustomer": "Customer utilisateur", + "AuthorizationRoleOpsAdminRestricted": "Opérations du système - restreint", + "AuthorizationRoleOpsAdmin": "Opérations du système", + "AuthorizationRoleSalesRestricted": "Ventes - restreint", + "AuthorizationRoleSales": "Ventes", "AuthorizationRoleAll": "Tous les rôles", "Welcome": "Bienvenue chez AyaNova", "ThankYouForEvaluating": "Merci d'essayer AyaNova. Veuillez utiliser les liens suivants pour vous aider à explorer AyaNova et voir s'il correspond bien à votre organisation.", diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index 389c1e34..dd133dc0 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -540,7 +540,7 @@ namespace AyaNova.Util if (await ct.User.AsNoTracking() .Where(z => z.Login == "BizAdminFull" || - z.Login == "DispatchFull" || + z.Login == "ServiceFull" || z.Login == "InventoryFull" || z.Login == "Accounting" || z.Login == "TechFull" diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 9e6c7fe0..4bb772c7 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -225,9 +225,9 @@ namespace AyaNova.Util watch.Start(); //Generate owner and lead tech - await SeedUserAsync(log, 1, AuthorizationRoles.BizAdminFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.InventoryFull | AuthorizationRoles.OpsAdminFull, UserType.Service); + await SeedUserAsync(log, 1, AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Inventory | AuthorizationRoles.OpsAdmin, UserType.Service); //Generate one office person / secretary - await SeedUserAsync(log, 1, AuthorizationRoles.DispatchFull | AuthorizationRoles.InventoryFull | AuthorizationRoles.AccountingFull, UserType.NotService); + await SeedUserAsync(log, 1, AuthorizationRoles.Service | AuthorizationRoles.Inventory | AuthorizationRoles.Accounting, UserType.NotService); // await SeedWidgetAsync(log, 3);//keeping this here for now but must remove later await SeedCustomerAsync(log, 25); await SeedHeadOfficeAsync(log, 10); @@ -263,25 +263,25 @@ namespace AyaNova.Util watch.Start(); //One IT administrator, can change ops but nothing else - await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminFull, UserType.NotService); + await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdmin, UserType.NotService); //One business administrator, can view ops issues - await SeedUserAsync(log, 1, AuthorizationRoles.BizAdminFull | AuthorizationRoles.OpsAdminLimited, UserType.NotService); + await SeedUserAsync(log, 1, AuthorizationRoles.BizAdmin | AuthorizationRoles.OpsAdminRestricted, UserType.NotService); //One owner who doesn't control anything but views stuff - await SeedUserAsync(log, 1, AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.InventoryLimited | AuthorizationRoles.OpsAdminLimited | AuthorizationRoles.SalesLimited, UserType.NotService); + await SeedUserAsync(log, 1, AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.InventoryRestricted | AuthorizationRoles.OpsAdminRestricted | AuthorizationRoles.SalesRestricted, UserType.NotService); //20 techs - await SeedUserAsync(log, 20, AuthorizationRoles.TechFull | AuthorizationRoles.DispatchLimited, UserType.Service); + await SeedUserAsync(log, 20, AuthorizationRoles.Tech | AuthorizationRoles.ServiceRestricted, UserType.Service); //2 subcontractors - await SeedUserAsync(log, 2, AuthorizationRoles.SubContractorFull, UserType.ServiceContractor); + await SeedUserAsync(log, 2, AuthorizationRoles.SubContractor, UserType.ServiceContractor); //3 generic office people people - await SeedUserAsync(log, 3, AuthorizationRoles.DispatchLimited | AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 3, AuthorizationRoles.ServiceRestricted | AuthorizationRoles.InventoryRestricted, UserType.NotService); //2 Full sales people - await SeedUserAsync(log, 2, AuthorizationRoles.SalesFull, UserType.NotService); - //1 dispatch manager - await SeedUserAsync(log, 1, AuthorizationRoles.DispatchFull | AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 2, AuthorizationRoles.Sales, UserType.NotService); + //1 Service manager + await SeedUserAsync(log, 1, AuthorizationRoles.Service | AuthorizationRoles.InventoryRestricted, UserType.NotService); //1 Inventory manager - await SeedUserAsync(log, 1, AuthorizationRoles.InventoryFull | AuthorizationRoles.DispatchLimited, UserType.NotService); + await SeedUserAsync(log, 1, AuthorizationRoles.Inventory | AuthorizationRoles.ServiceRestricted, UserType.NotService); //1 accountant / bookkeeper - await SeedUserAsync(log, 1, AuthorizationRoles.AccountingFull | AuthorizationRoles.BizAdminLimited, UserType.NotService); + await SeedUserAsync(log, 1, AuthorizationRoles.Accounting | AuthorizationRoles.BizAdminRestricted, UserType.NotService); //await SeedWidgetAsync(log, 100); await SeedCustomerAsync(log, 500); @@ -320,33 +320,33 @@ namespace AyaNova.Util //USERS //IT administrator, can change ops but nothing else - await SeedUserAsync(log, 2, AuthorizationRoles.OpsAdminFull, UserType.NotService); + await SeedUserAsync(log, 2, AuthorizationRoles.OpsAdmin, UserType.NotService); //business administrator, can view ops issues - await SeedUserAsync(log, 2, AuthorizationRoles.BizAdminFull | AuthorizationRoles.OpsAdminLimited, UserType.NotService); + await SeedUserAsync(log, 2, AuthorizationRoles.BizAdmin | AuthorizationRoles.OpsAdminRestricted, UserType.NotService); //owner / upper management who doesn't control anything but views stuff - await SeedUserAsync(log, 5, AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.InventoryLimited | AuthorizationRoles.OpsAdminLimited, UserType.NotService); + await SeedUserAsync(log, 5, AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.InventoryRestricted | AuthorizationRoles.OpsAdminRestricted, UserType.NotService); //TECHS - await SeedUserAsync(log, 50, AuthorizationRoles.TechFull | AuthorizationRoles.DispatchLimited, UserType.Service); - //limited techs - await SeedUserAsync(log, 10, AuthorizationRoles.TechLimited | AuthorizationRoles.DispatchLimited, UserType.Service); + await SeedUserAsync(log, 50, AuthorizationRoles.Tech | AuthorizationRoles.ServiceRestricted, UserType.Service); + //Restricted techs + await SeedUserAsync(log, 10, AuthorizationRoles.TechRestricted | AuthorizationRoles.ServiceRestricted, UserType.Service); //20 subcontractors - await SeedUserAsync(log, 20, AuthorizationRoles.SubContractorFull, UserType.ServiceContractor); - //10 limited subcontractors - await SeedUserAsync(log, 10, AuthorizationRoles.SubContractorLimited, UserType.ServiceContractor); + await SeedUserAsync(log, 20, AuthorizationRoles.SubContractor, UserType.ServiceContractor); + //10 Restricted subcontractors + await SeedUserAsync(log, 10, AuthorizationRoles.SubContractorRestricted, UserType.ServiceContractor); //30 generic office people people - await SeedUserAsync(log, 30, AuthorizationRoles.DispatchLimited | AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 30, AuthorizationRoles.ServiceRestricted | AuthorizationRoles.InventoryRestricted, UserType.NotService); //10 Full sales people - await SeedUserAsync(log, 10, AuthorizationRoles.SalesFull, UserType.NotService); - //5 Limited sales people - await SeedUserAsync(log, 5, AuthorizationRoles.SalesLimited, UserType.NotService); - //5 dispatch manager - await SeedUserAsync(log, 5, AuthorizationRoles.DispatchFull | AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 10, AuthorizationRoles.Sales, UserType.NotService); + //5 Restricted sales people + await SeedUserAsync(log, 5, AuthorizationRoles.SalesRestricted, UserType.NotService); + //5 Service manager + await SeedUserAsync(log, 5, AuthorizationRoles.Service | AuthorizationRoles.InventoryRestricted, UserType.NotService); //5 Inventory manager - await SeedUserAsync(log, 5, AuthorizationRoles.InventoryFull | AuthorizationRoles.DispatchLimited, UserType.NotService); + await SeedUserAsync(log, 5, AuthorizationRoles.Inventory | AuthorizationRoles.ServiceRestricted, UserType.NotService); //10 Inventory manager assistants - await SeedUserAsync(log, 5, AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 5, AuthorizationRoles.InventoryRestricted, UserType.NotService); //5 accountant / bookkeeper - await SeedUserAsync(log, 5, AuthorizationRoles.AccountingFull | AuthorizationRoles.BizAdminLimited, UserType.NotService); + await SeedUserAsync(log, 5, AuthorizationRoles.Accounting | AuthorizationRoles.BizAdminRestricted, UserType.NotService); //await SeedWidgetAsync(log, 100); await SeedCustomerAsync(log, 1000); @@ -386,33 +386,33 @@ namespace AyaNova.Util //USERS //IT administrator, can change ops but nothing else - await SeedUserAsync(log, 10, AuthorizationRoles.OpsAdminFull, UserType.NotService); + await SeedUserAsync(log, 10, AuthorizationRoles.OpsAdmin, UserType.NotService); //business administrator, can view ops issues - await SeedUserAsync(log, 10, AuthorizationRoles.BizAdminFull | AuthorizationRoles.OpsAdminLimited, UserType.NotService); + await SeedUserAsync(log, 10, AuthorizationRoles.BizAdmin | AuthorizationRoles.OpsAdminRestricted, UserType.NotService); //owner / upper management who doesn't control anything but views stuff - await SeedUserAsync(log, 20, AuthorizationRoles.BizAdminLimited | AuthorizationRoles.DispatchLimited | AuthorizationRoles.InventoryLimited | AuthorizationRoles.OpsAdminLimited, UserType.NotService); + await SeedUserAsync(log, 20, AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.InventoryRestricted | AuthorizationRoles.OpsAdminRestricted, UserType.NotService); //regular techs - await SeedUserAsync(log, 500, AuthorizationRoles.TechFull | AuthorizationRoles.DispatchLimited, UserType.Service); - //limited techs - await SeedUserAsync(log, 200, AuthorizationRoles.TechLimited | AuthorizationRoles.DispatchLimited, UserType.Service); + await SeedUserAsync(log, 500, AuthorizationRoles.Tech | AuthorizationRoles.ServiceRestricted, UserType.Service); + //Restricted techs + await SeedUserAsync(log, 200, AuthorizationRoles.TechRestricted | AuthorizationRoles.ServiceRestricted, UserType.Service); //subcontractors - await SeedUserAsync(log, 80, AuthorizationRoles.SubContractorFull, UserType.ServiceContractor); - //limited subcontractors - await SeedUserAsync(log, 40, AuthorizationRoles.SubContractorLimited, UserType.ServiceContractor); + await SeedUserAsync(log, 80, AuthorizationRoles.SubContractor, UserType.ServiceContractor); + //Restricted subcontractors + await SeedUserAsync(log, 40, AuthorizationRoles.SubContractorRestricted, UserType.ServiceContractor); //generic office people people - await SeedUserAsync(log, 200, AuthorizationRoles.DispatchLimited | AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 200, AuthorizationRoles.ServiceRestricted | AuthorizationRoles.InventoryRestricted, UserType.NotService); //20 Full sales people - await SeedUserAsync(log, 20, AuthorizationRoles.SalesFull, UserType.NotService); - //10 Limited sales people - await SeedUserAsync(log, 10, AuthorizationRoles.SalesLimited, UserType.NotService); - //dispatch manager - await SeedUserAsync(log, 20, AuthorizationRoles.DispatchFull | AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 20, AuthorizationRoles.Sales, UserType.NotService); + //10 Restricted sales people + await SeedUserAsync(log, 10, AuthorizationRoles.SalesRestricted, UserType.NotService); + //Service manager + await SeedUserAsync(log, 20, AuthorizationRoles.Service | AuthorizationRoles.InventoryRestricted, UserType.NotService); //Inventory manager - await SeedUserAsync(log, 40, AuthorizationRoles.InventoryFull | AuthorizationRoles.DispatchLimited, UserType.NotService); + await SeedUserAsync(log, 40, AuthorizationRoles.Inventory | AuthorizationRoles.ServiceRestricted, UserType.NotService); //Inventory manager assistants - await SeedUserAsync(log, 20, AuthorizationRoles.InventoryLimited, UserType.NotService); + await SeedUserAsync(log, 20, AuthorizationRoles.InventoryRestricted, UserType.NotService); //accountant / bookkeeper - await SeedUserAsync(log, 20, AuthorizationRoles.AccountingFull | AuthorizationRoles.BizAdminLimited, UserType.NotService); + await SeedUserAsync(log, 20, AuthorizationRoles.Accounting | AuthorizationRoles.BizAdminRestricted, UserType.NotService); //await SeedWidgetAsync(log, 100); await SeedCustomerAsync(log, 10000); @@ -557,23 +557,23 @@ namespace AyaNova.Util KnownUserTags.Add("test-role-user"); //TEST USERS //one of each role type - await SeedUserAsync(log, 1, AuthorizationRoles.BizAdminLimited, UserType.NotService, "BizAdminLimited", "BizAdminLimited", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.BizAdminFull, UserType.NotService, "BizAdminFull", "BizAdminFull", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.DispatchLimited, UserType.NotService, "DispatchLimited", "DispatchLimited", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.DispatchFull, UserType.NotService, "DispatchFull", "DispatchFull", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.InventoryLimited, UserType.NotService, "InventoryLimited", "InventoryLimited", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.InventoryFull, UserType.NotService, "InventoryFull", "InventoryFull", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.AccountingFull, UserType.NotService, "Accounting", "Accounting", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.TechLimited, UserType.Service, "TechLimited", "TechLimited", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.TechFull, UserType.Service, "TechFull", "TechFull", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.SalesLimited, UserType.NotService, "SalesLimited", "SalesLimited", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.SalesFull, UserType.NotService, "SalesFull", "SalesFull", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.BizAdminRestricted, UserType.NotService, "BizAdminRestricted", "BizAdminRestricted", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.BizAdmin, UserType.NotService, "BizAdmin", "BizAdmin", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.ServiceRestricted, UserType.NotService, "ServiceRestricted", "ServiceRestricted", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.Service, UserType.NotService, "Service", "Service", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.InventoryRestricted, UserType.NotService, "InventoryRestricted", "InventoryRestricted", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.Inventory, UserType.NotService, "Inventory", "Inventory", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.Accounting, UserType.NotService, "Accounting", "Accounting", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.TechRestricted, UserType.Service, "TechRestricted", "TechRestricted", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.Tech, UserType.Service, "Tech", "Tech", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.SalesRestricted, UserType.NotService, "SalesRestricted", "SalesRestricted", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.Sales, UserType.NotService, "Sales", "Sales", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminLimited, UserType.NotService, "OpsAdminLimited", "OpsAdminLimited", KnownUserTags); - await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminFull, UserType.NotService, "OpsAdminFull", "OpsAdminFull", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminRestricted, UserType.NotService, "OpsAdminRestricted", "OpsAdminRestricted", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdmin, UserType.NotService, "OpsAdmin", "OpsAdmin", KnownUserTags); @@ -584,10 +584,10 @@ namespace AyaNova.Util #if(DEBUG) //PRIVACY TEST USER - this is used for a test to see if user info leaks into the logs - await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminLimited, UserType.NotService, "TEST_PRIVACY_USER_ACCOUNT", "TEST_PRIVACY_USER_ACCOUNT", KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminRestricted, UserType.NotService, "TEST_PRIVACY_USER_ACCOUNT", "TEST_PRIVACY_USER_ACCOUNT", KnownUserTags); //TEST NOT ACTIVE - this is used for a test to see if inactive user can login - await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminLimited, UserType.NotService, false, "TEST_INACTIVE", "TEST_INACTIVE", 0, KnownUserTags); + await SeedUserAsync(log, 1, AuthorizationRoles.OpsAdminRestricted, UserType.NotService, false, "TEST_INACTIVE", "TEST_INACTIVE", 0, KnownUserTags); #endif @@ -753,7 +753,7 @@ namespace AyaNova.Util throw new System.Exception(err); } //Known HO type user - await SeedUserAsync(log, 1, AuthorizationRoles.CustomerFull, UserType.HeadOffice, true, "HeadOffice", "HeadOffice", 0, KnownUserTags, null, null, NewObject.Id); + await SeedUserAsync(log, 1, AuthorizationRoles.Customer, UserType.HeadOffice, true, "HeadOffice", "HeadOffice", 0, KnownUserTags, null, null, NewObject.Id); HeadOfficeIdForCustomer = NewObject.Id; } @@ -796,8 +796,8 @@ namespace AyaNova.Util throw new System.Exception(err); } //Known customer type users - await SeedUserAsync(log, 1, AuthorizationRoles.CustomerFull, UserType.Customer, true, "CustomerFull", "CustomerFull", 0, KnownUserTags, null, NewObject.Id, null); - await SeedUserAsync(log, 1, AuthorizationRoles.CustomerFull, UserType.Customer, true, "CustomerLimited", "CustomerLimited", 0, KnownUserTags, null, NewObject.Id, null); + await SeedUserAsync(log, 1, AuthorizationRoles.Customer, UserType.Customer, true, "Customer", "Customer", 0, KnownUserTags, null, NewObject.Id, null); + await SeedUserAsync(log, 1, AuthorizationRoles.Customer, UserType.Customer, true, "CustomerRestricted", "CustomerRestricted", 0, KnownUserTags, null, NewObject.Id, null); } } @@ -845,8 +845,8 @@ namespace AyaNova.Util VendorIdForSubContractorUser = NewObject.Id; } - await SeedUserAsync(log, 1, AuthorizationRoles.SubContractorLimited, UserType.ServiceContractor, true, "SubContractorLimited", "SubContractorLimited", 0, KnownUserTags, VendorIdForSubContractorUser, null, null); - await SeedUserAsync(log, 1, AuthorizationRoles.SubContractorFull, UserType.ServiceContractor, true, "SubContractorFull", "SubContractorFull", 0, KnownUserTags, VendorIdForSubContractorUser, null, null); + await SeedUserAsync(log, 1, AuthorizationRoles.SubContractorRestricted, UserType.ServiceContractor, true, "SubContractorRestricted", "SubContractorRestricted", 0, KnownUserTags, VendorIdForSubContractorUser, null, null); + await SeedUserAsync(log, 1, AuthorizationRoles.SubContractor, UserType.ServiceContractor, true, "SubContractor", "SubContractor", 0, KnownUserTags, VendorIdForSubContractorUser, null, null); } @@ -890,7 +890,7 @@ namespace AyaNova.Util stat.Completed = false; stat.Locked = true; stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.DispatchFull | AuthorizationRoles.BizAdminFull; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; stat.Notes = "Use to lock workorder and wait for approval from manager"; using (AyContext ct = ServiceProviderProvider.DBContext) { @@ -962,7 +962,7 @@ namespace AyaNova.Util stat.Completed = true; stat.Locked = true; stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.DispatchFull | AuthorizationRoles.BizAdminFull; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; using (AyContext ct = ServiceProviderProvider.DBContext) { @@ -1055,7 +1055,7 @@ namespace AyaNova.Util stat.Completed = false; stat.Locked = true; stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.SalesFull | AuthorizationRoles.AccountingFull | AuthorizationRoles.DispatchFull | AuthorizationRoles.BizAdminFull; + stat.RemoveRoles = AuthorizationRoles.Sales | AuthorizationRoles.Accounting | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; using (AyContext ct = ServiceProviderProvider.DBContext) { WorkOrderStatusBiz biz = WorkOrderStatusBiz.GetBiz(ct); @@ -1077,8 +1077,8 @@ namespace AyaNova.Util stat.Color = "#f2f2f2"; stat.Completed = true; stat.Locked = true; - stat.SelectRoles = AuthorizationRoles.DispatchFull | AuthorizationRoles.BizAdminFull; - stat.RemoveRoles = AuthorizationRoles.DispatchFull | AuthorizationRoles.BizAdminFull; + stat.SelectRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; using (AyContext ct = ServiceProviderProvider.DBContext) { @@ -1686,7 +1686,7 @@ namespace AyaNova.Util //Customer contacts //10% chance (0-9) if (Fake.Random.Number(9) == 4) - await SeedUserAsync(log, 1, AuthorizationRoles.CustomerFull, UserType.Customer, true, null, null, 0, null, null, NewObject.Id, null); + await SeedUserAsync(log, 1, AuthorizationRoles.Customer, UserType.Customer, true, null, null, 0, null, null, NewObject.Id, null); } } } @@ -1748,7 +1748,7 @@ namespace AyaNova.Util throw new System.Exception(err); } //HeadOffice contacts - await SeedUserAsync(log, 1, AuthorizationRoles.CustomerFull, UserType.HeadOffice, true, null, null, 0, null, null, null, NewObject.Id); + await SeedUserAsync(log, 1, AuthorizationRoles.Customer, UserType.HeadOffice, true, null, null, 0, null, null, null, NewObject.Id); //HeadOffice Customer await SeedCustomerAsync(log, 2, NewObject.Id); @@ -2184,7 +2184,7 @@ namespace AyaNova.Util o.Tags = RandomTags(); o.DateRequested = Fake.Date.Between(seedStartWindow, seedEndWindow).ToUniversalTime(); o.CustomerId = Fake.Random.Long(1, TotalSeededCustomers); - o.RequestedByUserId = await SeedUserAsync(log, 1, AuthorizationRoles.CustomerFull, UserType.Customer, true, null, null, 0, null, null, o.CustomerId, null); + o.RequestedByUserId = await SeedUserAsync(log, 1, AuthorizationRoles.Customer, UserType.Customer, true, null, null, 0, null, null, o.CustomerId, null); o.Status = CustomerServiceRequestStatus.Open; o.Priority = Fake.Random.Enum(); o.CustomerReferenceNumber = Fake.Finance.Account();