Merge pull request #12 from markcoleman/copilot/ensure-case-creation-api-use

Author: markcoleman

docs/PhishLabsIncidentReporter.md

@@ -28,9 +28,9 @@ Add the PhishLabs settings to your `appsettings.json`:
 ```json
 {
   "PhishLabs": {
-    "ApiBaseUrl": "https://api.phishlabs.com",
+    "ApiBaseUrl": "https://caseapi.phishlabs.com",
     "ApiKey": "your-api-key-here",
-    "ServicePath": "/incidents/your-service",
+    "ServicePath": "/v1/create",
     "TimeoutSeconds": 30,
     "MaxRetries": 3,
     "RateLimitPerMinute": 10

src/UmbracoWeb/UmbracoWeb.Tests/UmbracoWeb.Tests.csproj

@@ -14,8 +14,8 @@
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit.Analyzers" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
     <PackageReference Include="Moq" Version="4.20.70" />
   </ItemGroup>
 

src/UmbracoWeb/UmbracoWeb.Tests/UnitTest1.cs

@@ -28,9 +28,9 @@ public void SetUp()
 
         _settings = new PhishLabsSettings
         {
-            ApiBaseUrl = "https://api.phishlabs.com",
+            ApiBaseUrl = "https://caseapi.phishlabs.com",
             ApiKey = "test-key",
-            ServicePath = "/incidents/test",
+            ServicePath = "/v1/create",
             TimeoutSeconds = 30,
             MaxRetries = 3,
             RateLimitPerMinute = 10
@@ -61,8 +61,8 @@ public async Task SubmitIncidentAsync_WithValidRequest_ReturnsSuccessResponse()
         var apiResponse = new
         {
             success = true,
-            incidentId = "incident-456",
-            message = "Incident created successfully"
+            caseId = "case-456",
+            message = "Case created successfully"
         };
 
         var responseContent = JsonSerializer.Serialize(apiResponse, new JsonSerializerOptions

src/UmbracoWeb/UmbracoWeb/Models/PhishLabsModels.cs

@@ -49,23 +49,23 @@ public class PhishLabsIncidentResponse
 }
 
 /// <summary>
-/// Internal model for PhishLabs API request
+/// Internal model for PhishLabs Case Creation API request
 /// </summary>
 internal class PhishLabsApiRequest
 {
-    public string Url { get; set; } = string.Empty;
-    public string? Description { get; set; }
+    public string CaseType { get; set; } = "Phishing";
+    public string Title { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
     public string Source { get; set; } = "umbraco-web";
-    public DateTime Timestamp { get; set; } = DateTime.UtcNow;
 }
 
 /// <summary>
-/// Internal model for PhishLabs API response
+/// Internal model for PhishLabs Case Creation API response
 /// </summary>
 internal class PhishLabsApiResponse
 {
     public bool Success { get; set; }
-    public string? IncidentId { get; set; }
+    public string? CaseId { get; set; }
     public string? Message { get; set; }
     public string? Error { get; set; }
 }

src/UmbracoWeb/UmbracoWeb/Services/PhishLabsService.cs

@@ -6,7 +6,7 @@
 namespace UmbracoWeb.Services;
 
 /// <summary>
-/// Service for integrating with PhishLabs incident reporting API
+/// Service for integrating with PhishLabs Case Creation API
 /// </summary>
 public class PhishLabsService : IPhishLabsService
 {
@@ -52,20 +52,23 @@ public async Task<PhishLabsIncidentResponse> SubmitIncidentAsync(
 
         try
         {
+            var sanitizedUrl = SanitizeUrl(request.Url);
             var apiRequest = new PhishLabsApiRequest
             {
-                Url = SanitizeUrl(request.Url),
-                Description = SanitizeDescription(request.Details),
-                Source = "umbraco-web",
-                Timestamp = DateTime.UtcNow
+                CaseType = "Phishing",
+                Title = $"Suspicious URL: {sanitizedUrl}",
+                Description = string.IsNullOrWhiteSpace(request.Details) 
+                    ? $"Reported URL: {sanitizedUrl}" 
+                    : $"Reported URL: {sanitizedUrl}\n\nDetails: {SanitizeDescription(request.Details)}",
+                Source = "umbraco-web"
             };
 
             var response = await SubmitToPhishLabsAsync(apiRequest, correlationId, cancellationToken);
 
             if (response.Success)
             {
-                _logger.LogInformation("PhishLabs incident submitted successfully. CorrelationId: {CorrelationId}, IncidentId: {IncidentId}", 
-                    correlationId, response.IncidentId);
+                _logger.LogInformation("PhishLabs case created successfully. CorrelationId: {CorrelationId}, CaseId: {CaseId}", 
+                    correlationId, response.CaseId);
 
                 return new PhishLabsIncidentResponse
                 {

src/UmbracoWeb/UmbracoWeb/appsettings.json

@@ -43,9 +43,9 @@
     "umbracoDbDSN_ProviderName": "Microsoft.Data.SqlClient"
   },
   "PhishLabs": {
-    "ApiBaseUrl": "#{PHISHLABS_API_BASE_URL}#",
+    "ApiBaseUrl": "https://caseapi.phishlabs.com",
     "ApiKey": "#{PHISHLABS_API_KEY}#",
-    "ServicePath": "#{PHISHLABS_SERVICE_PATH}#",
+    "ServicePath": "/v1/create",
     "TimeoutSeconds": 30,
     "MaxRetries": 3,
     "RateLimitPerMinute": 10