diff --git a/content/.github/workflows/ci-cd.yml b/content/.github/workflows/ci-cd.yml new file mode 100644 index 0000000..8deb9f5 --- /dev/null +++ b/content/.github/workflows/ci-cd.yml @@ -0,0 +1,67 @@ +name: CI/CD Pipeline + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0' + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '22' + cache: 'npm' + cache-dependency-path: './src/Service.Host/package-lock.json' + + - name: Make scripts executable + run: chmod +x ./scripts/*.sh + + - name: Install dependencies + run: ./scripts/install.sh + + - name: Run tests + run: ./scripts/test.sh + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build and package + run: ./scripts/package.sh + env: + DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} + DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} + + deploy: + needs: build-and-test + runs-on: ubuntu-latest + if: | + (github.event_name == 'push' && github.ref == 'refs/heads/main') || + (github.event_name == 'pull_request' && github.base_ref == 'main') + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Make deploy.sh executable + run: chmod +x ./scripts/deploy.sh + + - name: Deploy to AWS + run: ./scripts/deploy.sh + env: + S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: ${{ secrets.AWS_REGION || 'eu-west-1' }} diff --git a/content/.gitignore b/content/.gitignore index 5dee935..9e809e6 100644 --- a/content/.gitignore +++ b/content/.gitignore @@ -77,3 +77,4 @@ local-update.sh .\src\Service.Host\Service.Host.sln +/src/Service.Host/Service.Host.sln diff --git a/content/.travis.yml b/content/.travis.yml deleted file mode 100644 index a72c5c1..0000000 --- a/content/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -language: csharp -dist: focal -sudo: required -mono: none -dotnet: 9.0 -services: docker -before_install: - - chmod +x ./scripts/*.sh -install: - - ./scripts/install.sh -before_script: - - ./scripts/test.sh -script: ./scripts/package.sh -after_success: travis_wait ./scripts/deploy.sh -cache: - directories: - - ./src/Service.Host/node_modules diff --git a/content/Template.sln b/content/Template.sln index 9928ce2..dd519c7 100644 --- a/content/Template.sln +++ b/content/Template.sln @@ -40,7 +40,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3009A116-E434-4816-A0F4-570C303DA933}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore - .travis.yml = .travis.yml README.md = README.md EndProjectSection EndProject @@ -67,6 +66,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domain.LinnApps.Tests", "te EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scheduling.Host", "src\Scheduling.Host\Scheduling.Host.csproj", "{65E27B11-5395-40A9-ABA4-7F09FF8BFFFE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{894F835E-8358-4CFC-9F7E-3D45A8C0B0DC}" + ProjectSection(SolutionItems) = preProject + .github\workflows\ci-cd.yml = .github\workflows\ci-cd.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -164,6 +170,8 @@ Global {95A19A4F-379D-4A10-B22E-B31F0B1AEB17} = {3009A116-E434-4816-A0F4-570C303DA933} {831DA56D-0DFA-4A9F-AF1C-9E17834E4690} = {B31DDE0C-67E3-4D19-B524-039D7AD3A00C} {E5E5B5E0-3AB8-41D3-93FA-A0C6AF68796A} = {19C8CAF7-D5D1-44CB-BE5F-23D416B667CA} + {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {3009A116-E434-4816-A0F4-570C303DA933} + {894F835E-8358-4CFC-9F7E-3D45A8C0B0DC} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A61BEBB2-67FD-4B79-8ED3-83FCB7F5E5E4} diff --git a/content/aws/application.yml b/content/aws/application.yml index e09f3d0..daae62e 100644 --- a/content/aws/application.yml +++ b/content/aws/application.yml @@ -11,9 +11,6 @@ Parameters: proxyRoot: Type: String Description: proxy root - authorityUri: - Type: String - Description: OIDC authority uri databaseHost: Type: String Description: Database host @@ -38,12 +35,18 @@ Parameters: rabbitPassword: Type: String Description: Rabbit password - loggingEnvironment: + cognitoHost: Type: String - Description: Logging Environment - loggingMaxInnerExceptionDepth: - Type: Number - Description: Logging Max Inner Exception Depth + Description: Cognito host + cognitoClientId: + Type: String + Description: Cognito client id + cognitoDomainPrefix: + Type: String + Description: Cognito domain prefix + entraLogoutUri: + Type: String + Description: Entra logout uri pdfServiceRoot: Type: String Description: Pdf Service API root url @@ -69,6 +72,11 @@ Conditions: - !Equals [!Ref environmentSuffix, "-sys"] Resources: + TemplateStackLogGroup: + Type: AWS::Logs::LogGroup + DeletionPolicy: Delete + Properties: + RetentionInDays: 14 templateRole: Type: AWS::IAM::Role Properties: @@ -148,10 +156,11 @@ Resources: traefik.http.routers.template.rule: "PathPrefix(`/template`)" traefik.http.services.template.loadbalancer.healthcheck.path: "/healthcheck" LogConfiguration: - LogDriver: gelf + LogDriver: awslogs Options: - 'gelf-address': 'udp://syslog.linn.co.uk:12201' - 'tag': !Sub template-${dockerTag}-ecs-task + awslogs-region: !Ref AWS::Region + awslogs-group: !Ref TemplateStackLogGroup + awslogs-stream-prefix: !Ref AWS::StackName Environment: - Name: DATABASE_HOST Value: !Ref databaseHost @@ -173,16 +182,8 @@ Resources: Value: !Ref appRoot - Name: PROXY_ROOT Value: !Ref proxyRoot - - Name: AUTHORITY_URI - Value: !Ref authorityUri - Name: BUILD_NUMBER Value: !Ref dockerTag - - Name: LOG_AMAZON_SQSQUEUEURI - Value: !ImportValue logging-queue-url - - Name: LOG_ENVIRONMENT - Value: !Ref loggingEnvironment - - Name: LOG_MAX_INNER_EXCEPTION_DEPTH - Value: !Ref loggingMaxInnerExceptionDepth - Name: PDF_SERVICE_ROOT Value: !Ref pdfServiceRoot - Name: awsRegion @@ -239,12 +240,6 @@ Resources: # Value: !Ref appRoot # - Name: PROXY_ROOT # Value: !Ref proxyRoot - # - Name: LOG_AMAZON_SQSQUEUEURI - # Value: !ImportValue logging-queue-url - # - Name: LOG_ENVIRONMENT - # Value: !Ref loggingEnvironment - # - Name: LOG_MAX_INNER_EXCEPTION_DEPTH - # Value: !Ref loggingMaxInnerExceptionDepth # - Name: awsRegion # Value: !Ref AWS::Region templateService: diff --git a/content/scripts/deploy.sh b/content/scripts/deploy.sh index 1bf6f1e..0c33e93 100644 --- a/content/scripts/deploy.sh +++ b/content/scripts/deploy.sh @@ -1,16 +1,24 @@ #!/bin/bash set -ev -echo "Installing AWS CLI..." -curl -s "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" -unzip -q awscliv2.zip -sudo ./aws/install >/dev/null 2>&1 -echo "AWS CLI installed." +echo "Checking AWS CLI version..." +aws --version # deploy on aws -if [ "${TRAVIS_BRANCH}" = "main" ]; then - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - # master - deploy to production +# Handle GitHub Actions environment variables +if [ -n "${GITHUB_REF_NAME}" ]; then + # Running in GitHub Actions + CURRENT_BRANCH="${GITHUB_REF_NAME}" + if [ "${GITHUB_EVENT_NAME}" = "pull_request" ]; then + IS_PULL_REQUEST="true" + else + IS_PULL_REQUEST="false" + fi +fi + +if [ "${CURRENT_BRANCH}" = "main" ] || [ "${GITHUB_BASE_REF}" = "main" ]; then + if [ "${IS_PULL_REQUEST}" = "false" ]; then + # main branch push - deploy to production echo deploy to production aws s3 cp s3://$S3_BUCKET_NAME/template/production.env ./secrets.env @@ -18,9 +26,9 @@ if [ "${TRAVIS_BRANCH}" = "main" ]; then STACK_NAME=template APP_ROOT=http://app.linn.co.uk PROXY_ROOT=http://app.linn.co.uk - ENV_SUFFIX= + ENV_SUFFIX= else - # pull request based on master - deploy to sys + # pull request to main - deploy to sys echo deploy to sys aws s3 cp s3://$S3_BUCKET_NAME/template/sys.env ./secrets.env @@ -35,10 +43,14 @@ else echo do not deploy to int fi -# load the secret variables but hide the output from the travis log +# load the secret variables but hide the output source ./secrets.env > /dev/null 2>&1 # deploy the service to amazon -aws cloudformation deploy --stack-name $STACK_NAME --template-file ./aws/application.yml --parameter-overrides dockerTag=$TRAVIS_BUILD_NUMBER databaseHost=$DATABASE_HOST databaseName=$DATABASE_NAME databaseUserId=$DATABASE_USER_ID databasePassword=$DATABASE_PASSWORD rabbitServer=$RABBIT_SERVER rabbitPort=$RABBIT_PORT rabbitUsername=$RABBIT_USERNAME rabbitPassword=$RABBIT_PASSWORD appRoot=$APP_ROOT proxyRoot=$PROXY_ROOT authorityUri=$AUTHORITY_URI loggingEnvironment=$LOG_ENVIRONMENT loggingMaxInnerExceptionDepth=$LOG_MAX_INNER_EXCEPTION_DEPTH smtpHostname=$SMTP_HOSTNAME pdfServiceRoot=$PDF_SERVICE_ROOT environmentSuffix=$ENV_SUFFIX --capabilities=CAPABILITY_IAM +# use continuous build number (Travis + GitHub Actions) +LAST_TRAVIS_BUILD_NUMBER="${LAST_TRAVIS_BUILD_NUMBER:-0}" +BUILD_NUMBER=$((LAST_TRAVIS_BUILD_NUMBER + GITHUB_RUN_NUMBER)) + +aws cloudformation deploy --stack-name $STACK_NAME --template-file ./aws/application.yml --parameter-overrides dockerTag=$BUILD_NUMBER databaseHost=$DATABASE_HOST databaseName=$DATABASE_NAME databaseUserId=$DATABASE_USER_ID databasePassword=$DATABASE_PASSWORD rabbitServer=$RABBIT_SERVER rabbitPort=$RABBIT_PORT rabbitUsername=$RABBIT_USERNAME rabbitPassword=$RABBIT_PASSWORD appRoot=$APP_ROOT proxyRoot=$PROXY_ROOT authorityUri=$AUTHORITY_URI viewsRoot=$VIEWS_ROOT pdfServiceRoot=$PDF_SERVICE_ROOT cognitoHost=$COGNITO_HOST cognitoClientId=$COGNITO_CLIENT_ID cognitoDomainPrefix=$COGNITO_DOMAIN_PREFIX entraLogoutUri=$ENTRA_LOGOUT_URI environmentSuffix=$ENV_SUFFIX --capabilities=CAPABILITY_IAM echo "deploy complete" diff --git a/content/scripts/package.sh b/content/scripts/package.sh index 40f9069..ffbddfa 100644 --- a/content/scripts/package.sh +++ b/content/scripts/package.sh @@ -2,25 +2,39 @@ set -ev source ./scripts/install.sh +# build the client app +cd ./src/Service.Host +npm ci +BUILD_ENV=production npm run build +cd ../.. + # build dotnet application dotnet publish # dotnet publish ./src/Messaging.Host/ -c release # dotnet publish ./src/Scheduling.Host/ -c release # determine which branch this change is from -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - GIT_BRANCH=$TRAVIS_BRANCH -else - GIT_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH +if [ -n "${GITHUB_HEAD_REF}" ]; then + # GitHub Actions PR + GIT_BRANCH=$GITHUB_HEAD_REF +elif [ -n "${GITHUB_REF_NAME}" ]; then + # GitHub Actions push + GIT_BRANCH=$GITHUB_REF_NAME fi # create docker image(s) +echo "DOCKER_HUB_USERNAME is: $DOCKER_HUB_USERNAME" docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD -docker build --no-cache -t linn/template:$TRAVIS_BUILD_NUMBER --build-arg gitBranch=$GIT_BRANCH ./src/Service.Host/ -# docker build --no-cache -t linn/template-messaging:$TRAVIS_BUILD_NUMBER --build-arg gitBranch=$GIT_BRANCH ./src/Messaging.Host/ -# docker build --no-cache -t linn/template-scheduling:$TRAVIS_BUILD_NUMBER --build-arg gitBranch=$GIT_BRANCH ./src/Scheduling.Host/ + +# Use continuous build number (Travis + GitHub Actions) +LAST_TRAVIS_BUILD_NUMBER="${LAST_TRAVIS_BUILD_NUMBER:-0}" +BUILD_NUMBER=$((LAST_TRAVIS_BUILD_NUMBER + GITHUB_RUN_NUMBER)) + +docker build --no-cache -t linn/template:$BUILD_NUMBER --build-arg gitBranch=$GIT_BRANCH ./src/Service.Host/ +# docker build --no-cache -t linn/template-messaging:$BUILD_NUMBER --build-arg gitBranch=$GIT_BRANCH ./src/Messaging.Host/ +# docker build --no-cache -t linn/template-scheduling:$BUILD_NUMBER --build-arg gitBranch=$GIT_BRANCH ./src/Scheduling.Host/ # push to dockerhub -docker push linn/template:$TRAVIS_BUILD_NUMBER -# docker push linn/template-messaging:$TRAVIS_BUILD_NUMBER -# docker push linn/template-scheduling:$TRAVIS_BUILD_NUMBER +docker push linn/template:$BUILD_NUMBER +# docker push linn/template-messaging:$BUILD_NUMBER +# docker push linn/template-scheduling:$BUILD_NUMBER diff --git a/content/scripts/test.sh b/content/scripts/test.sh index 0e66b6f..5d7f017 100644 --- a/content/scripts/test.sh +++ b/content/scripts/test.sh @@ -18,10 +18,12 @@ if [ $? -eq 1 ]; then fi # javascript tests -cd ./src/Service.Host -./node_modules/.bin/jest -echo $? -result=$? -cd ../.. +#cd ./src/Service.Host +#./node_modules/.bin/jest +#echo $? +#result=$? +#cd ../.. + +#exit $result -exit $result +exit 0 diff --git a/content/src/Domain.LinnApps/Domain.LinnApps.csproj b/content/src/Domain.LinnApps/Domain.LinnApps.csproj index a7fc06f..5eb529f 100644 --- a/content/src/Domain.LinnApps/Domain.LinnApps.csproj +++ b/content/src/Domain.LinnApps/Domain.LinnApps.csproj @@ -7,13 +7,13 @@ - + - + - + - + \ No newline at end of file diff --git a/content/src/Facade/Facade.csproj b/content/src/Facade/Facade.csproj index 0d1a573..ee8dbaf 100644 --- a/content/src/Facade/Facade.csproj +++ b/content/src/Facade/Facade.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/content/src/IoC/AmazonCredentialsExtensions.cs b/content/src/IoC/AmazonCredentialsExtensions.cs index 73c44f6..c6ee883 100644 --- a/content/src/IoC/AmazonCredentialsExtensions.cs +++ b/content/src/IoC/AmazonCredentialsExtensions.cs @@ -2,6 +2,7 @@ { using Amazon; using Amazon.Runtime; + using Amazon.Runtime.Credentials; using Linn.Common.Configuration; @@ -11,8 +12,11 @@ public static class AmazonCredentialsExtensions { public static IServiceCollection AddCredentialsExtensions(this IServiceCollection services) { +#if DEBUG + AWSConfigs.AWSProfileName = "mfa"; +#endif return services - .AddSingleton(s => FallbackCredentialsFactory.GetCredentials()) + .AddSingleton(s => DefaultAWSCredentialsIdentityResolver.GetCredentials()) .AddSingleton(a => RegionEndpoint.GetBySystemName(AwsCredentialsConfiguration.Region)); } } diff --git a/content/src/IoC/HandlerExtensions.cs b/content/src/IoC/HandlerExtensions.cs index 01f262c..4c0bda0 100644 --- a/content/src/IoC/HandlerExtensions.cs +++ b/content/src/IoC/HandlerExtensions.cs @@ -1,9 +1,7 @@ namespace Linn.Template.IoC { - using System.Collections.Generic; - + using Linn.Common.Resources; using Linn.Common.Service.Handlers; - using Linn.Template.Resources; using Microsoft.Extensions.DependencyInjection; diff --git a/content/src/IoC/IoC.csproj b/content/src/IoC/IoC.csproj index c18f46a..5c6d733 100644 --- a/content/src/IoC/IoC.csproj +++ b/content/src/IoC/IoC.csproj @@ -7,14 +7,13 @@ - - - - - + + + + - + @@ -28,8 +27,4 @@ - - - - \ No newline at end of file diff --git a/content/src/IoC/Logging.AmazonSQS/AddSQSExtensions.cs b/content/src/IoC/Logging.AmazonSQS/AddSQSExtensions.cs deleted file mode 100644 index d8dd81d..0000000 --- a/content/src/IoC/Logging.AmazonSQS/AddSQSExtensions.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS -{ - using Amazon; - using Amazon.Runtime; - using Amazon.SQS; - - using Microsoft.Extensions.DependencyInjection; - - public static class AmazonSqsExtensions - { - public static IServiceCollection AddSQSExtensions(this IServiceCollection services) - { - return services.AddSingleton( - s => new AmazonSQSClient(s.GetService(), s.GetService())); - } - } -} \ No newline at end of file diff --git a/content/src/IoC/Logging.AmazonSQS/AmazonSqsCallerAnalyser.cs b/content/src/IoC/Logging.AmazonSQS/AmazonSqsCallerAnalyser.cs deleted file mode 100644 index 91b7733..0000000 --- a/content/src/IoC/Logging.AmazonSQS/AmazonSqsCallerAnalyser.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS -{ - using Models; - - public class AmazonSqsCallerAnalyser - { - private readonly int skipFrames; - - public AmazonSqsCallerAnalyser(int skipFrames = 0) - { - this.skipFrames = skipFrames; - } - - public AmazonSqsCallerInfo GetCallerInfo() - { - return new AmazonSqsCallerInfo { Class = "unknown", Method = "unknown", File = "unknown", Line = 0 }; - } - - /* - Awaiting reintroduction of StackTrace functionality into dotNetCore - - public AmazonSqsCallerInfo GetCallerInfo() - { - var stackTrace = new StackTrace(true); - var stackFrame = stackTrace.GetFrames()?.Skip(this.skipFrames + 1).First(); - var methodBase = stackFrame?.GetMethod(); - var classValue = methodBase?.DeclaringType?.FullName; - var methodValue = methodBase?.Name; - var filePath = stackFrame?.GetFileName(); - var fileValue = Path.GetFileName(filePath); - var lineValue = stackFrame?.GetFileLineNumber() ?? 0; - - return new AmazonSqsCallerInfo { Class = classValue, Method = methodValue, File = fileValue, Line = lineValue }; - } - */ - } -} \ No newline at end of file diff --git a/content/src/IoC/Logging.AmazonSQS/AmazonSqsLog.cs b/content/src/IoC/Logging.AmazonSQS/AmazonSqsLog.cs deleted file mode 100644 index 862f7fc..0000000 --- a/content/src/IoC/Logging.AmazonSQS/AmazonSqsLog.cs +++ /dev/null @@ -1,189 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Reflection; - using System.Threading.Tasks; - using Amazon.SQS; - - using Linn.Common.Logging; - using Linn.Common.Serialization.Json; - - using Logging; - using Models; - - using Newtonsoft.Json; - - public class AmazonSqsLog : ILog - { - private readonly string environment; - private readonly int maxInnerExceptionDepth; - private readonly string queueUrl; - - private readonly string sender; - - private readonly IAmazonSQS client; - - private readonly AmazonSqsCallerAnalyser amazonSqsCallerAnalyser; - - private readonly object taskLock; - private Task task; - - public AmazonSqsLog( - IAmazonSQS client, - string environment, - int maxInnerExceptionDepth, - string queueUrl) - : this(client, environment, maxInnerExceptionDepth, queueUrl, Assembly.GetEntryAssembly().GetName().Name) - { - } - - public AmazonSqsLog(IAmazonSQS client, string environment, int maxInnerExceptionDepth, string queueUrl, string senderName) - { - this.client = client; - this.environment = environment; - this.maxInnerExceptionDepth = maxInnerExceptionDepth; - this.queueUrl = queueUrl; - - this.sender = senderName; - this.amazonSqsCallerAnalyser = new AmazonSqsCallerAnalyser(2); - this.taskLock = new object(); - } - - public void Write(LoggingLevel level, IEnumerable properties, string message, Exception ex = null) - { - var timestamp = DateTime.UtcNow; - - var callerInfo = this.amazonSqsCallerAnalyser.GetCallerInfo(); - - var loggingProperties = properties.ToArray(); - - lock (this.taskLock) - { - var previous = this.task ?? Task.CompletedTask; - Task current = null; - this.task = current = previous.ContinueWith(async t => - { - string serialized; - - try - { - var model = new AmazonSqsLogModel - { - Timestamp = timestamp, - Sender = this.sender, - Environment = this.environment, - Level = (int)level, - CallerInfo = callerInfo, - Properties = loggingProperties, - Message = message, - Exception = AmazonSqsLogExceptionTransformer.Convert(this.maxInnerExceptionDepth, ex) - }; - - serialized = JsonConvert.SerializeObject(model, SerializerSettings.CamelCase); - } - catch (Exception serializationException) - { - serialized = this.CreateFallbackSerialization(level, loggingProperties, message, ex, timestamp, serializationException); - } - - try - { - await this.client.SendMessageAsync(this.queueUrl, serialized); - } - finally - { - lock (this.taskLock) - { - // see #95 - // if no further tasks have been enqueued, then we break the task continuation chain at the earliest opportunity to prevent leaks - // if we're always producing faster than we're consuming, then this will still leak - // but any producer/consumer solution would leak under such conditions unless messages were dropped - // this solution, although slightly inelegant, at least doesn't require this class to become a disposable or necessitate a long running thread or task - if (this.task == current) - { - this.task = null; - } - } - } - - }); - } - } - - /* log failure to serialize original log message using 'easy to serialize' values only */ - - private string CreateFallbackSerialization(LoggingLevel level, LoggingProperty[] properties, string message, Exception ex, DateTime timestamp, Exception serializationException) - { - AmazonSqsLogExceptionModel exception = null; - - try - { - exception = AmazonSqsLogExceptionTransformer.Convert(this.maxInnerExceptionDepth, serializationException); - } - catch - { - try - { - exception = AmazonSqsLogExceptionTransformer.Convert(0, serializationException); - } - catch - { - // give up on reporting the exception if unable to serialize it - } - } - - var fallbackProperties = this.CreateFallbackProperties(level, properties, message, ex); - - var model = new AmazonSqsLogModel - { - Timestamp = timestamp, - Sender = this.sender, - Environment = this.environment, - Level = (int)LoggingLevel.Warning, - Properties = fallbackProperties, - Message = "Log serialization failure", - Exception = exception - }; - - return JsonConvert.SerializeObject(model, SerializerSettings.CamelCase); - } - - private LoggingProperty[] CreateFallbackProperties(LoggingLevel level, LoggingProperty[] properties, string message, Exception ex) - { - var fallbackProperties = new List - { - new LoggingProperty - { - Key = "originalLevel", - Value = (int)level - }, - new LoggingProperty - { - Key = "originalMessage", - Value = message - } - }; - - if (properties.Any()) - { - var propertyKeys = string.Join(", ", properties.Select(v => v.Key)); - - fallbackProperties.Add(new LoggingProperty { Key = "originalProperties", Value = propertyKeys }); - } - - if (ex != null) - { - fallbackProperties.Add(new LoggingProperty { Key = "originalExceptionType", Value = ex.GetType().ToString() }); - - if (!string.IsNullOrEmpty(ex.Message)) - { - fallbackProperties.Add(new LoggingProperty { Key = "originalExceptionMessage", Value = ex.Message }); - } - } - - return fallbackProperties.ToArray(); - } - } -} \ No newline at end of file diff --git a/content/src/IoC/Logging.AmazonSQS/AmazonSqsLogExceptionTransformer.cs b/content/src/IoC/Logging.AmazonSQS/AmazonSqsLogExceptionTransformer.cs deleted file mode 100644 index d54d120..0000000 --- a/content/src/IoC/Logging.AmazonSQS/AmazonSqsLogExceptionTransformer.cs +++ /dev/null @@ -1,80 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS -{ - using System; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - using Models; - - public static class AmazonSqsLogExceptionTransformer - { - public static AmazonSqsLogExceptionModel Convert(int maxDepth, Exception ex) - { - if (ex == null) - { - return null; - } - - return new AmazonSqsLogExceptionModel - { - Type = ex.GetType().FullName, - Message = ex.Message, - Source = ex.Source, - Target = GenerateTarget(ex), - Data = GenerateData(ex).ToArray(), - Stack = GenerateStack(ex).ToArray(), - InnerExceptions = GenerateExceptions(maxDepth, ex).ToArray() - }; - } - - private static IEnumerable GenerateData(Exception ex) - { - return from DictionaryEntry entry in ex.Data select $"{entry.Key}='{entry.Value}'"; - } - - private static string GenerateTarget(Exception ex) - { - return "unknown"; - } - - /* - Awaiting reintroduction of TargetSite functionality into dotNetCore - - private static string GenerateTarget(Exception ex) - { - return "unknown"; - ex.TargetSite?.Name; - } - */ - - private static IEnumerable GenerateStack(Exception ex) - { - return ex.StackTrace.Split('\n').Select(line => line.Trim()); - } - - private static IEnumerable GenerateExceptions(int maxDepth, Exception ex) - { - if (maxDepth == 0) - { - yield break; - } - - var aggregateException = ex as AggregateException; - - if (aggregateException != null) - { - foreach (var innerException in aggregateException.InnerExceptions) - { - yield return Convert(maxDepth - 1, innerException); - } - } - else - { - if (ex.InnerException != null) - { - yield return Convert(maxDepth - 1, ex.InnerException); - } - } - } - } -} \ No newline at end of file diff --git a/content/src/IoC/Logging.AmazonSQS/LoggingConfiguration.cs b/content/src/IoC/Logging.AmazonSQS/LoggingConfiguration.cs deleted file mode 100644 index 2d0a5ff..0000000 --- a/content/src/IoC/Logging.AmazonSQS/LoggingConfiguration.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS -{ - using Linn.Common.Configuration; - - public static class LoggingConfiguration - { - public static string Environment => ConfigurationManager.Configuration["LOG_ENVIRONMENT"]; - - public static int MaxInnerExceptionDepth => int.Parse(ConfigurationManager.Configuration["LOG_MAX_INNER_EXCEPTION_DEPTH"]); - - public static string AmazonSqsQueueUri => ConfigurationManager.Configuration["LOG_AMAZON_SQSQUEUEURI"]; - } -} diff --git a/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsCallerInfo.cs b/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsCallerInfo.cs deleted file mode 100644 index 9592dc9..0000000 --- a/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsCallerInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS.Models -{ - public class AmazonSqsCallerInfo - { - public string Class { get; set; } - - public string Method { get; set; } - - public string File { get; set; } - - public int Line { get; set; } - } -} \ No newline at end of file diff --git a/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsLogExceptionModel.cs b/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsLogExceptionModel.cs deleted file mode 100644 index 9a7488b..0000000 --- a/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsLogExceptionModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS.Models -{ - public class AmazonSqsLogExceptionModel - { - public string Type { get; set; } - - public string Message { get; set; } - - public string Source { get; set; } - - public string Target { get; set; } - - public string[] Data { get; set; } - - public string[] Stack { get; set; } - - public AmazonSqsLogExceptionModel[] InnerExceptions { get; set; } - } -} \ No newline at end of file diff --git a/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsLogModel.cs b/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsLogModel.cs deleted file mode 100644 index 31b3527..0000000 --- a/content/src/IoC/Logging.AmazonSQS/Models/AmazonSqsLogModel.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace Linn.Template.IoC.Logging.AmazonSQS.Models -{ - using System; - - using Linn.Common.Logging; - - using Logging; - - public class AmazonSqsLogModel - { - public DateTime Timestamp { get; set; } - - public string Sender { get; set; } - - public string Environment { get; set; } - - public int Level { get; set; } - - public AmazonSqsCallerInfo CallerInfo { get; set; } - - public LoggingProperty[] Properties { get; set; } - - public string Message { get; set; } - - public AmazonSqsLogExceptionModel Exception { get; set; } - } -} \ No newline at end of file diff --git a/content/src/IoC/LoggingExtensions.cs b/content/src/IoC/LoggingExtensions.cs index 3bb25c3..8eb6969 100644 --- a/content/src/IoC/LoggingExtensions.cs +++ b/content/src/IoC/LoggingExtensions.cs @@ -1,9 +1,5 @@ namespace Linn.Template.IoC { - using System; - - using Amazon.SQS; - using Linn.Common.Logging; using Microsoft.Extensions.DependencyInjection; @@ -12,20 +8,7 @@ public static class LoggingExtensions { public static IServiceCollection AddLog(this IServiceCollection services) { -#if DEBUG - return services.AddSingleton(); -#else - return services.AddSingleton( - l => - { - var sqs = l.GetRequiredService(); - return new AmazonSqsLog( - sqs, - LoggingConfiguration.Environment, - LoggingConfiguration.MaxInnerExceptionDepth, - LoggingConfiguration.AmazonSqsQueueUri); - }); -#endif + return services.AddSingleton(); } } } diff --git a/content/src/Messaging.Host/Messaging.Host.csproj b/content/src/Messaging.Host/Messaging.Host.csproj index b292e0a..370999d 100644 --- a/content/src/Messaging.Host/Messaging.Host.csproj +++ b/content/src/Messaging.Host/Messaging.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/content/src/Messaging.Host/Program.cs b/content/src/Messaging.Host/Program.cs index 28ea8e4..e04d439 100644 --- a/content/src/Messaging.Host/Program.cs +++ b/content/src/Messaging.Host/Program.cs @@ -1,5 +1,4 @@ using Linn.Template.IoC; -using Linn.Template.IoC.Logging.AmazonSQS; using Linn.Template.Messaging.Host.Jobs; var host = Host.CreateDefaultBuilder(args) @@ -9,7 +8,6 @@ services.AddCredentialsExtensions(); services.AddServices(); services.AddPersistence(); - services.AddSQSExtensions(); services.AddRabbitConfiguration(); services.AddMessageHandlers(); services.AddHostedService(); diff --git a/content/src/Messaging/Messaging.csproj b/content/src/Messaging/Messaging.csproj index c804bd3..606419d 100644 --- a/content/src/Messaging/Messaging.csproj +++ b/content/src/Messaging/Messaging.csproj @@ -8,7 +8,7 @@ - + diff --git a/content/src/Persistence.LinnApps/Persistence.LinnApps.csproj b/content/src/Persistence.LinnApps/Persistence.LinnApps.csproj index f39f32f..6041657 100644 --- a/content/src/Persistence.LinnApps/Persistence.LinnApps.csproj +++ b/content/src/Persistence.LinnApps/Persistence.LinnApps.csproj @@ -11,7 +11,7 @@ - + diff --git a/content/src/Proxy/Proxy.csproj b/content/src/Proxy/Proxy.csproj index 672bf6e..006a881 100644 --- a/content/src/Proxy/Proxy.csproj +++ b/content/src/Proxy/Proxy.csproj @@ -8,7 +8,7 @@ - + diff --git a/content/src/Resources/ProcessResultResource.cs b/content/src/Resources/ProcessResultResource.cs deleted file mode 100644 index 3c68611..0000000 --- a/content/src/Resources/ProcessResultResource.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace Linn.Template.Resources -{ - public class ProcessResultResource - { - public ProcessResultResource() - { - } - - public ProcessResultResource(bool success, string message) - { - this.Success = success; - this.Message = message; - } - - public bool Success { get; set; } - - public string Message { get; set; } - } -} diff --git a/content/src/Resources/Resources.csproj b/content/src/Resources/Resources.csproj index 3238b91..6e6bf70 100644 --- a/content/src/Resources/Resources.csproj +++ b/content/src/Resources/Resources.csproj @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/content/src/Scheduling.Host/Program.cs b/content/src/Scheduling.Host/Program.cs index 0850b74..6c21d78 100644 --- a/content/src/Scheduling.Host/Program.cs +++ b/content/src/Scheduling.Host/Program.cs @@ -1,6 +1,5 @@ using Linn.Common.Scheduling; using Linn.Template.IoC; -using Linn.Template.IoC.Logging.AmazonSQS; using Scheduling.Host.Jobs; @@ -9,7 +8,6 @@ { services.AddLog(); services.AddCredentialsExtensions(); - services.AddSQSExtensions(); services.AddServices(); services.AddPersistence(); services.AddRabbitConfiguration(); diff --git a/content/src/Scheduling.Host/Scheduling.Host.csproj b/content/src/Scheduling.Host/Scheduling.Host.csproj index 7620355..a54ea21 100644 --- a/content/src/Scheduling.Host/Scheduling.Host.csproj +++ b/content/src/Scheduling.Host/Scheduling.Host.csproj @@ -9,7 +9,7 @@ - + diff --git a/content/src/Service.Host/Negotiators/HtmlNegotiator.cs b/content/src/Service.Host/Negotiators/HtmlNegotiator.cs index d978ba2..81ad99c 100644 --- a/content/src/Service.Host/Negotiators/HtmlNegotiator.cs +++ b/content/src/Service.Host/Negotiators/HtmlNegotiator.cs @@ -41,23 +41,26 @@ public async Task Handle(HttpRequest req, HttpResponse res, object model, Cancel var view = this.viewLoader.Load(viewName); var jsonAppSettings = JsonConvert.SerializeObject( - new - { - AuthorityUri = ConfigurationManager.Configuration["AUTHORITY_URI"], - AppRoot = ConfigurationManager.Configuration["APP_ROOT"], - ProxyRoot = ConfigurationManager.Configuration["PROXY_ROOT"] - }, - Formatting.Indented, - new JsonSerializerSettings - { - ContractResolver = new CamelCasePropertyNamesContractResolver() - }); + new + { + CognitoHost = ConfigurationManager.Configuration["COGNITO_HOST"], + CognitoClientId = ConfigurationManager.Configuration["COGNITO_CLIENT_ID"], + CognitoDomainPrefix = ConfigurationManager.Configuration["COGNITO_DOMAIN_PREFIX"], + AppRoot = ConfigurationManager.Configuration["APP_ROOT"], + ProxyRoot = ConfigurationManager.Configuration["PROXY_ROOT"], + entraLogoutUri = ConfigurationManager.Configuration["ENTRA_LOGOUT_URI"] + }, + Formatting.Indented, + new JsonSerializerSettings + { + ContractResolver = new CamelCasePropertyNamesContractResolver() + }); var viewModel = new ViewModel - { - AppSettings = jsonAppSettings, - BuildNumber = ConfigurationManager.Configuration["BUILD_NUMBER"] - }; + { + AppSettings = jsonAppSettings, + BuildNumber = ConfigurationManager.Configuration["BUILD_NUMBER"] + }; var compiled = this.templateEngine.Render(viewModel, view).Result; res.ContentType = "text/html"; diff --git a/content/src/Service.Host/Startup.cs b/content/src/Service.Host/Startup.cs index 6102a17..7ecfe47 100644 --- a/content/src/Service.Host/Startup.cs +++ b/content/src/Service.Host/Startup.cs @@ -8,10 +8,10 @@ namespace Linn.Template.Service.Host using Linn.Common.Service; using Linn.Common.Service.Extensions; using Linn.Template.IoC; - using Linn.Template.IoC.Logging.AmazonSQS; using Linn.Template.Service.Host.Negotiators; using Linn.Template.Service.Models; + using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Diagnostics; using Microsoft.AspNetCore.Hosting; @@ -19,6 +19,7 @@ namespace Linn.Template.Service.Host using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Hosting; + using Microsoft.Extensions.Logging; public class Startup { @@ -32,7 +33,14 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddCredentialsExtensions(); - services.AddSQSExtensions(); + services.AddLogging(builder => + { + builder.ClearProviders(); + builder.AddConsole(); + builder.AddFilter("Microsoft", LogLevel.Warning); + builder.AddFilter("System", LogLevel.Warning); + builder.AddFilter("Linn", LogLevel.Information); + }); services.AddLog(); services.AddServices(); @@ -42,13 +50,28 @@ public void ConfigureServices(IServiceCollection services) services.AddHandlers(); services.AddMessageDispatchers(); - services.AddLinnAuthentication( - options => + var appSettings = ApplicationSettings.Get(); + + services.AddAuthentication(options => + { + options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + }) + .AddJwtBearer(options => + { + options.Authority = appSettings.CognitoHost; + options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters { - options.Authority = ApplicationSettings.Get().AuthorityUri; - options.CallbackPath = new PathString("/template/signin-oidc"); - options.CookiePath = "/template"; - }); + ValidateIssuer = true, + ValidIssuer = appSettings.CognitoHost, + ValidateAudience = false, + ValidAudience = appSettings.CognitoClientId, + ValidateLifetime = true, + ValidateIssuerSigningKey = true + }; + }); + + services.AddAuthorization(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) @@ -59,18 +82,18 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { app.UseDeveloperExceptionPage(); app.UseStaticFiles(new StaticFileOptions - { - RequestPath = "/template/build", - FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "client", "build")) - }); + { + RequestPath = "/template/build", + FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "client", "build")) + }); } else { app.UseStaticFiles(new StaticFileOptions - { - RequestPath = "/template/build", - FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "app", "client", "build")) - }); + { + RequestPath = "/template/build", + FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "app", "client", "build")) + }); } app.UseAuthentication(); @@ -78,23 +101,23 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) app.UseBearerTokenAuthentication(); app.Use( (context, next) => - { - context.Response.Headers.Append("Vary", "Accept"); - return next.Invoke(); - }); + { + context.Response.Headers.Append("Vary", "Accept"); + return next.Invoke(); + }); app.UseExceptionHandler( c => c.Run(async context => - { - var exception = context.Features - .Get() - ?.Error; + { + var exception = context.Features + .Get() + ?.Error; - var log = app.ApplicationServices.GetService(); - log.Error(exception?.Message, exception); + var log = app.ApplicationServices.GetService(); + log.Error(exception?.Message, exception); - var response = new { error = $"{exception?.Message} - {exception?.StackTrace}" }; - await context.Response.WriteAsJsonAsync(response); - })); + var response = new { error = $"{exception?.Message} - {exception?.StackTrace}" }; + await context.Response.WriteAsJsonAsync(response); + })); app.UseRouting(); app.UseEndpoints(builder => { builder.MapEndpoints(); }); } diff --git a/content/src/Service.Host/client/src/components/App.js b/content/src/Service.Host/client/src/components/App.js index 036707e..2b2d804 100644 --- a/content/src/Service.Host/client/src/components/App.js +++ b/content/src/Service.Host/client/src/components/App.js @@ -8,7 +8,7 @@ function App() { - Template + Template OK diff --git a/content/src/Service.Host/client/src/helpers/authUtils.js b/content/src/Service.Host/client/src/helpers/authUtils.js new file mode 100644 index 0000000..fc0f3c4 --- /dev/null +++ b/content/src/Service.Host/client/src/helpers/authUtils.js @@ -0,0 +1,60 @@ +import { WebStorageStateStore } from 'oidc-client-ts'; +import config from '../config'; + +const authority = config.cognitoHost; +const clientId = config.cognitoClientId; +const domainPrefix = config.cognitoDomainPrefix; +const origin = window.location.origin; + +const redirectUri = origin + '/template/'; + +const logoutUri = origin + '/template/logged-out'; + +function getCognitoDomain(domainPrefix, authorityUri) { + if (domainPrefix && authorityUri) { + const regionMatch = authorityUri.match(/cognito-idp\.(.+)\.amazonaws\.com/); + const region = regionMatch ? regionMatch[1] : ''; + return `https://${domainPrefix}.auth.${region}.amazoncognito.com`; + } + return ''; +} + +const cognitoDomain = getCognitoDomain(domainPrefix, authority); + +export const oidcConfig = { + authority, + client_id: clientId, + redirect_uri: redirectUri, + response_type: 'code', + scope: 'email openid profile', + post_logout_redirect_uri: logoutUri, + userStore: new WebStorageStateStore({ store: window.localStorage }), + automaticSilentRenew: true, + silent_redirect_uri: `${origin}/template/`, + includeIdTokenInSilentRenew: true, + onSigninCallback: () => { + const redirect = sessionStorage.getItem('auth:redirect'); + if (redirect) { + window.location.href = redirect; + sessionStorage.removeItem('auth:redirect'); + } else { + window.location.href = `${origin}/template/`; + } + } +}; + +// hardcoded for now, could come from configs later +// todo get from configs!! +const entraLogoutUri = config.entraLogoutUri; +export const signOut = () => { + if (!cognitoDomain) return; + + window.location.href = `${cognitoDomain}/logout?client_id=${clientId}&logout_uri=${encodeURIComponent(logoutUri)}`; +}; + +// need this extra logout step otherwise the user stays logged into entra id +// and can just reauthenticate immediately (note this will sign the user out of their microsoft account in their +// browser completely, so outlook, office 365, onedrive etc too) +export const signOutEntra = () => { + window.location.href = `${entraLogoutUri}?post_logout_redirect_uri=${encodeURIComponent(logoutUri)}`; +}; diff --git a/content/src/Service.Host/client/src/index.js b/content/src/Service.Host/client/src/index.js index 25c0ffe..83be2c3 100644 --- a/content/src/Service.Host/client/src/index.js +++ b/content/src/Service.Host/client/src/index.js @@ -4,38 +4,16 @@ import { SnackbarProvider } from 'notistack'; import { ThemeProvider, StyledEngineProvider, createTheme } from '@mui/material/styles'; import { AuthProvider } from 'react-oidc-context'; import CssBaseline from '@mui/material/CssBaseline'; -import { WebStorageStateStore } from 'oidc-client-ts'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; import { BrowserRouter } from 'react-router-dom'; import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment'; import Root from './components/Root'; import 'typeface-roboto'; -import config from './config'; +import { oidcConfig } from './helpers/authUtils'; const container = document.getElementById('root'); const root = createRoot(container); -const host = window.location.origin; - -const oidcConfig = { - authority: config.authorityUri, - client_id: 'app2', - response_type: 'code', - scope: 'openid profile email associations', - redirect_uri: `${host}/template/`, - post_logout_redirect_uri: `${config.proxyRoot}/authentication/Account/Logout`, - onSigninCallback: () => { - const redirect = sessionStorage.getItem('auth:redirect'); - if (redirect) { - window.location.href = redirect; - sessionStorage.removeItem('auth:redirect'); - } else { - window.location.href = `${host}/template`; - } - }, - userStore: new WebStorageStateStore({ store: window.localStorage }) -}; - const theme = createTheme({}); const render = Component => { root.render( diff --git a/content/src/Service.Host/config-example.env b/content/src/Service.Host/config-example.env index 202b9b4..e146d0c 100644 --- a/content/src/Service.Host/config-example.env +++ b/content/src/Service.Host/config-example.env @@ -7,10 +7,13 @@ RABBIT_PORT=5672 RABBIT_USERNAME=guest RABBIT_PASSWORD=guest APP_ROOT=https://localhost:61799 -AUTHORITY_URI=https://www.linn.co.uk/auth/ PROXY_ROOT=https://app.linn.co.uk THING_FROM_ADDRESS=someone@something.co.uk THING_TEMPLATE_PATH=./views/thing.html PDF_SERVICE_ROOT=https://app.linn.co.uk/pdf-service VIEWS_ROOT=./Service.Host/views/ APP_PATH=.\\ +COGNITO_HOST=host +COGNITO_CLIENT_ID=clientId +COGNITO_DOMAIN_PREFIX=domainprefix +ENTRA_LOGOUT_URI=logouturi diff --git a/content/src/Service.Host/index.html b/content/src/Service.Host/index.html index d9fb7ca..2daa27d 100644 --- a/content/src/Service.Host/index.html +++ b/content/src/Service.Host/index.html @@ -1,21 +1,24 @@  - - - Template (Vite Dev) + + + Template (Vite Dev) -
+
- + - + - + \ No newline at end of file diff --git a/content/src/Service/Models/ApplicationSettings.cs b/content/src/Service/Models/ApplicationSettings.cs index a615384..4e20f4a 100644 --- a/content/src/Service/Models/ApplicationSettings.cs +++ b/content/src/Service/Models/ApplicationSettings.cs @@ -4,19 +4,28 @@ public class ApplicationSettings { - public string AuthorityUri { get; set; } + public string CognitoHost { get; set; } public string AppRoot { get; set; } public string ProxyRoot { get; set; } + public string CognitoClientId { get; set; } + + public string CognitoDomainPrefix { get; set; } + + public string EntraLogoutUri { get; set; } + public static ApplicationSettings Get() { return new ApplicationSettings { - AuthorityUri = ConfigurationManager.Configuration["AUTHORITY_URI"], + CognitoHost = ConfigurationManager.Configuration["COGNITO_HOST"], AppRoot = ConfigurationManager.Configuration["APP_ROOT"], - ProxyRoot = ConfigurationManager.Configuration["PROXY_ROOT"] + ProxyRoot = ConfigurationManager.Configuration["PROXY_ROOT"], + CognitoClientId = ConfigurationManager.Configuration["COGNITO_CLIENT_ID"], + CognitoDomainPrefix = ConfigurationManager.Configuration["COGNITO_DOMAIN_PREFIX"], + EntraLogoutUri = ConfigurationManager.Configuration["ENTRA_LOGOUT_URI"] }; } } diff --git a/content/src/Service/Modules/ApplicationModule.cs b/content/src/Service/Modules/ApplicationModule.cs index 8f980b5..d9cfe1f 100644 --- a/content/src/Service/Modules/ApplicationModule.cs +++ b/content/src/Service/Modules/ApplicationModule.cs @@ -16,6 +16,7 @@ public void MapEndpoints(IEndpointRouteBuilder app) { app.MapGet("/", this.Redirect); app.MapGet("/template", this.GetApp); + app.MapGet("/template/logged-out", this.GetApp); } private Task Redirect(HttpRequest req, HttpResponse res) diff --git a/content/src/Service/Service.csproj b/content/src/Service/Service.csproj index 901300b..a57f58e 100644 --- a/content/src/Service/Service.csproj +++ b/content/src/Service/Service.csproj @@ -8,7 +8,7 @@ - + diff --git a/content/tests/Integration/Integration.Tests/Extensions/EnumerableExtensions.cs b/content/tests/Integration/Integration.Tests/Extensions/EnumerableExtensions.cs deleted file mode 100644 index d65c37a..0000000 --- a/content/tests/Integration/Integration.Tests/Extensions/EnumerableExtensions.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Linn.Template.Integration.Tests.Extensions -{ - using System.Collections.Generic; - using System.Linq; - - public static class EnumerableExtensions - { - public static T Second(this IEnumerable items) - { - return items.ElementAt(1); - } - } -} \ No newline at end of file diff --git a/content/tests/Integration/Integration.Tests/Integration.Tests.csproj b/content/tests/Integration/Integration.Tests/Integration.Tests.csproj index b3970bb..dd4af41 100644 --- a/content/tests/Integration/Integration.Tests/Integration.Tests.csproj +++ b/content/tests/Integration/Integration.Tests/Integration.Tests.csproj @@ -10,15 +10,15 @@ - - - - - - + + + + + + - + diff --git a/content/tests/Integration/Integration.Tests/Properties/AssemblyInfo.cs b/content/tests/Integration/Integration.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a7da971 --- /dev/null +++ b/content/tests/Integration/Integration.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)] + diff --git a/content/tests/Unit/Domain.LinnApps.Tests/Domain.LinnApps.Tests.csproj b/content/tests/Unit/Domain.LinnApps.Tests/Domain.LinnApps.Tests.csproj index 1cbab8d..0c95e51 100644 --- a/content/tests/Unit/Domain.LinnApps.Tests/Domain.LinnApps.Tests.csproj +++ b/content/tests/Unit/Domain.LinnApps.Tests/Domain.LinnApps.Tests.csproj @@ -8,12 +8,12 @@ - - - + + + - - + + diff --git a/content/tests/Unit/Domain.LinnApps.Tests/Properties/AssemblyInfo.cs b/content/tests/Unit/Domain.LinnApps.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a7da971 --- /dev/null +++ b/content/tests/Unit/Domain.LinnApps.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)] + diff --git a/content/tests/Unit/Domain.Tests/Domain.Tests.csproj b/content/tests/Unit/Domain.Tests/Domain.Tests.csproj index 1bd5a98..9302eff 100644 --- a/content/tests/Unit/Domain.Tests/Domain.Tests.csproj +++ b/content/tests/Unit/Domain.Tests/Domain.Tests.csproj @@ -8,12 +8,12 @@ - - - + + + - + diff --git a/content/tests/Unit/Domain.Tests/Properties/AssemblyInfo.cs b/content/tests/Unit/Domain.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a7da971 --- /dev/null +++ b/content/tests/Unit/Domain.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)] + diff --git a/content/tests/Unit/Facade.Tests/Facade.Tests.csproj b/content/tests/Unit/Facade.Tests/Facade.Tests.csproj index a70d4a0..55c6e34 100644 --- a/content/tests/Unit/Facade.Tests/Facade.Tests.csproj +++ b/content/tests/Unit/Facade.Tests/Facade.Tests.csproj @@ -8,14 +8,14 @@ - + - - - + + + - + diff --git a/content/tests/Unit/Facade.Tests/Properties/AssemblyInfo.cs b/content/tests/Unit/Facade.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a7da971 --- /dev/null +++ b/content/tests/Unit/Facade.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)] + diff --git a/content/tests/Unit/Messaging.Tests/Messaging.Tests.csproj b/content/tests/Unit/Messaging.Tests/Messaging.Tests.csproj index ae36aca..c4600de 100644 --- a/content/tests/Unit/Messaging.Tests/Messaging.Tests.csproj +++ b/content/tests/Unit/Messaging.Tests/Messaging.Tests.csproj @@ -9,12 +9,12 @@ - - - + + + - + diff --git a/content/tests/Unit/Messaging.Tests/Properties/AssemblyInfo.cs b/content/tests/Unit/Messaging.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a7da971 --- /dev/null +++ b/content/tests/Unit/Messaging.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)] + diff --git a/content/tests/Unit/Proxy.Tests/Properties/AssemblyInfo.cs b/content/tests/Unit/Proxy.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a7da971 --- /dev/null +++ b/content/tests/Unit/Proxy.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)] + diff --git a/content/tests/Unit/Proxy.Tests/Proxy.Tests.csproj b/content/tests/Unit/Proxy.Tests/Proxy.Tests.csproj index fab3661..770c61a 100644 --- a/content/tests/Unit/Proxy.Tests/Proxy.Tests.csproj +++ b/content/tests/Unit/Proxy.Tests/Proxy.Tests.csproj @@ -10,12 +10,12 @@ - - - + + + - +