Merge branch 'master' into stage-challenge

# Conflicts:
#	web/package-lock.json

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2021.2.5-stable
+current_version = 2021.2.6-stable
 tag = True
 commit = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-(?P<release>.*)

.github/workflows/release.yml

@@ -18,11 +18,11 @@ jobs:
       - name: Building Docker Image
         run: docker build
           --no-cache
-          -t beryju/authentik:2021.2.5-stable
+          -t beryju/authentik:2021.2.6-stable
           -t beryju/authentik:latest
           -f Dockerfile .
       - name: Push Docker Container to Registry (versioned)
-        run: docker push beryju/authentik:2021.2.5-stable
+        run: docker push beryju/authentik:2021.2.6-stable
       - name: Push Docker Container to Registry (latest)
         run: docker push beryju/authentik:latest
   build-proxy:
@@ -48,11 +48,11 @@ jobs:
           cd outpost/
           docker build \
           --no-cache \
-          -t beryju/authentik-proxy:2021.2.5-stable \
+          -t beryju/authentik-proxy:2021.2.6-stable \
           -t beryju/authentik-proxy:latest \
           -f proxy.Dockerfile .
       - name: Push Docker Container to Registry (versioned)
-        run: docker push beryju/authentik-proxy:2021.2.5-stable
+        run: docker push beryju/authentik-proxy:2021.2.6-stable
       - name: Push Docker Container to Registry (latest)
         run: docker push beryju/authentik-proxy:latest
   build-static:
@@ -69,11 +69,11 @@ jobs:
           cd web/
           docker build \
           --no-cache \
-          -t beryju/authentik-static:2021.2.5-stable \
+          -t beryju/authentik-static:2021.2.6-stable \
           -t beryju/authentik-static:latest \
           -f Dockerfile .
       - name: Push Docker Container to Registry (versioned)
-        run: docker push beryju/authentik-static:2021.2.5-stable
+        run: docker push beryju/authentik-static:2021.2.6-stable
       - name: Push Docker Container to Registry (latest)
         run: docker push beryju/authentik-static:latest
   test-release:
@@ -107,5 +107,5 @@ jobs:
           SENTRY_PROJECT: authentik
           SENTRY_URL: https://sentry.beryju.org
         with:
-          tagName: 2021.2.5-stable
+          tagName: 2021.2.6-stable
           environment: beryjuorg-prod

authentik/__init__.py

@@ -1,2 +1,2 @@
 """authentik"""
-__version__ = "2021.2.5-stable"
+__version__ = "2021.2.6-stable"

authentik/outposts/api/outposts.py

@@ -59,6 +59,7 @@ class OutpostViewSet(ModelViewSet):
         "name",
         "providers__name",
     ]
+    ordering = ["name"]
 
     @swagger_auto_schema(responses={200: OutpostHealthSerializer(many=True)})
     @action(methods=["GET"], detail=True)

authentik/providers/proxy/api.py

@@ -67,6 +67,7 @@ class ProxyProviderViewSet(ModelViewSet):
 
     queryset = ProxyProvider.objects.all()
     serializer_class = ProxyProviderSerializer
+    ordering = ["name"]
 
 
 class ProxyOutpostConfigSerializer(ModelSerializer):
@@ -115,3 +116,4 @@ class ProxyOutpostConfigViewSet(ModelViewSet):
 
     queryset = ProxyProvider.objects.filter(application__isnull=False)
     serializer_class = ProxyOutpostConfigSerializer
+    ordering = ["name"]

docker-compose.yml

@@ -19,7 +19,7 @@ services:
     networks:
       - internal
   server:
-    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.5-stable}
+    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.6-stable}
     command: server
     environment:
       AUTHENTIK_REDIS__HOST: redis
@@ -45,7 +45,7 @@ services:
     env_file:
       - .env
   worker:
-    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.5-stable}
+    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.6-stable}
     command: worker
     networks:
       - internal
@@ -62,7 +62,7 @@ services:
     env_file:
       - .env
   static:
-    image: beryju/authentik-static:${AUTHENTIK_TAG:-2021.2.5-stable}
+    image: beryju/authentik-static:${AUTHENTIK_TAG:-2021.2.6-stable}
     networks:
       - internal
     labels:

helm/Chart.yaml

@@ -4,7 +4,7 @@ name: authentik
 home: https://goauthentik.io
 sources:
   - https://github.com/BeryJu/authentik
-version: "2021.2.5-stable"
+version: "2021.2.6-stable"
 icon: https://raw.githubusercontent.com/BeryJu/authentik/master/web/icons/icon.svg
 dependencies:
   - name: postgresql

helm/README.md

@@ -4,7 +4,7 @@
 |-----------------------------------|-------------------------|-------------|
 | image.name                        | beryju/authentik        | Image used to run the authentik server and worker |
 | image.name_static                 | beryju/authentik-static | Image used to run the authentik static server (CSS and JS Files) |
-| image.tag                         | 2021.2.5-stable           | Image tag |
+| image.tag                         | 2021.2.6-stable           | Image tag |
 | image.pullPolicy                  | IfNotPresent            | Image Pull Policy used for all deployments |
 | serverReplicas                    | 1                       | Replicas for the Server deployment |
 | workerReplicas                    | 1                       | Replicas for the Worker deployment |

helm/values.yaml

@@ -5,7 +5,7 @@ image:
   name: beryju/authentik
   name_static: beryju/authentik-static
   name_outposts: beryju/authentik # Prefix used for Outpost deployments, Outpost type and version is appended
-  tag: 2021.2.5-stable
+  tag: 2021.2.6-stable
   pullPolicy: IfNotPresent
 
 serverReplicas: 1

outpost/pkg/version.go

@@ -1,3 +1,3 @@
 package pkg
 
-const VERSION = "2021.2.5-stable"
+const VERSION = "2021.2.6-stable"

tests/e2e/utils.py

@@ -203,6 +203,7 @@ def object_manager(func: Callable):
     return wrapper
 
 
+def retry(max_retires=3, exceptions=None):
     """Retry test multiple times. Default to catching Selenium Timeout Exception"""
 
     if not exceptions:

website/docs/installation/docker-compose.md

@@ -16,7 +16,7 @@ Download the latest `docker-compose.yml` from [here](https://raw.githubuserconte
 
 To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env`
 
-To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.2.5-stable >> .env`
+To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.2.6-stable >> .env`
 
 If this is a fresh authentik install run the following commands to generate a password:
 

website/docs/installation/kubernetes.md

@@ -24,7 +24,7 @@ image:
     name: beryju/authentik
     name_static: beryju/authentik-static
     name_outposts: beryju/authentik # Prefix used for Outpost deployments, Outpost type and version is appended
-    tag: 2021.2.5-stable
+    tag: 2021.2.6-stable
 
 serverReplicas: 1
 workerReplicas: 1

website/docs/releases/2021.2.md

@@ -94,6 +94,18 @@ title: Release 2021.1.2
 - web: fix outpost edit/delete buttons
 - web: fix SiteShell breaking links when handlers are updated twice
 
+## Fixed in 2021.2.6-stable
+
+- admin: fix missing success_url for Cache clean views
+- events: fix error when event can't be loaded in rule task
+- flows: handle error when app cannot be found during flow import
+- policies: sort groups in GroupMembershipPolicy policy and binding
+- providers/oauth2: fix error when no login event could be found
+- sources/ldap: fix API error when source has not synced yet
+- sources/ldap: fix password setter on users which are not LDAP
+- web: add sentry CaptureConsole
+- web: fix colourstyles not being included in common_styles
+
 ## Upgrading
 
 This release does not introduce any new requirements.