Committing work fixing issues found while testing on dev1.bookmarks

- Modified EnvironmentUtils to fix proper casing for getting ASPNETCore_Environment
- On Web, modify package.json to delete 'homepage': '.', line to fix issue with app not serving up subroutes. See: https://stackoverflow.com/questions/63036631/nginx-returning-404-when-trying-get-subroute-in-dockerized-react-app
- Added docker-compose for easier setup and deployment of local docker containers

.gitignore

@@ -248,5 +248,4 @@ yarn-debug.log*
 yarn-error.log*
 .env
 Logs/*
-docker-compose.yml
 *exclude*

.woodpecker/.web_uploadimage.yaml

@@ -18,17 +18,35 @@ steps:
       - rm -f tags.txt
       - echo ${CI_COMMIT_TAG} | sed -e "s/^WEB-//" >> tags.txt
       - echo "latest" >> tags.txt
-  - name: (YABA.Web) Package and Upload Docker Image
+  - name: (YABA.Web) Package and Upload Docker Image (dev)
+    when:
+      - ref: refs/tags/WEBDEV-*
     image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: gitea.iwanaga.moe/cjtibule/yaba/web
       context: ./Web
       dockerfile: ./Web/Dockerfile
-      secrets: [DEV_AUTH0_AUDIENCE, DEV_AUTH0_CLIENT_ID, DEV_AUTH0_DOMAIN, DEV1_API_URL, DEV1_CALLBACK]
       tags_file: tags.txt
       username:
         from_secret: gitea_yaba_registry_username
       password: 
         from_secret: gitea_yaba_registry_password
       registry: gitea.iwanaga.moe
-      build_args: [${DEV_AUTH0_AUDIENCE}, ${DEV_AUTH0_CLIENT_ID}, ${DEV_AUTH0_DOMAIN}, ${DEV1_API_URL}, ${DEV1_CALLBACK}]
+      build_args: 
+        from_secret: DEV1_BUILDARGS
+  - name: (YABA.Web) Package and Upload Docker Image (prod)
+    when:
+        - ref: refs/tags/WEB-*
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: gitea.iwanaga.moe/cjtibule/yaba/web
+      context: ./Web
+      dockerfile: ./Web/Dockerfile
+      tags_file: tags.txt
+      username:
+        from_secret: gitea_yaba_registry_username
+      password: 
+        from_secret: gitea_yaba_registry_password
+      registry: gitea.iwanaga.moe
+      build_args: 
+        from_secret: PROD_BUILDARGS

API/YABA.API/Dockerfile

@@ -6,14 +6,16 @@ EXPOSE 80
 EXPOSE 443
 
 # Set environment variables
-ENV ASPNETCORE_Environment=Development
+ENV ASPNETCORE_Environment=
 ENV ASPNETCORE_Authentication__Auth0__ClientId=
 ENV ASPNETCORE_Authentication__Auth0__ClientSecret=
 ENV ASPNETCORE_Authentication__Auth0__Domain=
 ENV ASPNETCORE_Authentication__Auth0__Identifier=
 ENV ASPNETCORE_ConnectionStrings__YABAReadOnlyDbConnectionString=
 ENV ASPNETCORE_ConnectionStrings__YABAReadWriteDbConnectionString=
-ENV ASPNETCORE_WebClient__Url=
+ENV WebClient__Url=
+ENV Serilog__WriteTo__1__Args__Uri=
+ENV Serilog__WriteTo__1__Args__Labels__1__Value=
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
 WORKDIR /src

API/YABA.API/Middlewares/AddCustomClaimsMiddleware.cs

@@ -2,6 +2,7 @@
 using YABA.API.Extensions;
 using YABA.Common.Extensions;
 using YABA.Common.Lookups;
+using YABA.Common.Utils;
 using YABA.Service.Interfaces;
 
 namespace YABA.API.Middlewares
@@ -31,7 +32,7 @@ namespace YABA.API.Middlewares
                         userId = registedUser.Id;
                     }
 
-                    httpContext.User.Identities.FirstOrDefault().AddClaim(new Claim(ClaimsLookup.UserId.GetClaimName(), userId.ToString()));
+                    httpContext.User.Identities.FirstOrDefault().AddClaim(new Claim(ClaimsLookup.UserId.GetClaimName(EnvironmentUtils.IsDevelopmentEnvironment()), userId.ToString()));
                 }
             }
 

API/YABA.Common/Attributes/ClaimNameAttribute.cs

@@ -4,11 +4,13 @@ namespace YABA.Common.Attributes
 {
     public class ClaimNameAttribute : Attribute
     {
-        public string Name { get; private set; }
+        public string DevClaimName { get; private set; }
+        public string ProdClaimName { get; private set; }
 
-        public ClaimNameAttribute(string name)
+        public ClaimNameAttribute(string devClaimName, string prodClaimName)
         {
-            this.Name = name;
+            this.DevClaimName = devClaimName;
+            ProdClaimName = prodClaimName;
         }
     }
 }

API/YABA.Common/Extensions/EnumExtensions.cs

@@ -28,9 +28,9 @@ namespace YABA.Common.Extensions
             return enumValue.GetAttribute<DisplayAttribute>().Name;
         }
 
-        public static string GetClaimName(this ClaimsLookup claimLookup)
+        public static string GetClaimName(this ClaimsLookup claimLookup, bool isDevelopmentEnvironment)
         {
-            return claimLookup.GetAttribute<ClaimNameAttribute>().Name;
+            return isDevelopmentEnvironment ? claimLookup.GetAttribute<ClaimNameAttribute>().DevClaimName : claimLookup.GetAttribute<ClaimNameAttribute>().ProdClaimName;
         }
 
         public static bool IsCrudResultSuccessful(this CrudResultLookup importStatusLookup) => SuccessfulCrudStatuses.Contains(importStatusLookup);

API/YABA.Common/Extensions/UserIdentityExtensions.cs

@@ -1,6 +1,8 @@
-using System.Security.Claims;
+using System;
+using System.Security.Claims;
 using System.Security.Principal;
 using YABA.Common.Lookups;
+using YABA.Common.Utils;
 
 namespace YABA.Common.Extensions
 {
@@ -12,7 +14,7 @@ namespace YABA.Common.Extensions
         public static string GetCustomClaim(this IIdentity identity, ClaimsLookup claim)
         {
             var claimsIdentity = identity as ClaimsIdentity;
-            return claimsIdentity.FindFirst(claim.GetClaimName())?.Value.ToString();
+            return claimsIdentity.FindFirst(claim.GetClaimName(EnvironmentUtils.IsDevelopmentEnvironment()))?.Value.ToString();
         }
     }
 }

API/YABA.Common/Lookups/ClaimsLookup.cs

@@ -4,19 +4,19 @@ namespace YABA.Common.Lookups
 {
     public enum ClaimsLookup
     {
-        [ClaimNameAttribute("https://dev.iwanaga.moe/api/auth_provider_id")]
+        [ClaimName("https://auth.dev.iwanaga.moe/api/auth_provider_id", "https://auth.iwanaga.moe/api/auth_provider_id")]
         AuthProviderId = 1,
 
-        [ClaimNameAttribute("https://dev.iwanaga.moe/api/email_address")]
+        [ClaimName("https://auth.dev.iwanaga.moe/api/email_address", "https://auth.iwanaga.moe/api/email_address")]
         UserEmail = 2,
 
-        [ClaimNameAttribute("https://dev.iwanaga.moe/api/email_verified")]
+        [ClaimName("https://auth.dev.iwanaga.moe/api/email_verified", "https://auth.iwanaga.moe/api/email_verified")]
         IsEmailConfirmed = 3,
 
-        [ClaimNameAttribute("https://dev.iwanaga.moe/api/username")]
+        [ClaimName("https://auth.dev.iwanaga.moe/api/username", "https://auth.iwanaga.moe/api/username")]
         Username = 4,
 
-        [ClaimNameAttribute("https://dev.iwanaga.moe/api/id")]
+        [ClaimName("https://auth.dev.iwanaga.moe/api/id", "https://auth.iwanaga.moe/api/id")]
         UserId = 5
     }
 }

API/YABA.Common/Utils/EnvironmentUtils.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace YABA.Common.Utils
+{
+    public static class EnvironmentUtils
+    {
+        public static bool IsDevelopmentEnvironment() => Environment.GetEnvironmentVariable("ASPNETCORE_Environment") == "Development";
+    }
+}

Web/package.json

@@ -2,7 +2,6 @@
   "name": "yaba-web",
   "version": "0.1.0",
   "private": true,
-  "homepage": ".",
   "dependencies": {
     "@auth0/auth0-react": "^2.0.0",
     "@testing-library/jest-dom": "^5.16.5",

docker-compose.yaml

@@ -0,0 +1,38 @@
+version: "3"
+services:
+  web:
+    build:
+      context: ./Web
+      dockerfile: Dockerfile
+      args:
+        REACT_APP_API_BASE_URL: http://localhost:32270/api
+        REACT_APP_AUTH0_DOMAIN: iwanaga-dev.us.auth0.com
+        REACT_APP_AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}
+        REACT_APP_AUTH0_CALLBACK_URL: http://localhost:32271/redirect
+        REACT_APP_AUTH0_AUDIENCE: https://yaba.dev.iwanaga.moe
+    container_name: yaba_web
+    restart: unless-stopped
+    ports:
+      - 32271:80
+    depends_on:
+      - api
+  api:
+    build:
+      context: ./API
+      dockerfile: YABA.API/Dockerfile
+      args:
+        MODE: Debug
+    container_name: yaba_api
+    ports:
+      - 32270:80
+    environment:
+      ASPNETCORE_Environment: Development
+      ASPNETCORE_Authentication__Auth0__ClientId: ${AUTH0_CLIENT_ID}
+      ASPNETCORE_Authentication__Auth0__ClientSecret: ${AUTH0_CLIENT_SECRET}
+      ASPNETCORE_Authentication__Auth0__Domain: iwanaga-dev.us.auth0.com
+      ASPNETCORE_Authentication__Auth0__Identifier: https://yaba.dev.iwanaga.moe
+      ASPNETCORE_ConnectionStrings__YABAReadOnlyDbConnectionString: ${RO_CONNECTION_STRING}
+      ASPNETCORE_ConnectionStrings__YABAReadWriteDbConnectionString: ${RW_CONNECTION_STRING}
+      WebClient__Url: http://localhost:32271
+      Serilog__WriteTo__1__Args__Uri: https://loki.iwanaga.moe
+      Serilog__WriteTo__1__Args__Labels__1__Value: localhost