Recommiting glbs for LFS

microservices/CharacterApi/CharacterApi.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
-    <PackageReference Include="MongoDB.Driver" Version="3.4.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
+    <PackageReference Include="MongoDB.Driver" Version="3.4.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+  </ItemGroup>
+
+</Project>

microservices/CharacterApi/Controllers/CharactersController.cs

@@ -7,11 +7,11 @@ using System.Net.Http.Headers;
 using System.Security.Claims;
 using System.Text;
 using System.Text.Json;
-
-namespace CharacterApi.Controllers;
-
-[ApiController]
-[Route("api/[controller]")]
+
+namespace CharacterApi.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
 public class CharactersController : ControllerBase
 {
     private static readonly TimeSpan PresenceTimeout = TimeSpan.FromSeconds(45);
@@ -27,18 +27,18 @@ public class CharactersController : ControllerBase
         _configuration = configuration;
         _logger = logger;
     }
-
-    [HttpPost]
-    [Authorize(Roles = "USER,SUPER")]
+
+    [HttpPost]
+    [Authorize(Roles = "USER,SUPER")]
     public async Task<IActionResult> Create([FromBody] CreateCharacterRequest req)
     {
         if (string.IsNullOrWhiteSpace(req.Name))
             return BadRequest("Name required");
-
-        var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
-        if (string.IsNullOrWhiteSpace(userId))
-            return Unauthorized();
-
+
+        var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
+        if (string.IsNullOrWhiteSpace(userId))
+            return Unauthorized();
+
         var character = new Character
         {
             OwnerUserId = userId,
@@ -60,9 +60,9 @@ public class CharactersController : ControllerBase
 
         return Ok(character);
     }
-
-    [HttpGet]
-    [Authorize(Roles = "USER,SUPER")]
+
+    [HttpGet]
+    [Authorize(Roles = "USER,SUPER")]
     public async Task<IActionResult> ListMine()
     {
         var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
@@ -269,16 +269,16 @@ public class CharactersController : ControllerBase
     [HttpDelete("{id}")]
     [Authorize(Roles = "USER,SUPER")]
     public async Task<IActionResult> Delete(string id)
-    {
-        var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
-        if (string.IsNullOrWhiteSpace(userId))
-            return Unauthorized();
-
-        var allowAnyOwner = User.IsInRole("SUPER");
-        var deleted = await _characters.DeleteForOwnerAsync(id, userId, allowAnyOwner);
-        if (!deleted)
-            return NotFound();
-
-        return Ok("Deleted");
-    }
-}
+    {
+        var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
+        if (string.IsNullOrWhiteSpace(userId))
+            return Unauthorized();
+
+        var allowAnyOwner = User.IsInRole("SUPER");
+        var deleted = await _characters.DeleteForOwnerAsync(id, userId, allowAnyOwner);
+        if (!deleted)
+            return NotFound();
+
+        return Ok("Deleted");
+    }
+}

microservices/CharacterApi/DOCUMENTS.md

@@ -1,9 +1,9 @@
-# CharacterApi document shapes
-
-This service expects JSON request bodies for character creation and stores
-character documents in MongoDB.
-
-Inbound JSON documents
+# CharacterApi document shapes
+
+This service expects JSON request bodies for character creation and stores
+character documents in MongoDB.
+
+Inbound JSON documents
 - CreateCharacterRequest (`POST /api/characters`)
   ```json
   {
@@ -19,8 +19,8 @@ Inbound JSON documents
     }
   }
   ```
-
-Stored documents (MongoDB)
+
+Stored documents (MongoDB)
 - Character
   ```json
   {

microservices/CharacterApi/Models/Character.cs

@@ -1,16 +1,16 @@
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace CharacterApi.Models;
-
-public class Character
-{
-    [BsonId]
-    [BsonRepresentation(BsonType.ObjectId)]
-    public string? Id { get; set; }
-
-    public string OwnerUserId { get; set; } = string.Empty;
-
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace CharacterApi.Models;
+
+public class Character
+{
+    [BsonId]
+    [BsonRepresentation(BsonType.ObjectId)]
+    public string? Id { get; set; }
+
+    public string OwnerUserId { get; set; } = string.Empty;
+
     public string Name { get; set; } = string.Empty;
 
     public Coord Coord { get; set; } = new();

microservices/CharacterApi/Models/CreateCharacterRequest.cs

@@ -1,6 +1,6 @@
-namespace CharacterApi.Models;
-
-public class CreateCharacterRequest
-{
-    public string Name { get; set; } = string.Empty;
-}
+namespace CharacterApi.Models;
+
+public class CreateCharacterRequest
+{
+    public string Name { get; set; } = string.Empty;
+}

microservices/CharacterApi/Models/VisibleLocation.cs

@@ -1,18 +1,18 @@
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson;
-
-namespace CharacterApi.Models;
-
-[BsonIgnoreExtraElements]
+using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Bson;
+
+namespace CharacterApi.Models;
+
+[BsonIgnoreExtraElements]
 public class VisibleLocation
 {
-    [BsonId]
-    [BsonRepresentation(BsonType.ObjectId)]
-    public string? Id { get; set; }
-
-    [BsonElement("name")]
-    public string Name { get; set; } = string.Empty;
-
+    [BsonId]
+    [BsonRepresentation(BsonType.ObjectId)]
+    public string? Id { get; set; }
+
+    [BsonElement("name")]
+    public string Name { get; set; } = string.Empty;
+
     [BsonElement("coord")]
     public LocationCoord Coord { get; set; } = new();
 

microservices/CharacterApi/Program.cs

@@ -4,61 +4,61 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using System.Text;
-
-var builder = WebApplication.CreateBuilder(args);
+
+var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddControllers();
 
 // DI
 builder.Services.AddSingleton<CharacterStore>();
 builder.Services.AddHttpClient();
-
-// Swagger + JWT auth in Swagger
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen(c =>
-{
-    c.SwaggerDoc("v1", new OpenApiInfo { Title = "Character API", Version = "v1" });
-    c.AddSecurityDefinition("bearerAuth", new OpenApiSecurityScheme
-    {
-        Type = SecuritySchemeType.Http,
-        Scheme = "bearer",
-        BearerFormat = "JWT",
-        Description = "Paste your access token here (no 'Bearer ' prefix needed)."
-    });
-    c.AddSecurityRequirement(new OpenApiSecurityRequirement
-    {
-        {
-            new OpenApiSecurityScheme
-            {
-                Reference = new OpenApiReference
-                { Type = ReferenceType.SecurityScheme, Id = "bearerAuth" }
-            },
-            Array.Empty<string>()
-        }
-    });
-});
-
-// AuthN/JWT
-var cfg = builder.Configuration;
-var jwtKey = cfg["Jwt:Key"] ?? throw new Exception("Jwt:Key missing");
-var issuer = cfg["Jwt:Issuer"] ?? "promiscuity";
-var aud = cfg["Jwt:Audience"] ?? issuer;
-
-builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-    .AddJwtBearer(o =>
-    {
-        o.TokenValidationParameters = new TokenValidationParameters
-        {
-            ValidateIssuer = true, ValidIssuer = issuer,
-            ValidateAudience = true, ValidAudience = aud,
-            ValidateIssuerSigningKey = true,
-            IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtKey)),
-            ValidateLifetime = true,
-            ClockSkew = TimeSpan.FromSeconds(30)
-        };
-    });
-
-builder.Services.AddAuthorization();
-
+
+// Swagger + JWT auth in Swagger
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen(c =>
+{
+    c.SwaggerDoc("v1", new OpenApiInfo { Title = "Character API", Version = "v1" });
+    c.AddSecurityDefinition("bearerAuth", new OpenApiSecurityScheme
+    {
+        Type = SecuritySchemeType.Http,
+        Scheme = "bearer",
+        BearerFormat = "JWT",
+        Description = "Paste your access token here (no 'Bearer ' prefix needed)."
+    });
+    c.AddSecurityRequirement(new OpenApiSecurityRequirement
+    {
+        {
+            new OpenApiSecurityScheme
+            {
+                Reference = new OpenApiReference
+                { Type = ReferenceType.SecurityScheme, Id = "bearerAuth" }
+            },
+            Array.Empty<string>()
+        }
+    });
+});
+
+// AuthN/JWT
+var cfg = builder.Configuration;
+var jwtKey = cfg["Jwt:Key"] ?? throw new Exception("Jwt:Key missing");
+var issuer = cfg["Jwt:Issuer"] ?? "promiscuity";
+var aud = cfg["Jwt:Audience"] ?? issuer;
+
+builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+    .AddJwtBearer(o =>
+    {
+        o.TokenValidationParameters = new TokenValidationParameters
+        {
+            ValidateIssuer = true, ValidIssuer = issuer,
+            ValidateAudience = true, ValidAudience = aud,
+            ValidateIssuerSigningKey = true,
+            IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtKey)),
+            ValidateLifetime = true,
+            ClockSkew = TimeSpan.FromSeconds(30)
+        };
+    });
+
+builder.Services.AddAuthorization();
+
 var app = builder.Build();
 
 app.UseExceptionHandler(errorApp =>
@@ -98,11 +98,11 @@ app.UseExceptionHandler(errorApp =>
 app.MapGet("/healthz", () => Results.Ok("ok"));
 app.UseSwagger();
 app.UseSwaggerUI(o =>
-{
-    o.SwaggerEndpoint("/swagger/v1/swagger.json", "Character API v1");
-    o.RoutePrefix = "swagger";
-});
-app.UseAuthentication();
-app.UseAuthorization();
-app.MapControllers();
-app.Run();
+{
+    o.SwaggerEndpoint("/swagger/v1/swagger.json", "Character API v1");
+    o.RoutePrefix = "swagger";
+});
+app.UseAuthentication();
+app.UseAuthorization();
+app.MapControllers();
+app.Run();

microservices/CharacterApi/Properties/launchSettings.json

@@ -1,12 +1,12 @@
-{
-  "profiles": {
-    "CharacterApi": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:50784;http://localhost:50785"
-    }
-  }
+{
+  "profiles": {
+    "CharacterApi": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:50784;http://localhost:50785"
+    }
+  }
 }

microservices/CharacterApi/appsettings.Development.json

@@ -1,4 +1,4 @@
-{
+{
   "Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5001" } } },
   "MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
   "Services": { "LocationsApiBaseUrl": "http://localhost:5002" },

microservices/CharacterApi/appsettings.json

@@ -1,4 +1,4 @@
-{
+{
   "Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5001" } } },
   "MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
   "Services": { "LocationsApiBaseUrl": "https://ploc.ranaze.com" },

microservices/CharacterApi/k8s/deployment.yaml

@@ -1,28 +1,28 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: promiscuity-character
-  labels:
-    app: promiscuity-character
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: promiscuity-character
-  template:
-    metadata:
-      labels:
-        app: promiscuity-character
-    spec:
-      containers:
-        - name: promiscuity-character
-          image: promiscuity-character:latest
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 5001
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: 5001
-            initialDelaySeconds: 5
-            periodSeconds: 10
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: promiscuity-character
+  labels:
+    app: promiscuity-character
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: promiscuity-character
+  template:
+    metadata:
+      labels:
+        app: promiscuity-character
+    spec:
+      containers:
+        - name: promiscuity-character
+          image: promiscuity-character:latest
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 5001
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: 5001
+            initialDelaySeconds: 5
+            periodSeconds: 10

microservices/CharacterApi/k8s/service.yaml

@@ -1,15 +1,15 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: promiscuity-character
-  labels:
-    app: promiscuity-character
-spec:
-  selector:
-    app: promiscuity-character
-  type: NodePort
-  ports:
-    - name: http
-      port: 80          # cluster port
-      targetPort: 5001  # container port
-      nodePort: 30081   # external port
+apiVersion: v1
+kind: Service
+metadata:
+  name: promiscuity-character
+  labels:
+    app: promiscuity-character
+spec:
+  selector:
+    app: promiscuity-character
+  type: NodePort
+  ports:
+    - name: http
+      port: 80          # cluster port
+      targetPort: 5001  # container port
+      nodePort: 30081   # external port