admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-07-30 18:09:36 +00:00
parent 72fc11b673
commit cb73283a87
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/AyaNova/Controllers/ImportController.cs
View File

@@ -56,6 +56,11 @@ namespace AyaNova.Api.Controllers
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
//This route is ONLY available to users with full rights to Global object
if (!Authorized.HasModifyRole(HttpContext.Items, AyaType.Global))
{
return StatusCode(403, new ApiNotAuthorizedResponse());
}
// AyaTypeId attachToObject = null; // AyaTypeId attachToObject = null;
ApiUploadProcessor.ApiUploadedFilesResult uploadFormData = null; ApiUploadProcessor.ApiUploadedFilesResult uploadFormData = null;
@@ -67,7 +72,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, $"Expected a multipart request, but got {Request.ContentType}")); return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, $"Expected a multipart request, but got {Request.ContentType}"));
//Save uploads to disk under temporary file names until we decide how to handle them //Save uploads to disk under temporary file names until we decide how to handle them
// uploadFormData = await ApiUploadProcessor.ProcessUploadAsync(HttpContext);xx // uploadFormData = await ApiUploadProcessor.ProcessUploadAsync(HttpContext);xx
string UploadAType = string.Empty; string UploadAType = string.Empty;
@@ -76,7 +81,7 @@ namespace AyaNova.Api.Controllers
string Notes = string.Empty; string Notes = string.Empty;
List<UploadFileData> FileData = new List<UploadFileData>(); List<UploadFileData> FileData = new List<UploadFileData>();
//Save uploads to disk under temporary file names until we decide how to handle them //Save uploads to disk under temporary file names until we decide how to handle them
uploadFormData = await ApiUploadProcessor.ProcessUploadAsync(HttpContext); uploadFormData = await ApiUploadProcessor.ProcessUploadAsync(HttpContext);
if (!string.IsNullOrWhiteSpace(uploadFormData.Error)) if (!string.IsNullOrWhiteSpace(uploadFormData.Error))
{ {
@@ -114,7 +119,7 @@ namespace AyaNova.Api.Controllers
//Instantiate the business object handler //Instantiate the business object handler
AyaType TheType = System.Enum.Parse<AyaType>(UploadAType, true); AyaType TheType = System.Enum.Parse<AyaType>(UploadAType, true);
log.LogDebug($"Instantiating biz object handler for {TheType}"); log.LogDebug($"Instantiating biz object handler for {TheType}");
var biz = BizObjectFactory.GetBizObject(TheType, ct); var biz = BizObjectFactory.GetBizObject(TheType, ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items));
if (!(biz is IImportAbleObject)) if (!(biz is IImportAbleObject))
return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, $"Import not supported for {TheType} objects")); return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, $"Import not supported for {TheType} objects"));

12
server/AyaNova/biz/BizObjectFactory.cs
View File

@@ -14,8 +14,8 @@ namespace AyaNova.Biz
//Used by SEARCH, REPORTING and objects with JOBS //Used by SEARCH, REPORTING and objects with JOBS
internal static BizObject GetBizObject(AyaType ayaType, internal static BizObject GetBizObject(AyaType ayaType,
AyContext ct, AyContext ct,
long userId = 1, long userId,
AuthorizationRoles roles = AuthorizationRoles.All, AuthorizationRoles roles,
long translationId = 0) long translationId = 0)
{ {
if (translationId == 0) if (translationId == 0)
@@ -89,8 +89,8 @@ namespace AyaNova.Biz
case AyaType.WorkOrderItemTravel: case AyaType.WorkOrderItemTravel:
case AyaType.WorkOrderItemUnit: case AyaType.WorkOrderItemUnit:
case AyaType.WorkOrderItemOutsideService: case AyaType.WorkOrderItemOutsideService:
return new WorkOrderBiz(ct, userId, translationId, roles, UserType.NotService);//default to not service for now arbitrarily on the principle of least access return new WorkOrderBiz(ct, userId, translationId, roles, UserType.Service);
//---
//--- Quote //--- Quote
@@ -105,7 +105,7 @@ namespace AyaNova.Biz
case AyaType.QuoteItemTravel: case AyaType.QuoteItemTravel:
case AyaType.QuoteItemUnit: case AyaType.QuoteItemUnit:
case AyaType.QuoteItemOutsideService: case AyaType.QuoteItemOutsideService:
return new QuoteBiz(ct, userId, translationId, roles, UserType.NotService);//default to not service for now arbitrarily on the principle of least access return new QuoteBiz(ct, userId, translationId, roles, UserType.Service);
//--- //---
@@ -121,7 +121,7 @@ namespace AyaNova.Biz
case AyaType.PMItemTravel: case AyaType.PMItemTravel:
case AyaType.PMItemUnit: case AyaType.PMItemUnit:
case AyaType.PMItemOutsideService: case AyaType.PMItemOutsideService:
return new PMBiz(ct, userId, translationId, roles, UserType.NotService);//default to not service for now arbitrarily on the principle of least access return new PMBiz(ct, userId, translationId, roles, UserType.Service);
//--- //---
case AyaType.Reminder: case AyaType.Reminder:

10
server/AyaNova/biz/JobsBiz.cs
View File

@@ -206,7 +206,7 @@ namespace AyaNova.Biz
await CoreJobNotify.DoWorkAsync(); await CoreJobNotify.DoWorkAsync();
await CoreNotificationSweeper.DoWorkAsync(); await CoreNotificationSweeper.DoWorkAsync();
//PM GENERATION //PM GENERATION
await CoreJobPMGenerate.DoWorkAsync(); await CoreJobPMGenerate.DoWorkAsync();
//JOB SWEEPER / AND USER COUNT CHECK //JOB SWEEPER / AND USER COUNT CHECK
@@ -303,18 +303,18 @@ namespace AyaNova.Biz
await UpdateJobStatusAsync(job.GId, JobStatus.Completed); await UpdateJobStatusAsync(job.GId, JobStatus.Completed);
break; break;
case JobType.TestJob: case JobType.TestJob:
o = (IJobObject)BizObjectFactory.GetBizObject(AyaType.ServerJob, ct); o = (IJobObject)BizObjectFactory.GetBizObject(AyaType.ServerJob, ct, 1, AuthorizationRoles.BizAdmin);
break; break;
case JobType.SeedTestData: case JobType.SeedTestData:
o = (IJobObject)BizObjectFactory.GetBizObject(AyaType.TrialSeeder, ct); o = (IJobObject)BizObjectFactory.GetBizObject(AyaType.TrialSeeder, ct, 1, AuthorizationRoles.BizAdmin);
break; break;
case JobType.AttachmentMaintenance: case JobType.AttachmentMaintenance:
o = (IJobObject)BizObjectFactory.GetBizObject(AyaType.FileAttachment, ct); o = (IJobObject)BizObjectFactory.GetBizObject(AyaType.FileAttachment, ct, 1, AuthorizationRoles.BizAdmin);
break; break;
case JobType.BatchCoreObjectOperation: case JobType.BatchCoreObjectOperation:
//batch op, hand off to biz object to deal with //batch op, hand off to biz object to deal with
//note, convention is that there is an idList in job.jobinfo json if preselected else it's all objects of type //note, convention is that there is an idList in job.jobinfo json if preselected else it's all objects of type
o = (IJobObject)BizObjectFactory.GetBizObject(job.AType, ct); o = (IJobObject)BizObjectFactory.GetBizObject(job.AType, ct, 1, AuthorizationRoles.BizAdmin);
break; break;
default: default:
throw new System.NotSupportedException($"ProcessJobAsync type {job.JobType.ToString()} is not supported"); throw new System.NotSupportedException($"ProcessJobAsync type {job.JobType.ToString()} is not supported");

2
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -57,7 +57,7 @@ namespace AyaNova.Biz
1, 1,
ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID,
AuthorizationRoles.BizAdmin, AuthorizationRoles.BizAdmin,
UserType.NotService);//picked not service arbitrarily, probably a non-factor UserType.Service);
} }