From 54dc06edb16f8d03a9abed3d3fedab3abfd15d96 Mon Sep 17 00:00:00 2001
From: James Elliott <james-d-elliott@users.noreply.github.com>
Date: Fri, 9 Jul 2021 20:09:09 +1000
Subject: [PATCH] feat(authelia): prepare for 4.30.0 (#80)

---
 charts/authelia/Chart.yaml               |  2 +-
 charts/authelia/README.md                |  2 +-
 charts/authelia/templates/configMap.yaml | 15 +++++++++++++++
 charts/authelia/values.local.yaml        |  8 ++++++++
 charts/authelia/values.yaml              | 10 +++++++++-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/charts/authelia/Chart.yaml b/charts/authelia/Chart.yaml
index f217a4a..2e262a5 100644
--- a/charts/authelia/Chart.yaml
+++ b/charts/authelia/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: authelia
-version: 0.4.13
+version: 0.4.14
 kubeVersion: ">= 1.13.0-0"
 description: Authelia is a Single Sign-On Multi-Factor portal for web apps
 type: application
diff --git a/charts/authelia/README.md b/charts/authelia/README.md
index 2931411..8eb8f45 100644
--- a/charts/authelia/README.md
+++ b/charts/authelia/README.md
@@ -117,7 +117,7 @@ The `*` below can be one of any of the following values:
 |secret.labels                 |A map of extra labels to add to the Secret             |{}                     |
 |secret.existingSecret         |The name of the existing Secret instead of generating  |nil                    |
 |secret.mountPath              |The path where to mount all of the secrets             |/secrets               |
-|secret.*.key                  |The key in the secret where the JWT token is stored    |varies                 |
+|secret.*.key                  |The key in the secret where the secret value is stored |varies                 |
 |secret.*.value                |The value to inject into this secret when generating   |nil                    |
 |secret.*.filename             |The filename of this secret within the mountPath       |varies                 |
 
diff --git a/charts/authelia/templates/configMap.yaml b/charts/authelia/templates/configMap.yaml
index 1d91ae6..e3f0088 100644
--- a/charts/authelia/templates/configMap.yaml
+++ b/charts/authelia/templates/configMap.yaml
@@ -154,6 +154,21 @@ data:
     {{- if .Values.configMap.identity_providers.oidc.enabled }}
     identity_providers:
       oidc:
+        {{- if hasKey .Values.configMap.identity_providers.oidc "access_token_lifespan" }}
+        access_token_lifespan: {{ .Values.configMap.identity_providers.oidc.access_token_lifespan }}
+        {{- end }}
+        {{- if hasKey .Values.configMap.identity_providers.oidc "authorize_code_lifespan" }}
+        authorize_code_lifespan: {{ .Values.configMap.identity_providers.oidc.authorize_code_lifespan }}
+        {{- end }}
+        {{- if hasKey .Values.configMap.identity_providers.oidc "id_token_lifespan" }}
+        id_token_lifespan: {{ .Values.configMap.identity_providers.oidc.id_token_lifespan }}
+        {{- end }}
+        {{- if hasKey .Values.configMap.identity_providers.oidc "refresh_token_lifespan" }}
+        refresh_token_lifespan: {{ .Values.configMap.identity_providers.oidc.refresh_token_lifespan }}
+        {{- end }}
+        {{- if hasKey .Values.configMap.identity_providers.oidc "enable_client_debug_messages" }}
+        enable_client_debug_messages: {{ .Values.configMap.identity_providers.oidc.enable_client_debug_messages }}
+        {{- end }}
         clients:
     {{- range $client := .Values.configMap.identity_providers.oidc.clients }}
         - id: {{ $client.id }}
diff --git a/charts/authelia/values.local.yaml b/charts/authelia/values.local.yaml
index 8344345..0c8b365 100644
--- a/charts/authelia/values.local.yaml
+++ b/charts/authelia/values.local.yaml
@@ -904,6 +904,14 @@ configMap:
     oidc:
       ## Enables this in the config map. Currently in beta stage.
       enabled: false
+
+      # access_token_lifespan: 1h
+      # authorize_code_lifespan: 1m
+      # id_token_lifespan: 1h
+      # refresh_token_lifespan: 720h
+
+      # enable_client_debug_messages: false
+
       clients: []
       # - id: myapp
         # description: My Application
diff --git a/charts/authelia/values.yaml b/charts/authelia/values.yaml
index 4611d79..351aa53 100644
--- a/charts/authelia/values.yaml
+++ b/charts/authelia/values.yaml
@@ -901,7 +901,15 @@ configMap:
   identity_providers:
     oidc:
       ## Enables this in the config map. Currently in beta stage.
-      enabled: false
+      enabled: true
+
+      # access_token_lifespan: 1h
+      # authorize_code_lifespan: 1m
+      # id_token_lifespan: 1h
+      # refresh_token_lifespan: 720h
+
+      # enable_client_debug_messages: false
+
       clients: []
       # - id: myapp
         # description: My Application