From d1aa1f46dabba1a1cf20d4ab91778a7f5d8e3a3b Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens@goauthentik.io>
Date: Mon, 9 Jan 2023 16:01:00 +0100
Subject: [PATCH] web/admin: show GeoIP information inline in events

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 web/src/admin/events/EventListPage.ts | 8 +++++++-
 web/src/flow/stages/base.ts           | 5 +----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/src/admin/events/EventListPage.ts b/web/src/admin/events/EventListPage.ts
index 14c4d3fd8..3e8eea4e6 100644
--- a/web/src/admin/events/EventListPage.ts
+++ b/web/src/admin/events/EventListPage.ts
@@ -3,6 +3,7 @@ import { ActionToLabel } from "@goauthentik/admin/events/utils";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { EventWithContext } from "@goauthentik/common/events";
 import { uiConfig } from "@goauthentik/common/ui/config";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
 import { PaginatedResponse } from "@goauthentik/elements/table/Table";
 import { TableColumn } from "@goauthentik/elements/table/Table";
 import { TablePage } from "@goauthentik/elements/table/TablePage";
@@ -55,6 +56,10 @@ export class EventListPage extends TablePage<Event> {
     }
 
     row(item: EventWithContext): TemplateResult[] {
+        let geo: KeyUnknown | undefined = undefined;
+        if (Object.hasOwn(item.context, "geo")) {
+            geo = item.context.geo as KeyUnknown;
+        }
         return [
             html`<div>${ActionToLabel(item.action)}</div>
                 <small>${item.app}</small>`,
@@ -67,7 +72,8 @@ export class EventListPage extends TablePage<Event> {
                           : html``}`
                 : html`-`,
             html`<span>${item.created?.toLocaleString()}</span>`,
-            html`<span>${item.clientIp || t`-`}</span>`,
+            html` <div>${item.clientIp || t`-`}</div>
+                ${geo ? html`<small>${geo.city}, ${geo.country}</small> ` : html``}`,
             html`<span>${item.tenant?.name || t`-`}</span>`,
             html`<a href="#/events/log/${item.pk}">
                 <i class="fas fa-share-square"></i>
diff --git a/web/src/flow/stages/base.ts b/web/src/flow/stages/base.ts
index 07998299d..d9e3865ea 100644
--- a/web/src/flow/stages/base.ts
+++ b/web/src/flow/stages/base.ts
@@ -1,4 +1,5 @@
 import { AKElement } from "@goauthentik/elements/Base";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
 
 import { TemplateResult, html } from "lit";
 import { property } from "lit/decorators.js";
@@ -25,10 +26,6 @@ export function readFileAsync(file: Blob) {
     });
 }
 
-export type KeyUnknown = {
-    [key: string]: unknown;
-};
-
 export class BaseStage<Tin, Tout> extends AKElement {
     host!: StageHost;