From 595adafa602676ba7b9edf729bf98fe712bd476d Mon Sep 17 00:00:00 2001
From: Casey Williams <caseyswilliams@gmail.com>
Date: Fri, 27 Jan 2023 15:51:36 -0500
Subject: [PATCH 1/3] Initial commit of admin panel

---
 UT4MasterServer.Web/package-lock.json         | 25 ++++++
 UT4MasterServer.Web/package.json              |  2 +
 .../src/components/CrudPage.vue               | 58 ++++++++++++++
 UT4MasterServer.Web/src/components/Footer.vue |  2 +-
 UT4MasterServer.Web/src/components/Header.vue | 18 ++++-
 UT4MasterServer.Web/src/components/Hub.vue    |  2 +-
 .../src/components/LoadingPanel.vue           | 24 +++++-
 UT4MasterServer.Web/src/components/Match.vue  |  4 +-
 .../src/components/MatchList.vue              |  2 +-
 .../src/components/StatCard.vue               | 10 +--
 .../src/components/StatSection.vue            |  4 +-
 .../src/components/UserInfo.vue               |  8 +-
 UT4MasterServer.Web/src/enums/account-flag.ts |  8 ++
 .../src/enums/game-server-trust.ts            |  5 ++
 .../src/pages/Admin/Accounts/Accounts.vue     | 78 ++++++++++++++++++
 .../Admin/Accounts/components/EditAccount.vue | 18 +++++
 .../Accounts/components/EditAccountFlags.vue  | 80 +++++++++++++++++++
 .../src/pages/Admin/TrustedServers.vue        | 17 ++++
 .../src/pages/Instructions/HubOwners.vue      |  2 +-
 .../src/pages/Instructions/StockUT4.vue       |  2 +-
 .../src/pages/Instructions/UT4UU.vue          |  2 +-
 UT4MasterServer.Web/src/pages/Login.vue       | 12 +--
 .../src/pages/Profile/ChangeEmail.vue         | 10 +--
 .../src/pages/Profile/ChangePassword.vue      | 14 ++--
 .../src/pages/Profile/ChangeUsername.vue      | 10 +--
 .../src/pages/Profile/PlayerCard.vue          |  6 +-
 UT4MasterServer.Web/src/pages/Register.vue    | 10 +--
 UT4MasterServer.Web/src/pages/Servers.vue     | 12 +--
 UT4MasterServer.Web/src/pages/Stats.vue       | 24 +++---
 UT4MasterServer.Web/src/route-guards.ts       |  7 ++
 UT4MasterServer.Web/src/routes.ts             | 23 +++++-
 .../src/services/account.service.ts           | 10 +--
 .../src/services/admin-service.ts             | 34 ++++++++
 .../src/services/authentication.service.ts    | 14 ++--
 .../src/services/custom.service.ts            |  2 +-
 .../src/services/http.service.ts              | 21 ++---
 .../src/services/stats.service.ts             |  2 +-
 .../src/stores/account-store.ts               | 10 ++-
 .../src/stores/server-store.ts                |  7 +-
 .../src/stores/session-store.ts               |  4 +-
 UT4MasterServer.Web/src/types/account.ts      | 20 +++++
 .../src/types/refresh-session-request.ts      |  2 +-
 .../src/types/statistic-config.ts             |  2 +-
 .../src/types/trusted-game-server.ts          |  7 ++
 UT4MasterServer.Web/src/utils/utilities.ts    | 12 +++
 UT4MasterServer.Web/tsconfig.json             |  7 +-
 UT4MasterServer.Web/vite.config.ts            |  8 +-
 .../Controllers/AccountController.cs          | 15 ++++
 48 files changed, 562 insertions(+), 114 deletions(-)
 create mode 100644 UT4MasterServer.Web/src/components/CrudPage.vue
 create mode 100644 UT4MasterServer.Web/src/enums/account-flag.ts
 create mode 100644 UT4MasterServer.Web/src/enums/game-server-trust.ts
 create mode 100644 UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue
 create mode 100644 UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccount.vue
 create mode 100644 UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue
 create mode 100644 UT4MasterServer.Web/src/pages/Admin/TrustedServers.vue
 create mode 100644 UT4MasterServer.Web/src/services/admin-service.ts
 create mode 100644 UT4MasterServer.Web/src/types/trusted-game-server.ts
 create mode 100644 UT4MasterServer.Web/src/utils/utilities.ts

diff --git a/UT4MasterServer.Web/package-lock.json b/UT4MasterServer.Web/package-lock.json
index d8faaa6f..7cb58bee 100644
--- a/UT4MasterServer.Web/package-lock.json
+++ b/UT4MasterServer.Web/package-lock.json
@@ -10,8 +10,10 @@
       "dependencies": {
         "@types/crypto-js": "^4.1.1",
         "@types/vue-router": "^2.0.0",
+        "@vueform/multiselect": "^2.5.8",
         "crypto-js": "^4.1.1",
         "sass": "^1.57.1",
+        "ts-md5": "^1.3.1",
         "vue": "^3.2.45",
         "vue-recaptcha": "^2.0.3"
       },
@@ -580,6 +582,11 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
       "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
     },
+    "node_modules/@vueform/multiselect": {
+      "version": "2.5.8",
+      "resolved": "https://registry.npmjs.org/@vueform/multiselect/-/multiselect-2.5.8.tgz",
+      "integrity": "sha512-etUJCCDlo3LDsbDLoJdDHFpvgHyl2rzcOG9VQvLJ3caNIHDYm0g+HMIbAydswWr1iWKstqRi9YkkBR75gQ9TBw=="
+    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -1022,6 +1029,14 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/ts-md5": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.3.1.tgz",
+      "integrity": "sha512-DiwiXfwvcTeZ5wCE0z+2A9EseZsztaiZtGrtSaY5JOD7ekPnR/GoIVD5gXZAlK9Na9Kvpo9Waz5rW64WKAWApg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/typescript": {
       "version": "4.9.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
@@ -1523,6 +1538,11 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
       "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
     },
+    "@vueform/multiselect": {
+      "version": "2.5.8",
+      "resolved": "https://registry.npmjs.org/@vueform/multiselect/-/multiselect-2.5.8.tgz",
+      "integrity": "sha512-etUJCCDlo3LDsbDLoJdDHFpvgHyl2rzcOG9VQvLJ3caNIHDYm0g+HMIbAydswWr1iWKstqRi9YkkBR75gQ9TBw=="
+    },
     "anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -1835,6 +1855,11 @@
         "is-number": "^7.0.0"
       }
     },
+    "ts-md5": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.3.1.tgz",
+      "integrity": "sha512-DiwiXfwvcTeZ5wCE0z+2A9EseZsztaiZtGrtSaY5JOD7ekPnR/GoIVD5gXZAlK9Na9Kvpo9Waz5rW64WKAWApg=="
+    },
     "typescript": {
       "version": "4.9.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
diff --git a/UT4MasterServer.Web/package.json b/UT4MasterServer.Web/package.json
index 0fa4e6e6..0a80c584 100644
--- a/UT4MasterServer.Web/package.json
+++ b/UT4MasterServer.Web/package.json
@@ -12,8 +12,10 @@
   "dependencies": {
     "@types/crypto-js": "^4.1.1",
     "@types/vue-router": "^2.0.0",
+    "@vueform/multiselect": "^2.5.8",
     "crypto-js": "^4.1.1",
     "sass": "^1.57.1",
+    "ts-md5": "^1.3.1",
     "vue": "^3.2.45",
     "vue-recaptcha": "^2.0.3"
   },
diff --git a/UT4MasterServer.Web/src/components/CrudPage.vue b/UT4MasterServer.Web/src/components/CrudPage.vue
new file mode 100644
index 00000000..4734246a
--- /dev/null
+++ b/UT4MasterServer.Web/src/components/CrudPage.vue
@@ -0,0 +1,58 @@
+<template>
+    <h1>{{ title }}</h1>
+
+    <transition mode="out-in" name="cross-fade">
+        <div v-if="adding && $slots.add">
+            <slot name="add" :cancel="cancelAdd" />
+        </div>
+        <div v-else>
+            <div class="header">
+                <div class="filters">
+                    <slot name="filters" />
+                </div>
+                <div class="action-buttons">
+                    <slot name="action-buttons" />
+                    <button v-if="$slots.add" class="btn btn-sm btn-primary" @click="adding = true;">Add</button>
+                </div>
+            </div>
+            <slot />
+        </div>
+    </transition>
+</template>
+
+<style lang="scss" scoped>
+.header {
+    width: 100%;
+    padding: 1rem 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .action-buttons {
+        justify-content: flex-end;
+
+        button {
+            margin-left: 0.5rem;
+        }
+    }
+}
+</style>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue';
+
+
+defineProps({
+    title: {
+        type: String,
+        required: true
+    }
+});
+
+const adding = shallowRef(false);
+
+function cancelAdd() {
+    adding.value = false;
+}
+
+</script>
\ No newline at end of file
diff --git a/UT4MasterServer.Web/src/components/Footer.vue b/UT4MasterServer.Web/src/components/Footer.vue
index 0749bbe1..5d0db009 100644
--- a/UT4MasterServer.Web/src/components/Footer.vue
+++ b/UT4MasterServer.Web/src/components/Footer.vue
@@ -33,7 +33,7 @@
   
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, shallowRef } from 'vue';
-import { ServerStore } from '../stores/server-store';
+import { ServerStore } from '@/stores/server-store';
 
 const pollTime = 30000;
 const timer = shallowRef<NodeJS.Timer | undefined>(undefined);
diff --git a/UT4MasterServer.Web/src/components/Header.vue b/UT4MasterServer.Web/src/components/Header.vue
index e37614bc..37a8e9c3 100644
--- a/UT4MasterServer.Web/src/components/Header.vue
+++ b/UT4MasterServer.Web/src/components/Header.vue
@@ -27,6 +27,14 @@
           <template v-else>
             <HeaderLink text="Stats" path="/Stats" />
           </template>
+          <li class="nav-item dropdown pull-right" v-if="AccountStore.isAdmin">
+            <a class="nav-link dropdown-toggle" href="#" role="button" aria-haspopup="true" aria-expanded="false"
+              @click.stop="showAdminDropdown = !showAdminDropdown">Admin</a>
+            <div class="dropdown-menu" :class="{ 'show': showAdminDropdown }">
+              <HeaderLink text="Accounts" path="/Admin/Accounts" dropdown />
+              <HeaderLink text="Trusted Servers" path="/Admin/TrustedServers" dropdown />
+            </div>
+          </li>
           <li class="nav-item dropdown pull-right" v-if="SessionStore.isAuthenticated">
             <a class="nav-link dropdown-toggle" href="#" role="button" aria-haspopup="true" aria-expanded="false"
               @click.stop="showProfileDropdown = !showProfileDropdown">Profile</a>
@@ -53,13 +61,12 @@
   justify-content: flex-end;
 
   .nav-link.router-link-active,
-  .navbar-nav .show > .nav-link {
+  .navbar-nav .show>.nav-link {
     color: var(--bs-navbar-active-color);
   }
 
   .nav-item.pull-right {
     margin-right: 0;
-    margin-left: 1rem;
   }
 
   .router-link-active {
@@ -85,12 +92,14 @@ import { onMounted, onUnmounted, shallowRef } from 'vue';
 import HeaderLink from './HeaderLink.vue';
 import { useRouter } from 'vue-router';
 import UserInfo from './UserInfo.vue';
-import AuthenticationService from '../services/authentication.service';
-import { SessionStore } from '../stores/session-store';
+import AuthenticationService from '@/services/authentication.service';
+import { SessionStore } from '@/stores/session-store';
+import { AccountStore } from '@/stores/account-store';
 
 const router = useRouter();
 const showProfileDropdown = shallowRef(false);
 const showInstructionsDropdown = shallowRef(false);
+const showAdminDropdown = shallowRef(false);
 const authenticationService = new AuthenticationService();
 const menuExpanded = shallowRef(false);
 
@@ -102,6 +111,7 @@ async function logOut() {
 function closeNav() {
   showProfileDropdown.value = false;
   showInstructionsDropdown.value = false;
+  showAdminDropdown.value = false;
 }
 
 onMounted(() => {
diff --git a/UT4MasterServer.Web/src/components/Hub.vue b/UT4MasterServer.Web/src/components/Hub.vue
index 5fed51b3..4e91c35d 100644
--- a/UT4MasterServer.Web/src/components/Hub.vue
+++ b/UT4MasterServer.Web/src/components/Hub.vue
@@ -37,7 +37,7 @@
 </style>
 
 <script setup lang="ts">
-import { IGameHub } from '../types/game-server';
+import { IGameHub } from '@/types/game-server';
 import { PropType } from 'vue';
 
 defineProps({
diff --git a/UT4MasterServer.Web/src/components/LoadingPanel.vue b/UT4MasterServer.Web/src/components/LoadingPanel.vue
index 998bba87..ca3c5c83 100644
--- a/UT4MasterServer.Web/src/components/LoadingPanel.vue
+++ b/UT4MasterServer.Web/src/components/LoadingPanel.vue
@@ -41,13 +41,23 @@
 </style>
   
 <script setup lang="ts">
-import { PropType, ref, watch, onUnmounted } from 'vue';
-import { AsyncStatus } from '../types/async-status';
+import { PropType, ref, watch, onUnmounted, onMounted } from 'vue';
+import { AsyncStatus } from '@/types/async-status';
 
 const props = defineProps({
   status: Number as PropType<AsyncStatus>,
-  error: String
-})
+  error: String,
+  onLoad: {
+    type: Function,
+    default: undefined
+  },
+  autoLoad: {
+    type: Boolean,
+    default: false
+  }
+});
+
+const emit = defineEmits(['load']);
 
 const asyncStatus = ref(props.status);
 
@@ -59,5 +69,11 @@ function dismissError() {
   asyncStatus.value = AsyncStatus.OK;
 }
 
+onMounted(() => {
+  if (props.autoLoad) {
+    emit('load');
+  }
+});
+
 onUnmounted(destroyWatch);
 </script>
\ No newline at end of file
diff --git a/UT4MasterServer.Web/src/components/Match.vue b/UT4MasterServer.Web/src/components/Match.vue
index 5b6a7b5d..48200c19 100644
--- a/UT4MasterServer.Web/src/components/Match.vue
+++ b/UT4MasterServer.Web/src/components/Match.vue
@@ -43,9 +43,9 @@ div {
 </style>
 
 <script setup lang="ts">
-import { IGameServer } from '../types/game-server';
+import { IGameServer } from '@/types/game-server';
 import { PropType, shallowRef } from 'vue';
-import { AccountStore } from '../stores/account-store';
+import { AccountStore } from '@/stores/account-store';
 
 defineProps({
     match: {
diff --git a/UT4MasterServer.Web/src/components/MatchList.vue b/UT4MasterServer.Web/src/components/MatchList.vue
index bde16c84..b3a16478 100644
--- a/UT4MasterServer.Web/src/components/MatchList.vue
+++ b/UT4MasterServer.Web/src/components/MatchList.vue
@@ -25,7 +25,7 @@ div {
 </style>
 
 <script setup lang="ts">
-import { IGameHub } from '../types/game-server';
+import { IGameHub } from '@/types/game-server';
 import { PropType } from 'vue';
 import Match from './Match.vue';
 
diff --git a/UT4MasterServer.Web/src/components/StatCard.vue b/UT4MasterServer.Web/src/components/StatCard.vue
index 1120f5ee..bde8e2b8 100644
--- a/UT4MasterServer.Web/src/components/StatCard.vue
+++ b/UT4MasterServer.Web/src/components/StatCard.vue
@@ -41,11 +41,11 @@
 </style>
 
 <script setup lang="ts">
-import { IStatisticCard } from '../types/statistic-config';
-import { IStatisticData } from '../types/statistic-data';
+import { IStatisticCard } from '@/types/statistic-config';
+import { IStatisticData } from '@/types/statistic-data';
 import { PropType } from 'vue';
-import { Statistic } from '../enums/statistic';
-import { StatisticDisplay } from '../enums/statistic-display';
+import { Statistic } from '@/enums/statistic';
+import { StatisticDisplay } from '@/enums/statistic-display';
 
 const props = defineProps({
     card: {
@@ -58,7 +58,7 @@ const props = defineProps({
     }
 });
 
-const imgIconUrl = new URL(`../assets/weapons/${props.card.headingIcon}`, import.meta.url).href;
+const imgIconUrl = new URL(`@/assets/weapons/${props.card.headingIcon}`, import.meta.url).href;
 
 function getAccuracy(): string {
     const shots = props.card.stats.find((s) => s.includes('Shots'));
diff --git a/UT4MasterServer.Web/src/components/StatSection.vue b/UT4MasterServer.Web/src/components/StatSection.vue
index 165c065f..a37b4829 100644
--- a/UT4MasterServer.Web/src/components/StatSection.vue
+++ b/UT4MasterServer.Web/src/components/StatSection.vue
@@ -16,8 +16,8 @@
 </style>
 
 <script setup lang="ts">
-import { IStatisticSection } from '../types/statistic-config';
-import { IStatisticData } from '../types/statistic-data';
+import { IStatisticSection } from '@/types/statistic-config';
+import { IStatisticData } from '@/types/statistic-data';
 import { PropType } from 'vue';
 import StatCard from './StatCard.vue';
 
diff --git a/UT4MasterServer.Web/src/components/UserInfo.vue b/UT4MasterServer.Web/src/components/UserInfo.vue
index 7c412bb2..ce9e70de 100644
--- a/UT4MasterServer.Web/src/components/UserInfo.vue
+++ b/UT4MasterServer.Web/src/components/UserInfo.vue
@@ -41,11 +41,11 @@
 
 <script setup lang="ts">
 import { shallowRef, onMounted } from 'vue';
-import AuthenticationService from '../services/authentication.service';
-import { AsyncStatus } from '../types/async-status';
+import AuthenticationService from '@/services/authentication.service';
+import { AsyncStatus } from '@/types/async-status';
 import LoadingPanel from './LoadingPanel.vue';
-import { AccountStore } from '../stores/account-store';
-import { SessionStore } from '../stores/session-store';
+import { AccountStore } from '@/stores/account-store';
+import { SessionStore } from '@/stores/session-store';
 import CopyButton from './CopyButton.vue';
 
 const service = new AuthenticationService();
diff --git a/UT4MasterServer.Web/src/enums/account-flag.ts b/UT4MasterServer.Web/src/enums/account-flag.ts
new file mode 100644
index 00000000..e385064f
--- /dev/null
+++ b/UT4MasterServer.Web/src/enums/account-flag.ts
@@ -0,0 +1,8 @@
+export enum AccountFlag {
+    None = 'None',
+    Admin = 'Admin',
+    Moderator = 'Moderator',
+    Developer = 'Developer',
+    ContentCreator = 'ContentCreator',
+    HubOwner = 'HubOwner'
+}
diff --git a/UT4MasterServer.Web/src/enums/game-server-trust.ts b/UT4MasterServer.Web/src/enums/game-server-trust.ts
new file mode 100644
index 00000000..f314eb29
--- /dev/null
+++ b/UT4MasterServer.Web/src/enums/game-server-trust.ts
@@ -0,0 +1,5 @@
+export enum GameServerTrust {
+    Epic = 0,
+    Trusted = 1,
+    Untrusted = 2
+}
diff --git a/UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue b/UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue
new file mode 100644
index 00000000..498f1c70
--- /dev/null
+++ b/UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue
@@ -0,0 +1,78 @@
+<template>
+    <CrudPage title="Accounts">
+        <template #add="p">
+            <h2>Add Account</h2>
+            <button class="btn btn-sm btn-secondary" @click="p.cancel">Cancel</button>
+        </template>
+        <template #filters>
+            <input type="text" class="form-control" placeholder="Search..." v-model="filterText" />
+        </template>
+        <LoadingPanel :status="status" @load="loadAccounts" auto-load>
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Username</th>
+                        <th />
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- TODO: add paging -->
+                    <template v-for="account in filteredAccounts.slice(0, 50)" :key="objectHash(account)">
+                        <tr :class="{'table-light': account.editing }">
+                            <td>{{ account.displayName }}</td>
+                            <td width="10%">
+                                <button class="btn btn-sm btn-smaller btn-primary edit-button"
+                                    @click="account.editing = !account.editing">{{
+                                        account.editing ?
+                                            'Cancel' : 'Edit'
+                                    }}</button>
+                            </td>
+                        </tr>
+                        <tr v-if="account.editing" class="edit-row table-light">
+                            <td colspan="100">
+                                <EditAccount :account="account" />
+                            </td>
+                        </tr>
+                    </template>
+                </tbody>
+            </table>
+        </LoadingPanel>
+    </CrudPage>
+</template>
+
+<style lang="scss" >
+</style>
+
+<script lang="ts" setup>
+import { shallowRef, ref, computed } from 'vue';
+import CrudPage from '@/components/CrudPage.vue';
+import AccountService from '@/services/account.service';
+import { IAccount } from '@/types/account';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AsyncStatus } from '@/types/async-status';
+import EditAccount from './components/EditAccount.vue';
+import { objectHash } from '@/utils/utilities';
+
+interface IGridAccount extends IAccount {
+    editing?: boolean;
+}
+
+const accountService = new AccountService();
+const accounts = ref<IGridAccount[]>([]);
+const status = shallowRef(AsyncStatus.OK);
+const filterText = shallowRef('');
+
+const filteredAccounts = computed(() => accounts.value.filter((a) => a.displayName.toLocaleLowerCase().includes(filterText.value.toLocaleLowerCase())));
+
+async function loadAccounts() {
+    try {
+        status.value = AsyncStatus.BUSY;
+        accounts.value = await accountService.getAllAccounts();
+        status.value = AsyncStatus.OK;
+    } catch (err: unknown) {
+        status.value = AsyncStatus.ERROR;
+        console.error('Error loading accounts', err);
+    }
+}
+
+</script>
\ No newline at end of file
diff --git a/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccount.vue b/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccount.vue
new file mode 100644
index 00000000..f4d91b0b
--- /dev/null
+++ b/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccount.vue
@@ -0,0 +1,18 @@
+<template>
+    <EditAccountFlags :account="account" />
+</template>
+
+<script lang="ts" setup>
+
+import { IAccount } from '@/types/account';
+import { PropType } from 'vue';
+import EditAccountFlags from './EditAccountFlags.vue';
+
+
+defineProps({
+    account: {
+        type: Object as PropType<IAccount>,
+        required: true
+    }
+})
+</script>
\ No newline at end of file
diff --git a/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue b/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue
new file mode 100644
index 00000000..d888dc63
--- /dev/null
+++ b/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue
@@ -0,0 +1,80 @@
+<template>
+  <LoadingPanel :status="status" :error="errorMessage">
+    <form :class="{ 'was-validated': submitAttempted }" @submit.prevent="handleSubmit" novalidate>
+      <fieldset>
+        <legend>Account Flags</legend>
+        <div class="form-group row">
+          <div class="col-sm-6">
+            <Multiselect v-model="flags" :options="flagOptions" mode="tags" />
+          </div>
+        </div>
+        <div class="form-group row">
+          <div class="col-sm-12">
+            <button type="submit" class="btn btn-primary">Update Flags</button>
+          </div>
+        </div>
+      </fieldset>
+    </form>
+
+  </LoadingPanel>
+</template>
+
+<style src="@vueform/multiselect/themes/default.css">
+
+</style>
+
+<script setup lang="ts">
+import { shallowRef, computed, onMounted, PropType } from 'vue';
+import { AsyncStatus } from '@/types/async-status';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { IAccount } from '@/types/account';
+import AdminService from '@/services/admin-service';
+import Multiselect from '@vueform/multiselect';
+
+const props = defineProps({
+  account: {
+    type: Object as PropType<IAccount>,
+    required: true
+  }
+})
+
+const adminService = new AdminService();
+
+const status = shallowRef(AsyncStatus.OK);
+const flags = shallowRef<string[]>([]);
+const allFlags = shallowRef<string[]>([]);
+const submitAttempted = shallowRef(false);
+const errorMessage = shallowRef('Error updating account flags. Please try again.');
+
+const flagOptions = computed(() => allFlags.value.map((f) => ({ label: f, value: f })));
+
+async function handleSubmit() {
+  submitAttempted.value = true;
+  try {
+    status.value = AsyncStatus.BUSY;
+    await adminService.setFlagsForAccount(props.account.id, flags.value);
+    status.value = AsyncStatus.OK;
+  }
+  catch (err: unknown) {
+    status.value = AsyncStatus.ERROR;
+    errorMessage.value = (err as Error)?.message;
+  }
+}
+
+async function loadData() {
+  try {
+    status.value = AsyncStatus.BUSY;
+    const [allPossibleFlags, accountFlags] = await Promise.all([adminService.getAccountFlagOptions(), adminService.getFlagsForAccount(props.account.id)]);
+    flags.value = accountFlags;
+    allFlags.value = allPossibleFlags;
+    status.value = AsyncStatus.OK;
+  }
+  catch (err: unknown) {
+    console.error('Error loading account flag data', err);
+    status.value = AsyncStatus.ERROR;
+  }
+}
+
+onMounted(loadData);
+</script>
+
diff --git a/UT4MasterServer.Web/src/pages/Admin/TrustedServers.vue b/UT4MasterServer.Web/src/pages/Admin/TrustedServers.vue
new file mode 100644
index 00000000..9bf2c997
--- /dev/null
+++ b/UT4MasterServer.Web/src/pages/Admin/TrustedServers.vue
@@ -0,0 +1,17 @@
+<template>
+    <h1>Trusted Servers</h1>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, shallowRef } from 'vue';
+import { ITrustedGameServer } from '@/types/trusted-game-server';
+import AdminService from '@/services/admin-service';
+
+const adminService = new AdminService();
+const trustedServers = shallowRef<ITrustedGameServer[]>([]);
+
+onMounted(async () => {
+    trustedServers.value = await adminService.getTrustedServers();
+    console.debug('trusted', trustedServers.value);
+});
+</script>
\ No newline at end of file
diff --git a/UT4MasterServer.Web/src/pages/Instructions/HubOwners.vue b/UT4MasterServer.Web/src/pages/Instructions/HubOwners.vue
index 9836aba4..6101d678 100644
--- a/UT4MasterServer.Web/src/pages/Instructions/HubOwners.vue
+++ b/UT4MasterServer.Web/src/pages/Instructions/HubOwners.vue
@@ -35,5 +35,5 @@
   </ol>
 </template>
 <script setup lang="ts">
-import CodeBlock from '../../components/CodeBlock.vue';
+import CodeBlock from '@/components/CodeBlock.vue';
 </script>
diff --git a/UT4MasterServer.Web/src/pages/Instructions/StockUT4.vue b/UT4MasterServer.Web/src/pages/Instructions/StockUT4.vue
index a8984547..5b7c32bf 100644
--- a/UT4MasterServer.Web/src/pages/Instructions/StockUT4.vue
+++ b/UT4MasterServer.Web/src/pages/Instructions/StockUT4.vue
@@ -49,5 +49,5 @@
   <p>To switch back to official Epic's servers, remove all lines that you added to <span class="code">Engine.ini</span> file (added lines may have moved).</p>
 </template>
 <script setup lang="ts">
-import CodeBlock from '../../components/CodeBlock.vue';
+import CodeBlock from '@/components/CodeBlock.vue';
 </script>
diff --git a/UT4MasterServer.Web/src/pages/Instructions/UT4UU.vue b/UT4MasterServer.Web/src/pages/Instructions/UT4UU.vue
index f4704ee5..b1c7e4e1 100644
--- a/UT4MasterServer.Web/src/pages/Instructions/UT4UU.vue
+++ b/UT4MasterServer.Web/src/pages/Instructions/UT4UU.vue
@@ -21,5 +21,5 @@
   <p>To switch back to official Epic's servers, clear text box in <span style="font-style:italic">Master Server Domain</span> section.</p>
 </template>
 <script setup lang="ts">
-import CodeBlock from '../../components/CodeBlock.vue';
+import CodeBlock from '@/components/CodeBlock.vue';
 </script>
diff --git a/UT4MasterServer.Web/src/pages/Login.vue b/UT4MasterServer.Web/src/pages/Login.vue
index 7cb407e8..498530b2 100644
--- a/UT4MasterServer.Web/src/pages/Login.vue
+++ b/UT4MasterServer.Web/src/pages/Login.vue
@@ -40,15 +40,15 @@
 </template>
 
 <script setup lang="ts">
-import LoadingPanel from '../components/LoadingPanel.vue';
-import { AsyncStatus } from '../types/async-status';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AsyncStatus } from '@/types/async-status';
 import { computed, shallowRef } from 'vue';
 import CryptoJS from 'crypto-js';
-import AuthenticationService from '../services/authentication.service';
-import { SessionStore } from '../stores/session-store';
+import AuthenticationService from '@/services/authentication.service';
+import { SessionStore } from '@/stores/session-store';
 import { useRouter } from 'vue-router';
-import { GrantType } from '../enums/grant-type';
-import { validatePassword } from '../utils/validation';
+import { GrantType } from '@/enums/grant-type';
+import { validatePassword } from '@/utils/validation';
 
 const username = shallowRef(SessionStore.username ?? '');
 const password = shallowRef('');
diff --git a/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue b/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue
index a9e8864f..d58db19f 100644
--- a/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue
@@ -30,13 +30,13 @@
 </template>
 
 <script setup lang="ts">
-import { IChangeEmailRequest } from '../../types/change-email-request';
+import { IChangeEmailRequest } from '@/types/change-email-request';
 import { shallowRef, computed, onMounted } from 'vue';
-import AccountService from '../../services/account.service';
-import { AsyncStatus } from '../../types/async-status';
+import AccountService from '@/services/account.service';
+import { AsyncStatus } from '@/types/async-status';
 import { useRouter } from 'vue-router';
-import LoadingPanel from '../../components/LoadingPanel.vue';
-import { AccountStore } from '../../stores/account-store';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AccountStore } from '@/stores/account-store';
 
 const accountService = new AccountService();
 const router = useRouter();
diff --git a/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue b/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue
index bc343d22..4018d6bc 100644
--- a/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue
@@ -40,16 +40,16 @@
 </template>
 
 <script setup lang="ts">
-import { IChangePasswordRequest } from '../../types/change-password-request';
+import { IChangePasswordRequest } from '@/types/change-password-request';
 import { shallowRef, computed } from 'vue';
-import { valid as vValid } from '../../directives/valid';
+import { valid as vValid } from '@/directives/valid';
 import CryptoJS from 'crypto-js';
-import AccountService from '../../services/account.service';
-import { AsyncStatus } from '../../types/async-status';
+import AccountService from '@/services/account.service';
+import { AsyncStatus } from '@/types/async-status';
 import { useRouter } from 'vue-router';
-import LoadingPanel from '../../components/LoadingPanel.vue';
-import { AccountStore } from '../../stores/account-store';
-import { validatePassword } from '../../utils/validation';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AccountStore } from '@/stores/account-store';
+import { validatePassword } from '@/utils/validation';
 
 const accountService = new AccountService();
 const router = useRouter();
diff --git a/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue b/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue
index 91cd87a2..81d73949 100644
--- a/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue
@@ -29,13 +29,13 @@
 </template>
 
 <script setup lang="ts">
-import { IChangeUsernameRequest } from '../../types/change-username-request';
+import { IChangeUsernameRequest } from '@/types/change-username-request';
 import { shallowRef, computed, onMounted } from 'vue';
-import AccountService from '../../services/account.service';
+import AccountService from '@/services/account.service';
 import { useRouter } from 'vue-router';
-import { AsyncStatus } from '../../types/async-status';
-import LoadingPanel from '../../components/LoadingPanel.vue';
-import { AccountStore } from '../../stores/account-store';
+import { AsyncStatus } from '@/types/async-status';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AccountStore } from '@/stores/account-store';
 
 const accountService = new AccountService();
 const router = useRouter();
diff --git a/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue b/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue
index 9a2d6839..33731027 100644
--- a/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue
@@ -66,10 +66,10 @@ img.avatar {
 </style>
 
 <script lang="ts" setup>
-import { SessionStore } from '../../stores/session-store';
+import { SessionStore } from '@/stores/session-store';
 import { onMounted, shallowRef } from 'vue';
-import CustomService from '../../services/custom.service';
-import { IPlayerCard } from '../../types/player-card';
+import CustomService from '@/services/custom.service';
+import { IPlayerCard } from '@/types/player-card';
 
 const customService = new CustomService();
 
diff --git a/UT4MasterServer.Web/src/pages/Register.vue b/UT4MasterServer.Web/src/pages/Register.vue
index dc738372..8aafd0a5 100644
--- a/UT4MasterServer.Web/src/pages/Register.vue
+++ b/UT4MasterServer.Web/src/pages/Register.vue
@@ -44,14 +44,14 @@
 </template>
 
 <script setup lang="ts">
-import LoadingPanel from '../components/LoadingPanel.vue';
-import { AsyncStatus } from '../types/async-status';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AsyncStatus } from '@/types/async-status';
 import { computed, shallowRef } from 'vue';
-import { validateEmail, validatePassword } from '../utils/validation';
+import { validateEmail, validatePassword } from '@/utils/validation';
 import CryptoJS from 'crypto-js';
 import { useRouter } from 'vue-router';
-import AccountService from '../services/account.service';
-import { valid as vValid } from '../directives/valid';
+import AccountService from '@/services/account.service';
+import { valid as vValid } from '@/directives/valid';
 import { VueRecaptcha } from 'vue-recaptcha';
 
 const username = shallowRef('');
diff --git a/UT4MasterServer.Web/src/pages/Servers.vue b/UT4MasterServer.Web/src/pages/Servers.vue
index 10f2a604..98928187 100644
--- a/UT4MasterServer.Web/src/pages/Servers.vue
+++ b/UT4MasterServer.Web/src/pages/Servers.vue
@@ -17,13 +17,13 @@
 </template>
 
 <script lang="ts" setup>
-import { IGameHub } from '../types/game-server';
+import { IGameHub } from '@/types/game-server';
 import { onMounted, shallowRef, computed } from 'vue';
-import Hub from '../components/Hub.vue';
-import MatchList from '../components/MatchList.vue';
-import { ServerStore } from '../stores/server-store';
-import LoadingPanel from '../components/LoadingPanel.vue';
-import { AccountStore } from '../stores/account-store';
+import Hub from '@/components/Hub.vue';
+import MatchList from '@/components/MatchList.vue';
+import { ServerStore } from '@/stores/server-store';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AccountStore } from '@/stores/account-store';
 
 const selectedHubId = shallowRef<string | undefined>(undefined);
 const selectedHub = computed(() => ServerStore.hubs.find((h) => h.attributes.UT_SERVERINSTANCEGUID_s === selectedHubId.value));
diff --git a/UT4MasterServer.Web/src/pages/Stats.vue b/UT4MasterServer.Web/src/pages/Stats.vue
index 3bae6f78..4e0a5bd3 100644
--- a/UT4MasterServer.Web/src/pages/Stats.vue
+++ b/UT4MasterServer.Web/src/pages/Stats.vue
@@ -27,19 +27,19 @@
 </template>
 
 <script setup lang="ts">
-import LoadingPanel from '../components/LoadingPanel.vue';
-import { AsyncStatus } from '../types/async-status';
+import LoadingPanel from '@/components/LoadingPanel.vue';
+import { AsyncStatus } from '@/types/async-status';
 import { shallowRef, onMounted, computed } from 'vue';
-import { SessionStore } from '../stores/session-store';
-import StatsService from '../services/stats.service';
-import { StatisticWindow } from '../enums/statistic-window';
-import { IAccount } from '../types/account';
-import { Statistic } from '../enums/statistic';
-import { IStatisticSection } from '../types/statistic-config';
-import StatSection from '../components/StatSection.vue';
-import { IStatisticData } from '../types/statistic-data';
-import Autocomplete from '../components/Autocomplete.vue';
-import { AccountStore } from '../stores/account-store';
+import { SessionStore } from '@/stores/session-store';
+import StatsService from '@/services/stats.service';
+import { StatisticWindow } from '@/enums/statistic-window';
+import { IAccount } from '@/types/account';
+import { Statistic } from '@/enums/statistic';
+import { IStatisticSection } from '@/types/statistic-config';
+import StatSection from '@/components/StatSection.vue';
+import { IStatisticData } from '@/types/statistic-data';
+import Autocomplete from '@/components/Autocomplete.vue';
+import { AccountStore } from '@/stores/account-store';
 
 const statsStatus = shallowRef(AsyncStatus.OK);
 const statWindow = shallowRef(StatisticWindow.AllTime);
diff --git a/UT4MasterServer.Web/src/route-guards.ts b/UT4MasterServer.Web/src/route-guards.ts
index 3d4e5de6..3092e890 100644
--- a/UT4MasterServer.Web/src/route-guards.ts
+++ b/UT4MasterServer.Web/src/route-guards.ts
@@ -19,3 +19,10 @@ export async function privateGuard(to: RouteLocationNormalized) {
     return { path: '/Login' };
   }
 }
+
+export async function adminGuard(to: RouteLocationNormalized) {
+  if (AccountStore.account === null) {
+    await  AccountStore.fetchUserAccount();
+  }
+  return AccountStore.isAdmin;
+}
\ No newline at end of file
diff --git a/UT4MasterServer.Web/src/routes.ts b/UT4MasterServer.Web/src/routes.ts
index 115ae3cc..8b7ddc09 100644
--- a/UT4MasterServer.Web/src/routes.ts
+++ b/UT4MasterServer.Web/src/routes.ts
@@ -3,7 +3,7 @@ import {
   createWebHistory,
   RouteRecordRaw
 } from 'vue-router';
-import { privateGuard, publicGuard } from './route-guards';
+import { adminGuard, privateGuard, publicGuard } from './route-guards';
 
 export const routes: RouteRecordRaw[] = [
   // Secure Pages
@@ -58,6 +58,27 @@ export const routes: RouteRecordRaw[] = [
       }
     ]
   },
+  // Admin Pages
+  {
+    path: `/Admin`,
+    children: [
+      {
+        path: `Accounts`,
+        component: async () =>
+          import(
+            './pages/Admin/Accounts/Accounts.vue'
+          )
+      },
+      {
+        path: `TrustedServers`,
+        component: async () =>
+          import(
+            './pages/Admin/TrustedServers.vue'
+          )
+      }
+    ],
+    beforeEnter: adminGuard
+  },
   // Public Pages
   {
     path: `/Instructions`,
diff --git a/UT4MasterServer.Web/src/services/account.service.ts b/UT4MasterServer.Web/src/services/account.service.ts
index 259a6f7e..196854d9 100644
--- a/UT4MasterServer.Web/src/services/account.service.ts
+++ b/UT4MasterServer.Web/src/services/account.service.ts
@@ -1,8 +1,8 @@
-import { IAccount } from '../types/account';
-import { IChangeEmailRequest } from '../types/change-email-request';
-import { IChangePasswordRequest } from '../types/change-password-request';
-import { IChangeUsernameRequest } from '../types/change-username-request';
-import { IRegisterRequest } from '../types/register-request';
+import { IAccount } from '@/types/account';
+import { IChangeEmailRequest } from '@/types/change-email-request';
+import { IChangePasswordRequest } from '@/types/change-password-request';
+import { IChangeUsernameRequest } from '@/types/change-username-request';
+import { IRegisterRequest } from '@/types/register-request';
 import HttpService from './http.service';
 
 export default class AccountService extends HttpService {
diff --git a/UT4MasterServer.Web/src/services/admin-service.ts b/UT4MasterServer.Web/src/services/admin-service.ts
new file mode 100644
index 00000000..5ab4f485
--- /dev/null
+++ b/UT4MasterServer.Web/src/services/admin-service.ts
@@ -0,0 +1,34 @@
+import { ITrustedGameServer } from '@/types/trusted-game-server';
+import HttpService from './http.service';
+
+export default class AdminService extends HttpService {
+    private baseUrl = `${__BACKEND_URL}/admin`;
+
+    //#region Account Admin 
+
+    async getAccountFlagOptions() {
+        return await this.get<string[]>(`${this.baseUrl}/flags`);
+    }
+
+    async getFlagsForAccount(id: string) {
+        return await this.get<string[]>(`${this.baseUrl}/flags/${id}`);
+    }
+
+    async setFlagsForAccount(id: string, flags: string[]) {
+        return await this.put<string[]>(`${this.baseUrl}/flags/${id}`, { body: flags }, false);
+    }
+
+    //endregion
+
+    async getTrustedServers() {
+        return await this.get<ITrustedGameServer[]>(`${this.baseUrl}/trusted_servers`);
+    }
+
+    async updateTrustedServer(id: string, request: ITrustedGameServer) {
+        return await this.patch(`${this.baseUrl}/trusted_servers/${id}`, { body: request });
+    }
+
+    async deleteTrustedServer(id: string) {
+        return await this.delete(`${this.baseUrl}/trusted_servers/${id}`);
+    }
+}
diff --git a/UT4MasterServer.Web/src/services/authentication.service.ts b/UT4MasterServer.Web/src/services/authentication.service.ts
index d23028a9..5d0620e8 100644
--- a/UT4MasterServer.Web/src/services/authentication.service.ts
+++ b/UT4MasterServer.Web/src/services/authentication.service.ts
@@ -1,11 +1,11 @@
-import { SessionStore as SessionStore } from '../stores/session-store';
-import { ILoginRequest } from '../types/login-request';
+import { SessionStore as SessionStore } from '@/stores/session-store';
+import { ILoginRequest } from '@/types/login-request';
 import HttpService from './http.service';
-import { ISession, IVerifySession } from '../types/session';
-import { GrantType } from '../enums/grant-type';
-import { IRefreshSessionRequest } from '../types/refresh-session-request';
-import { IAuthCodeResponse } from '../types/auth-code-response';
-import { AccountStore } from '../stores/account-store';
+import { ISession, IVerifySession } from '@/types/session';
+import { GrantType } from '@/enums/grant-type';
+import { IRefreshSessionRequest } from '@/types/refresh-session-request';
+import { IAuthCodeResponse } from '@/types/auth-code-response';
+import { AccountStore } from '@/stores/account-store';
 
 export default class AuthenticationService extends HttpService {
     private baseUrl = `${__BACKEND_URL}/account/api/oauth`;
diff --git a/UT4MasterServer.Web/src/services/custom.service.ts b/UT4MasterServer.Web/src/services/custom.service.ts
index 4a890366..a96305db 100644
--- a/UT4MasterServer.Web/src/services/custom.service.ts
+++ b/UT4MasterServer.Web/src/services/custom.service.ts
@@ -1,4 +1,4 @@
-import { IPlayerCard } from '../types/player-card';
+import { IPlayerCard } from '@/types/player-card';
 import HttpService from './http.service';
 
 export default class CustomService extends HttpService {
diff --git a/UT4MasterServer.Web/src/services/http.service.ts b/UT4MasterServer.Web/src/services/http.service.ts
index 1b316c1b..7dd41952 100644
--- a/UT4MasterServer.Web/src/services/http.service.ts
+++ b/UT4MasterServer.Web/src/services/http.service.ts
@@ -1,4 +1,4 @@
-import { SessionStore } from "../stores/session-store";
+import { SessionStore } from "@/stores/session-store";
 import AuthenticationService from "./authentication.service";
 
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
@@ -19,13 +19,14 @@ export default class HttpService {
         return form;
     }
 
-    async send<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>, method: HttpMethod = 'GET'): Promise<K> {
+    async send<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>, method: HttpMethod = 'GET', form = true): Promise<K> {
         const fetchOptions: RequestInit = { method };
         if (options?.body) {
-            fetchOptions.body = this.formEncode(options.body);
+            fetchOptions.body = form ? this.formEncode(options.body) : JSON.stringify(options.body);
         }
 
-        const headers: HeadersInit = { 'Content-Type': 'application/x-www-form-urlencoded' };
+        const headers: HeadersInit = { 'Content-Type': form ? 'application/x-www-form-urlencoded' : 'application/json' };
+
 
         if (SessionStore.token) {
             headers.Authorization = `bearer ${SessionStore.token}`;
@@ -59,16 +60,16 @@ export default class HttpService {
         return this.send<K>(url, options, 'GET');
     }
 
-    async post<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>) {
-        return this.send<K, T>(url, options, 'POST');
+    async post<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>, form = true) {
+        return this.send<K, T>(url, options, 'POST', form);
     }
 
-    async put<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>) {
-        return this.send<K, T>(url, options, 'PUT');
+    async put<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>, form = true) {
+        return this.send<K, T>(url, options, 'PUT', form);
     }
 
-    async patch<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>) {
-        return this.send<K, T>(url, options, 'PATCH');
+    async patch<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>, form = true) {
+        return this.send<K, T>(url, options, 'PATCH', form);
     }
 
     async delete<K = unknown, T = unknown>(url: string, options?: HttpRequestOptions<T>) {
diff --git a/UT4MasterServer.Web/src/services/stats.service.ts b/UT4MasterServer.Web/src/services/stats.service.ts
index c9bab719..697dcb62 100644
--- a/UT4MasterServer.Web/src/services/stats.service.ts
+++ b/UT4MasterServer.Web/src/services/stats.service.ts
@@ -1,5 +1,5 @@
 import { IStatisticData } from 'src/types/statistic-data';
-import { StatisticWindow } from '../enums/statistic-window';
+import { StatisticWindow } from '@/enums/statistic-window';
 import HttpService from './http.service';
 
 export default class StatsService extends HttpService {
diff --git a/UT4MasterServer.Web/src/stores/account-store.ts b/UT4MasterServer.Web/src/stores/account-store.ts
index 04c62738..15708a45 100644
--- a/UT4MasterServer.Web/src/stores/account-store.ts
+++ b/UT4MasterServer.Web/src/stores/account-store.ts
@@ -1,8 +1,9 @@
-import { TypedStorage } from "../utils/typed-storage";
+import { TypedStorage } from "@/utils/typed-storage";
 import { ref } from "vue";
-import { IAccount } from "../types/account";
-import AccountService from "../services/account.service";
+import { IAccount } from "@/types/account";
+import AccountService from "@/services/account.service";
 import { SessionStore } from "./session-store";
+import { AccountFlag } from "@/enums/account-flag";
 
 const _account = ref<IAccount | null>(TypedStorage.getItem<IAccount>('account'));
 const _accounts = ref<IAccount[] | null>(TypedStorage.getItem<IAccount[]>('accounts'));
@@ -23,6 +24,9 @@ export const AccountStore = {
         _accounts.value = accounts;
         TypedStorage.setItem<IAccount[]>('accounts', accounts);
     },
+    get isAdmin() {
+        return _account.value?.flags?.includes(AccountFlag.Admin);
+    },
     async fetchUserAccount() {
         try {
             _account.value = SessionStore.session?.account_id ? await _accountService.getAccount(SessionStore.session.account_id) : null;
diff --git a/UT4MasterServer.Web/src/stores/server-store.ts b/UT4MasterServer.Web/src/stores/server-store.ts
index 8c14ef32..508b8adf 100644
--- a/UT4MasterServer.Web/src/stores/server-store.ts
+++ b/UT4MasterServer.Web/src/stores/server-store.ts
@@ -1,7 +1,7 @@
 import { ref } from "vue";
-import { IGameHub, IGameServer } from "../types/game-server";
-import ServerService from "../services/server.service";
-import { AsyncStatus } from "../types/async-status";
+import { IGameHub, IGameServer } from "@/types/game-server";
+import ServerService from "@/services/server.service";
+import { AsyncStatus } from "@/types/async-status";
 
 const _allServers = ref<IGameServer[]>([]);
 const _hubs = ref<IGameHub[]>([]);
@@ -43,7 +43,6 @@ export const ServerStore = {
                     };
                     return hub;
                 });
-            console.debug('Hubs', _hubs.value);
             _status.value = AsyncStatus.OK;
         }
         catch (err: unknown) {
diff --git a/UT4MasterServer.Web/src/stores/session-store.ts b/UT4MasterServer.Web/src/stores/session-store.ts
index 627c6bbf..25b2fd84 100644
--- a/UT4MasterServer.Web/src/stores/session-store.ts
+++ b/UT4MasterServer.Web/src/stores/session-store.ts
@@ -1,5 +1,5 @@
-import { TypedStorage } from "../utils/typed-storage";
-import { ISession } from "../types/session";
+import { TypedStorage } from "@/utils/typed-storage";
+import { ISession } from "@/types/session";
 import { ref } from "vue";
 
 const _session = ref<ISession | null>(TypedStorage.getItem<ISession>('session'));
diff --git a/UT4MasterServer.Web/src/types/account.ts b/UT4MasterServer.Web/src/types/account.ts
index 99a3d8be..b8dc857e 100644
--- a/UT4MasterServer.Web/src/types/account.ts
+++ b/UT4MasterServer.Web/src/types/account.ts
@@ -1,5 +1,25 @@
+import { AccountFlag } from "@/enums/account-flag";
+
 export interface IAccount {
     id: string;
     displayName: string;
     email?: string;
+    name?: string;
+    failedLoginAttempts?: number;
+    lastLogin?: string;
+    numberOfDisplayNameChanges?: number;
+    ageGroup?: string;
+    headless?: boolean;
+    country?: string;
+    lastName?: string;
+    preferredLanguage?: string;
+    canUpdateDisplayName?: boolean;
+    tfaEnabled?: boolean;
+    emailVerified?: boolean;
+    minorVerified?: boolean;
+    minorExpected?: boolean;
+    minorStatus?: string;
+    cabinedMode?: boolean;
+    hasHashedEmail?: boolean
+    flags?: AccountFlag[];
 }
diff --git a/UT4MasterServer.Web/src/types/refresh-session-request.ts b/UT4MasterServer.Web/src/types/refresh-session-request.ts
index 939bb82a..33e55a66 100644
--- a/UT4MasterServer.Web/src/types/refresh-session-request.ts
+++ b/UT4MasterServer.Web/src/types/refresh-session-request.ts
@@ -1,4 +1,4 @@
-import { GrantType } from "../enums/grant-type";
+import { GrantType } from "@/enums/grant-type";
 
 export interface IRefreshSessionRequest {
     refresh_token: string;
diff --git a/UT4MasterServer.Web/src/types/statistic-config.ts b/UT4MasterServer.Web/src/types/statistic-config.ts
index 98e6c38c..76311519 100644
--- a/UT4MasterServer.Web/src/types/statistic-config.ts
+++ b/UT4MasterServer.Web/src/types/statistic-config.ts
@@ -1,4 +1,4 @@
-import { Statistic } from "../enums/statistic";
+import { Statistic } from "@/enums/statistic";
 
 export interface IStatisticCard {
     heading: string;
diff --git a/UT4MasterServer.Web/src/types/trusted-game-server.ts b/UT4MasterServer.Web/src/types/trusted-game-server.ts
new file mode 100644
index 00000000..c4fea78d
--- /dev/null
+++ b/UT4MasterServer.Web/src/types/trusted-game-server.ts
@@ -0,0 +1,7 @@
+import { GameServerTrust } from "@/enums/game-server-trust";
+
+export interface ITrustedGameServer {
+    ID: string;
+    OwnerID: string;
+    TrustLevel: GameServerTrust;
+}
diff --git a/UT4MasterServer.Web/src/utils/utilities.ts b/UT4MasterServer.Web/src/utils/utilities.ts
new file mode 100644
index 00000000..76412212
--- /dev/null
+++ b/UT4MasterServer.Web/src/utils/utilities.ts
@@ -0,0 +1,12 @@
+import { Md5 } from "ts-md5";
+
+export function isWellDefined(value: unknown) {
+    return value !== undefined && value !== null;
+}
+
+export function objectHash(obj: unknown) {
+    if (!isWellDefined(obj)) {
+        return '';
+    }
+    return Md5.hashStr(JSON.stringify(obj));
+}
\ No newline at end of file
diff --git a/UT4MasterServer.Web/tsconfig.json b/UT4MasterServer.Web/tsconfig.json
index ab38ab0f..b94cc622 100644
--- a/UT4MasterServer.Web/tsconfig.json
+++ b/UT4MasterServer.Web/tsconfig.json
@@ -16,7 +16,12 @@
     ],
     "skipLibCheck": true,
     "noEmit": true,
-    "baseUrl": "./"
+    "baseUrl": "./",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    }
   },
   "include": [
     "src/**/*.ts",
diff --git a/UT4MasterServer.Web/vite.config.ts b/UT4MasterServer.Web/vite.config.ts
index 54bc2cad..c3bc80e6 100644
--- a/UT4MasterServer.Web/vite.config.ts
+++ b/UT4MasterServer.Web/vite.config.ts
@@ -1,6 +1,7 @@
 
 import { defineConfig, UserConfig, loadEnv } from 'vite';
 import vue from '@vitejs/plugin-vue';
+import path from 'path';
 
 export default defineConfig(({ command, mode }) => {
   const viteEnv = loadEnv(mode, process.cwd());
@@ -12,7 +13,12 @@ export default defineConfig(({ command, mode }) => {
     },
     plugins: [
       vue()
-    ]
+    ],
+    resolve: {
+      alias: {
+        '@': path.resolve(__dirname, './src'),
+      },
+    },
   } as UserConfig;
 
   if (command === 'serve') {
diff --git a/UT4MasterServer/Controllers/AccountController.cs b/UT4MasterServer/Controllers/AccountController.cs
index e78917f6..f495f1f6 100644
--- a/UT4MasterServer/Controllers/AccountController.cs
+++ b/UT4MasterServer/Controllers/AccountController.cs
@@ -97,6 +97,21 @@ public async Task<IActionResult> GetAccount(string id)
 		obj.Add("cabinedMode", false);
 		obj.Add("hasHashedEmail", false);
 
+		var flags = new List<string>();
+
+		var flagNamesAll = Enum.GetNames<AccountFlags>();
+		var flagValuesAll = Enum.GetValues<AccountFlags>();
+
+		for (int i = 0; i < flagNamesAll.Length; i++)
+		{
+			if (account.Flags.HasFlag(flagValuesAll[i]))
+			{
+				flags.Add(flagNamesAll[i]);
+			}
+		}
+		var flagsArray = new JArray(flags);
+		obj.Add("flags", flagsArray);
+
 		return Json(obj.ToString(Newtonsoft.Json.Formatting.None));
 	}
 

From 69759b1a07f6e9d628ad4c11d69abd02791e2de0 Mon Sep 17 00:00:00 2001
From: caseyswilliams <caseyswilliams@gmail.com>
Date: Fri, 27 Jan 2023 17:53:18 -0500
Subject: [PATCH 2/3] Update UT4MasterServer.Web/src/route-guards.ts

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 UT4MasterServer.Web/src/route-guards.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UT4MasterServer.Web/src/route-guards.ts b/UT4MasterServer.Web/src/route-guards.ts
index 3092e890..a8bfafc0 100644
--- a/UT4MasterServer.Web/src/route-guards.ts
+++ b/UT4MasterServer.Web/src/route-guards.ts
@@ -22,7 +22,7 @@ export async function privateGuard(to: RouteLocationNormalized) {
 
 export async function adminGuard(to: RouteLocationNormalized) {
   if (AccountStore.account === null) {
-    await  AccountStore.fetchUserAccount();
+    await AccountStore.fetchUserAccount();
   }
   return AccountStore.isAdmin;
 }
\ No newline at end of file

From 89a5af9955c2c565e459638a5832db04fd68f2af Mon Sep 17 00:00:00 2001
From: Casey Williams <caseyswilliams@gmail.com>
Date: Fri, 27 Jan 2023 20:45:40 -0500
Subject: [PATCH 3/3] PR comments

---
 UT4MasterServer.Web/src/components/Match.vue  |  4 +-
 .../src/components/UserInfo.vue               |  2 +-
 .../src/pages/Admin/Accounts/Accounts.vue     |  4 +-
 .../Accounts/components/EditAccountFlags.vue  |  4 +-
 .../src/pages/Profile/ChangeEmail.vue         |  2 +-
 .../src/pages/Profile/ChangePassword.vue      |  2 +-
 .../src/pages/Profile/ChangeUsername.vue      |  2 +-
 .../src/pages/Profile/PlayerCard.vue          | 32 +++---------
 UT4MasterServer.Web/src/pages/Stats.vue       |  6 +--
 .../src/services/account.service.ts           |  5 +-
 .../src/services/custom.service.ts            | 10 ----
 .../src/stores/account-store.ts               |  3 +-
 UT4MasterServer.Web/src/types/account.ts      | 36 ++++++--------
 UT4MasterServer.Web/src/types/player-card.ts  | 16 ------
 .../Controllers/AccountController.cs          | 38 --------------
 .../Controllers/CustomAPIController.cs        | 13 -----
 .../Controllers/PersonaController.cs          | 49 ++++++++++++++++++-
 UT4MasterServer/Models/Account.cs             | 18 +++++++
 18 files changed, 106 insertions(+), 140 deletions(-)
 delete mode 100644 UT4MasterServer.Web/src/services/custom.service.ts
 delete mode 100644 UT4MasterServer.Web/src/types/player-card.ts

diff --git a/UT4MasterServer.Web/src/components/Match.vue b/UT4MasterServer.Web/src/components/Match.vue
index 48200c19..cfd62109 100644
--- a/UT4MasterServer.Web/src/components/Match.vue
+++ b/UT4MasterServer.Web/src/components/Match.vue
@@ -61,8 +61,8 @@ function toggleShowPlayers() {
 }
 
 function getPlayerName(id: string) {
-    const player = AccountStore.accounts?.find((a) => a.id === id);
-    return player?.displayName;
+    const player = AccountStore.accounts?.find((a) => a.ID === id);
+    return player?.Username;
 }
 </script>
 
diff --git a/UT4MasterServer.Web/src/components/UserInfo.vue b/UT4MasterServer.Web/src/components/UserInfo.vue
index ce9e70de..223ae728 100644
--- a/UT4MasterServer.Web/src/components/UserInfo.vue
+++ b/UT4MasterServer.Web/src/components/UserInfo.vue
@@ -2,7 +2,7 @@
   <div class="navbar navbar-primary bg-light user-info">
     <div class="container">
       <div>
-        <label><RouterLink to="/Profile/PlayerCard">Username:</RouterLink></label> {{ AccountStore.account?.displayName ?? SessionStore.username }}
+        <label><RouterLink to="/Profile/PlayerCard">Username:</RouterLink></label> {{ AccountStore.account?.Username ?? SessionStore.username }}
       </div>
       <div>
         <LoadingPanel :status="status">
diff --git a/UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue b/UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue
index 498f1c70..74ce5888 100644
--- a/UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue
+++ b/UT4MasterServer.Web/src/pages/Admin/Accounts/Accounts.vue
@@ -19,7 +19,7 @@
                     <!-- TODO: add paging -->
                     <template v-for="account in filteredAccounts.slice(0, 50)" :key="objectHash(account)">
                         <tr :class="{'table-light': account.editing }">
-                            <td>{{ account.displayName }}</td>
+                            <td>{{ account.Username }}</td>
                             <td width="10%">
                                 <button class="btn btn-sm btn-smaller btn-primary edit-button"
                                     @click="account.editing = !account.editing">{{
@@ -62,7 +62,7 @@ const accounts = ref<IGridAccount[]>([]);
 const status = shallowRef(AsyncStatus.OK);
 const filterText = shallowRef('');
 
-const filteredAccounts = computed(() => accounts.value.filter((a) => a.displayName.toLocaleLowerCase().includes(filterText.value.toLocaleLowerCase())));
+const filteredAccounts = computed(() => accounts.value.filter((a) => a.Username.toLocaleLowerCase().includes(filterText.value.toLocaleLowerCase())));
 
 async function loadAccounts() {
     try {
diff --git a/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue b/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue
index d888dc63..d666df36 100644
--- a/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue
+++ b/UT4MasterServer.Web/src/pages/Admin/Accounts/components/EditAccountFlags.vue
@@ -52,7 +52,7 @@ async function handleSubmit() {
   submitAttempted.value = true;
   try {
     status.value = AsyncStatus.BUSY;
-    await adminService.setFlagsForAccount(props.account.id, flags.value);
+    await adminService.setFlagsForAccount(props.account.ID, flags.value);
     status.value = AsyncStatus.OK;
   }
   catch (err: unknown) {
@@ -64,7 +64,7 @@ async function handleSubmit() {
 async function loadData() {
   try {
     status.value = AsyncStatus.BUSY;
-    const [allPossibleFlags, accountFlags] = await Promise.all([adminService.getAccountFlagOptions(), adminService.getFlagsForAccount(props.account.id)]);
+    const [allPossibleFlags, accountFlags] = await Promise.all([adminService.getAccountFlagOptions(), adminService.getFlagsForAccount(props.account.ID)]);
     flags.value = accountFlags;
     allFlags.value = allPossibleFlags;
     status.value = AsyncStatus.OK;
diff --git a/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue b/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue
index d58db19f..697ff27c 100644
--- a/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/ChangeEmail.vue
@@ -42,7 +42,7 @@ const accountService = new AccountService();
 const router = useRouter();
 
 const status = shallowRef(AsyncStatus.OK);
-const currentEmail = shallowRef(AccountStore.account?.email);
+const currentEmail = shallowRef(AccountStore.account?.Email);
 const newEmail = shallowRef<string>('');
 const submitAttempted = shallowRef(false);
 
diff --git a/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue b/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue
index 4018d6bc..e5463760 100644
--- a/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/ChangePassword.vue
@@ -70,7 +70,7 @@ const errorMessage = shallowRef('Error changing email. Please try again.');
 
 async function handleSubmit() {
   submitAttempted.value = true;
-  if (!formValid.value || !AccountStore.account?.displayName) {
+  if (!formValid.value || !AccountStore.account?.ID) {
     return;
   }
   try {
diff --git a/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue b/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue
index 81d73949..787e6c8e 100644
--- a/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/ChangeUsername.vue
@@ -41,7 +41,7 @@ const accountService = new AccountService();
 const router = useRouter();
 
 const status = shallowRef(AsyncStatus.OK);
-const currentUsername = shallowRef(AccountStore.account?.displayName);
+const currentUsername = shallowRef(AccountStore.account?.Username);
 const newUsername = shallowRef<string>('');
 const submitAttempted = shallowRef(false);
 const formValid = computed(() => newUsername.value?.length);
diff --git a/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue b/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue
index 33731027..e50ea6e1 100644
--- a/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue
+++ b/UT4MasterServer.Web/src/pages/Profile/PlayerCard.vue
@@ -10,12 +10,12 @@
         <tbody>
           <tr class="table-primary">
             <th scope="row">
-              <img class="avatar" :src="`/assets/avatars/${playerCard?.Avatar ?? 'UT.Avatar.0'}.png`" />
-              {{ playerCard?.Username }}
+              <img class="avatar" :src="`/assets/avatars/${AccountStore.account?.Avatar ?? 'UT.Avatar.0'}.png`" />
+              {{ AccountStore.account?.Username }}
             </th>
             <td>
-              <img class="flag" :src="`/assets/flags/${playerCard?.CountryFlag ?? 'Unreal'}.png`" />
-              {{ playerCard?.CountryFlag }}
+              <img class="flag" :src="`/assets/flags/${AccountStore.account?.CountryFlag ?? 'Unreal'}.png`" />
+              {{ AccountStore.account?.CountryFlag }}
             </td>
           </tr>
           <tr class="table-primary">
@@ -23,17 +23,17 @@
               Level (Experience)
             </th>
             <td>
-              {{ playerCard?.Level }} ({{ playerCard?.XP }})
+              {{ AccountStore.account?.Level }} ({{ AccountStore.account?.XP }})
             </td>
           </tr>
           <tr class="table-primary">
             <th scope="row">Challenge Stars</th>
-            <td>{{ playerCard?.BlueStars }}<span class="blue star">★</span>{{ playerCard?.GoldStars }}<span
+            <td>{{ AccountStore.account?.BlueStars }}<span class="blue star">★</span>{{ AccountStore.account?.GoldStars }}<span
                 class="gold star">★</span></td>
           </tr>
           <tr class="table-primary">
             <th scope="row">ID</th>
-            <td>{{ playerCard?.ID }}</td>
+            <td>{{ AccountStore.account?.ID }}</td>
           </tr>
         </tbody>
       </table>
@@ -66,21 +66,5 @@ img.avatar {
 </style>
 
 <script lang="ts" setup>
-import { SessionStore } from '@/stores/session-store';
-import { onMounted, shallowRef } from 'vue';
-import CustomService from '@/services/custom.service';
-import { IPlayerCard } from '@/types/player-card';
-
-const customService = new CustomService();
-
-const playerCard = shallowRef<IPlayerCard | undefined>(undefined);
-
-async function fetchProfile() {
-  if (SessionStore.session) {
-    playerCard.value = await customService.getPlayerCard(SessionStore.session.account_id);
-  }
-}
-
-onMounted(fetchProfile);
-
+import { AccountStore } from '@/stores/account-store';
 </script>
diff --git a/UT4MasterServer.Web/src/pages/Stats.vue b/UT4MasterServer.Web/src/pages/Stats.vue
index 4e0a5bd3..e6a096ad 100644
--- a/UT4MasterServer.Web/src/pages/Stats.vue
+++ b/UT4MasterServer.Web/src/pages/Stats.vue
@@ -19,7 +19,7 @@
   </LoadingPanel>
   <LoadingPanel :status="statsStatus">
     <template v-if="accountId">
-      <h5>Viewing stats for: {{ viewingAccount?.displayName }}</h5>
+      <h5>Viewing stats for: {{ viewingAccount?.Username }}</h5>
       <StatSection :data="stats" :section="section" v-for="section in statSections" />
     </template>
     <h5 v-else class="text-center">Select a player to view stats</h5>
@@ -48,7 +48,7 @@ const stats = shallowRef<IStatisticData[]>([]);
 const accountsStatus = shallowRef(AsyncStatus.OK);
 const accountId = shallowRef<string | undefined>(undefined);
 const accounts = computed(() => AccountStore.accounts ?? []);
-const viewingAccount = computed(() => accounts.value.find((a) => a.id === accountId.value));
+const viewingAccount = computed(() => accounts.value.find((a) => a.ID === accountId.value));
 
 const statsService = new StatsService();
 
@@ -382,7 +382,7 @@ function handleParameterChange() {
 }
 
 function handleSelectAccount(account?: IAccount) {
-  accountId.value = account?.id;
+  accountId.value = account?.ID;
   handleParameterChange();
 }
 
diff --git a/UT4MasterServer.Web/src/services/account.service.ts b/UT4MasterServer.Web/src/services/account.service.ts
index 196854d9..f4841806 100644
--- a/UT4MasterServer.Web/src/services/account.service.ts
+++ b/UT4MasterServer.Web/src/services/account.service.ts
@@ -7,6 +7,7 @@ import HttpService from './http.service';
 
 export default class AccountService extends HttpService {
     private baseUrl = `${__BACKEND_URL}/account/api`;
+    private personaBaseUrl = `${__BACKEND_URL}/persona/api`;
 
     async register(request: IRegisterRequest) {
         return await this.post<unknown, IRegisterRequest>(`${this.baseUrl}/create/account`, { body: request });
@@ -25,10 +26,10 @@ export default class AccountService extends HttpService {
     }
 
     async getAccount(id: string) {
-        return await this.get<IAccount>(`${this.baseUrl}/public/account/${id}`);
+        return await this.get<IAccount>(`${this.personaBaseUrl}/account/${id}`);
     }
 
     async getAllAccounts() {
-        return await this.get<IAccount[]>(`${this.baseUrl}/public/accounts`);
+        return await this.get<IAccount[]>(`${this.personaBaseUrl}/accounts`);
     }
 }
diff --git a/UT4MasterServer.Web/src/services/custom.service.ts b/UT4MasterServer.Web/src/services/custom.service.ts
deleted file mode 100644
index a96305db..00000000
--- a/UT4MasterServer.Web/src/services/custom.service.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { IPlayerCard } from '@/types/player-card';
-import HttpService from './http.service';
-
-export default class CustomService extends HttpService {
-    private baseUrl = `${__BACKEND_URL}/api`;
-
-    async getPlayerCard(id: string) {
-        return await this.get<IPlayerCard>(`${this.baseUrl}/playerCard/${id}`);
-    }
-}
diff --git a/UT4MasterServer.Web/src/stores/account-store.ts b/UT4MasterServer.Web/src/stores/account-store.ts
index 15708a45..e8e98781 100644
--- a/UT4MasterServer.Web/src/stores/account-store.ts
+++ b/UT4MasterServer.Web/src/stores/account-store.ts
@@ -25,7 +25,7 @@ export const AccountStore = {
         TypedStorage.setItem<IAccount[]>('accounts', accounts);
     },
     get isAdmin() {
-        return _account.value?.flags?.includes(AccountFlag.Admin);
+        return _account.value?.Roles?.includes(AccountFlag.Admin);
     },
     async fetchUserAccount() {
         try {
@@ -38,6 +38,7 @@ export const AccountStore = {
     async fetchAllAccounts() {
         try {
             _accounts.value = await _accountService.getAllAccounts();
+            console.debug('accounts', _accounts.value);
         }
         catch (err: unknown) {
             console.error('Error fetching all accounts:', err);
diff --git a/UT4MasterServer.Web/src/types/account.ts b/UT4MasterServer.Web/src/types/account.ts
index b8dc857e..17bec6f8 100644
--- a/UT4MasterServer.Web/src/types/account.ts
+++ b/UT4MasterServer.Web/src/types/account.ts
@@ -1,25 +1,19 @@
 import { AccountFlag } from "@/enums/account-flag";
 
 export interface IAccount {
-    id: string;
-    displayName: string;
-    email?: string;
-    name?: string;
-    failedLoginAttempts?: number;
-    lastLogin?: string;
-    numberOfDisplayNameChanges?: number;
-    ageGroup?: string;
-    headless?: boolean;
-    country?: string;
-    lastName?: string;
-    preferredLanguage?: string;
-    canUpdateDisplayName?: boolean;
-    tfaEnabled?: boolean;
-    emailVerified?: boolean;
-    minorVerified?: boolean;
-    minorExpected?: boolean;
-    minorStatus?: string;
-    cabinedMode?: boolean;
-    hasHashedEmail?: boolean
-    flags?: AccountFlag[];
+    ID: string;
+    Username: string;
+    CreatedAt: string;
+    LastLoginAt: string;
+    Email: string;
+    CountryFlag: string;
+    Avatar: string;
+    GoldStars: number;
+    BlueStars: number;
+    XP: number;
+    XPLastMatch: number;
+    LastMatchAt: string;
+    Level: number;
+    LevelStockLimited: number;
+    Roles?: AccountFlag[];
 }
diff --git a/UT4MasterServer.Web/src/types/player-card.ts b/UT4MasterServer.Web/src/types/player-card.ts
deleted file mode 100644
index 71a91f58..00000000
--- a/UT4MasterServer.Web/src/types/player-card.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export interface IPlayerCard {
-    ID: string;
-    Username: string;
-    CreatedAt: string;
-    LastLoginAt: string;
-    Email: string;
-    CountryFlag: string;
-    Avatar: string;
-    GoldStars: number;
-    BlueStars: number;
-    XP: number;
-    XPLastMatch: number;
-    LastMatchAt: string;
-    Level: number;
-    LevelStockLimited: number;
-}
diff --git a/UT4MasterServer/Controllers/AccountController.cs b/UT4MasterServer/Controllers/AccountController.cs
index f495f1f6..ddf75153 100644
--- a/UT4MasterServer/Controllers/AccountController.cs
+++ b/UT4MasterServer/Controllers/AccountController.cs
@@ -97,21 +97,6 @@ public async Task<IActionResult> GetAccount(string id)
 		obj.Add("cabinedMode", false);
 		obj.Add("hasHashedEmail", false);
 
-		var flags = new List<string>();
-
-		var flagNamesAll = Enum.GetNames<AccountFlags>();
-		var flagValuesAll = Enum.GetValues<AccountFlags>();
-
-		for (int i = 0; i < flagNamesAll.Length; i++)
-		{
-			if (account.Flags.HasFlag(flagValuesAll[i]))
-			{
-				flags.Add(flagNamesAll[i]);
-			}
-		}
-		var flagsArray = new JArray(flags);
-		obj.Add("flags", flagsArray);
-
 		return Json(obj.ToString(Newtonsoft.Json.Formatting.None));
 	}
 
@@ -162,29 +147,6 @@ public async Task<IActionResult> GetAccounts([FromQuery(Name = "accountId")] Lis
 		return Json(arr);
 	}
 
-	[HttpGet("public/accounts")]
-	public async Task<IActionResult> GetAllAccounts()
-	{
-		if (User.Identity is not EpicUserIdentity authenticatedUser)
-			return Unauthorized();
-
-		var accounts = await accountService.GetAllAccountsAsync();
-		logger.LogInformation($"{authenticatedUser.Session.AccountID} is looking for all accounts");
-
-		// create json response
-		var arr = new JArray();
-		// TODO: Limit to 1000 for now, just to not allow unlimited access to the accounts collection. Should be replaced with paging or a search function at some point.
-		foreach (var account in accounts.Take(1000))
-		{
-			var obj = new JObject();
-			obj.Add("id", account.ID.ToString());
-			obj.Add("displayName", account.Username);
-			arr.Add(obj);
-		}
-
-		return Json(arr);
-	}
-
 	#endregion
 
 	#region UNIMPORTANT API
diff --git a/UT4MasterServer/Controllers/CustomAPIController.cs b/UT4MasterServer/Controllers/CustomAPIController.cs
index 65776219..67918ece 100644
--- a/UT4MasterServer/Controllers/CustomAPIController.cs
+++ b/UT4MasterServer/Controllers/CustomAPIController.cs
@@ -64,18 +64,5 @@ public IActionResult EpicLoginPage()
 	public IActionResult EpicGetAuthCodePage()
 	{
 		return Redirect($"https://{configuration.Value.WebsiteDomain}/Login");
-	}
-
-	[HttpGet("api/playerCard/{id}")]
-	public async Task<IActionResult> GetPlayerCard(string id)
-	{
-		// Epic doesn't require any authentication to serve player card, there is nothing sensitive here
-		var account = await accountService.GetAccountAsync(EpicID.FromString(id));
-		if (account == null)
-		{
-			return NotFound();
-		}
-
-		return Json(account);
 	}
 }
diff --git a/UT4MasterServer/Controllers/PersonaController.cs b/UT4MasterServer/Controllers/PersonaController.cs
index 7d4bd5a3..0794ab3a 100644
--- a/UT4MasterServer/Controllers/PersonaController.cs
+++ b/UT4MasterServer/Controllers/PersonaController.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 using UT4MasterServer.Authentication;
+using UT4MasterServer.Other;
 using UT4MasterServer.Services;
 
 namespace UT4MasterServer.Controllers;
@@ -9,7 +10,7 @@ namespace UT4MasterServer.Controllers;
 /// persona-public-service-prod06.ol.epicgames.com
 /// </summary>
 [ApiController]
-[Route("persona/api/public")]
+[Route("persona/api")]
 [AuthorizeBearer]
 [Produces("application/json")]
 public sealed class PersonaController : JsonAPIController
@@ -21,7 +22,7 @@ public PersonaController(ILogger<PersonaController> logger, AccountService accou
 		this.accountService = accountService;
 	}
 
-	[HttpGet("account/lookup")]
+	[HttpGet("public/account/lookup")]
 	public async Task<IActionResult> AccountLookup([FromQuery(Name = "q")] string query)
 	{
 		if (User.Identity is not EpicUserIdentity authenticatedUser)
@@ -38,4 +39,48 @@ public async Task<IActionResult> AccountLookup([FromQuery(Name = "q")] string qu
 
 		return Json(obj);
 	}
+
+	[HttpGet("account/{id}")]
+	public async Task<IActionResult> GetAccount(string id)
+	{
+		if (User.Identity is not EpicUserIdentity authenticatedUser)
+			return Unauthorized();
+
+		EpicID eid = EpicID.FromString(id);
+
+		if (eid != authenticatedUser.Session.AccountID)
+			return Unauthorized();
+
+		logger.LogInformation($"{authenticatedUser.Session.AccountID} is looking for account {id}");
+
+		var account = await accountService.GetAccountAsync(eid);
+		if (account == null)
+			return NotFound();
+
+		return Json(account);
+	}
+
+	[HttpGet("accounts")]
+	public async Task<IActionResult> GetAllAccounts()
+	{
+		if (User.Identity is not EpicUserIdentity authenticatedUser)
+			return Unauthorized();
+
+		var accounts = await accountService.GetAllAccountsAsync();
+		logger.LogInformation($"{authenticatedUser.Session.AccountID} is looking for all accounts");
+
+		// create json response
+		var arr = new JArray();
+		// TODO: Limit to 1000 for now, just to not allow unlimited access to the accounts collection. Should be replaced with paging or a search function at some point.
+		foreach (var account in accounts.Take(1000))
+		{
+			var obj = new JObject();
+			obj.Add("id", account.ID.ToString());
+			obj.Add("displayName", account.Username);
+			arr.Add(obj);
+		}
+
+		return Json(arr);
+	}
+
 }
diff --git a/UT4MasterServer/Models/Account.cs b/UT4MasterServer/Models/Account.cs
index 2f1350c9..2a4351c0 100644
--- a/UT4MasterServer/Models/Account.cs
+++ b/UT4MasterServer/Models/Account.cs
@@ -150,6 +150,24 @@ public float Level
 	[BsonIgnore]
 	public int LevelStockLimited => Math.Min(50, (int)Level);
 
+	[BsonIgnore]
+	public string[]? Roles
+	{
+		get
+		{
+			var flags = new List<string>();
+			var flagNamesAll = Enum.GetNames<AccountFlags>();
+			var flagValuesAll = Enum.GetValues<AccountFlags>();
+			for (int i = 0; i < flagNamesAll.Length; i++)
+			{
+				if (Flags.HasFlag(flagValuesAll[i]))
+				{
+					flags.Add(flagNamesAll[i]);
+				}
+			}
+			return flags.ToArray();
+		}
+	}
 
 	public bool CheckPassword(string password, bool allowPasswordGrant)
 	{