Merge branch 'next' into new-forms

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	web/src/api/legacy.ts
#	web/src/main.ts
#	web/src/pages/users/UserSettingsPage.ts

web/src/api/Config.ts

@@ -4,7 +4,8 @@ import { VERSION } from "../constants";
 import { SentryIgnoredError } from "../common/errors";
 import { Config, Configuration, RootApi } from "authentik-api";
 import { getCookie } from "../utils";
-import { MIDDLEWARE } from "../elements/notifications/APIDrawer";
+import { API_DRAWER_MIDDLEWARE } from "../elements/notifications/APIDrawer";
+import { MessageMiddleware } from "../elements/messages/Middleware";
 
 export const DEFAULT_CONFIG = new Configuration({
     basePath: "/api/v2beta",
@@ -13,7 +14,8 @@ export const DEFAULT_CONFIG = new Configuration({
         "X-Authentik-Prevent-Basic": "true"
     },
     middleware: [
-        MIDDLEWARE
+        API_DRAWER_MIDDLEWARE,
+        new MessageMiddleware(),
     ],
 });
 

web/src/api/legacy.ts

@@ -113,4 +113,8 @@ export class FlowURLManager {
         return `/flows/-/configure/${stageUuid}/${rest}`;
     }
 
+    static cancel(): string {
+        return "/flows/-/cancel/";
+    }
+
 }