diff --git a/MidrandBooksApi/MidrandBooksApi.csproj b/MidrandBooksApi/MidrandBooksApi.csproj index 29875d3..39ba643 100644 --- a/MidrandBooksApi/MidrandBooksApi.csproj +++ b/MidrandBooksApi/MidrandBooksApi.csproj @@ -54,13 +54,13 @@ - + - + diff --git a/MidrandBooksApi/Program.cs b/MidrandBooksApi/Program.cs index 8a39b41..cecd562 100644 --- a/MidrandBooksApi/Program.cs +++ b/MidrandBooksApi/Program.cs @@ -12,7 +12,7 @@ builder.Services.AddEndpoints(Assembly.GetExecutingAssembly()); builder.Services.AddApiServices(builder.Configuration); builder.Services.AddMediator(); -builder.Services.AddAuthentikApiSecurity(builder.Configuration); +builder.Services.AddLiteCharmsApiSecurity(builder.Configuration); builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>)); builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>)); diff --git a/MidrandBooksApi/appsettings.json b/MidrandBooksApi/appsettings.json index 09b745b..d92aca2 100644 --- a/MidrandBooksApi/appsettings.json +++ b/MidrandBooksApi/appsettings.json @@ -1,10 +1,7 @@ { - "AuthentikSettings": { - "Authority": "https://id.khongisa.co.za/application/o/midrand-books-api-uat/", - "IntrospectionEndpoint": "https://id.khongisa.co.za/application/o/introspect/", - "RequiredClaimName": "scope", - "RequiredClaimNameValue": "openid", - "RequireHttpsMetadata": true + "LiteCharmsSettings": { + "Authority": "https://sts.security.khongisa.co.za", + "Audience": "midrandbooks-api" }, "ValidPayfastHosts": [ "www.payfast.co.za", diff --git a/midrandbooksapi-uat.yml b/midrandbooksapi-uat.yml index c220c53..56b7fc6 100644 --- a/midrandbooksapi-uat.yml +++ b/midrandbooksapi-uat.yml @@ -26,11 +26,8 @@ data: ValidPayfastHosts__4: "ips.payfast.co.za" ValidPayfastHosts__5: "api.payfast.co.za" ValidPayfastHosts__6: "payment.payfast.io" - AuthentikSettings__Authority: "https://id.khongisa.co.za/application/o/midrand-books-api-uat/" - AuthentikSettings__IntrospectionEndpoint: "https://id.khongisa.co.za/application/o/introspect/" - AuthentikSettings__RequiredClaimName: "scope" - AuthentikSettings__RequiredClaimNameValue: "openid" - AuthentikSettings__RequireHttpsMetadata: "true" + LiteCharmsSettings__Authority: "https://sts.security.khongisa.co.za" + LiteCharmsSettings__Audience: "midrandbooks-api" --- apiVersion: v1 kind: Secret @@ -46,8 +43,8 @@ data: hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8= bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY= bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ== - authentik-clientid: aTZ5Z3I4NEhsbmh4RllxTEpWSjJIaGRsVnJPWUU0UG51clQ1Y1BRVw== - authentik-clientsecret: dHZQVU0zVnFmazJzcmE5OXM5bE4zWWxpMHlsYUdUNnZiUUJxZkg3S3ZTSWJUZUo2ZFpHQjEyTlc0TXhxRERXSmV4UDd2WGZqVEFadFIzajNpdkQ2Y1RKcjV4UTlTNHJwRm5TZlk0Rmk2OVJOd1J2S0hqOGhWcmQzd29icTZPREc= + litecharms-clientid: bWlkcmFuZGJvb2tzLWFwaQ== + litecharms-clientsecret: c2VjcmV0X2YzZjA0YWNhYTMzNmVlOTEzZDRjNjdlYmQwOTE1ZWFlYzQ0NzdmYTkwOTdlYTJhYzkyZGE4ZDc0NjgzZTAyNTU= --- apiVersion: v1 kind: PersistentVolumeClaim @@ -100,16 +97,16 @@ spec: - configMapRef: name: midrandbooksapi-config env: - - name: AuthentikSettings__ClientId + - name: LiteCharmsSettings__ClientId valueFrom: secretKeyRef: name: midrandbooksapi-secrets - key: authentik-clientid - - name: AuthentikSettings__ClientSecret + key: litecharms-clientid + - name: LiteCharmsSettings__ClientSecret valueFrom: secretKeyRef: name: midrandbooksapi-secrets - key: authentik-clientsecret + key: litecharms-clientsecret - name: BookshopS3Settings__AccessKey valueFrom: secretKeyRef: