Remove application entity

admin-console-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin-client-ui",
-  "version": "0.0.1",
+  "version": "0.2.0",
   "description": "A web ui for mail-it admin console",
   "productName": "MailIt client",
   "author": "Alaksiej Ščarbaty <hahaha.funny.yellow.dog@gmail.com>",

admin-console-ui/src/App.vue

@@ -24,8 +24,8 @@
         <q-item clickable to="/types">
           <q-item-section> Mail Types </q-item-section>
         </q-item>
-        <q-item clickable to="/applications">
-          <q-item-section> Applications </q-item-section>
+        <q-item clickable to="/api-keys">
+          <q-item-section> Api Keys </q-item-section>
         </q-item>
       </q-list>
     </q-drawer>

admin-console-ui/src/boot/axios.ts

@@ -13,8 +13,8 @@ declare module '@vue/runtime-core' {
 // good idea to move this instance creation inside of the
 // "export default () => {}" function below (which runs individually
 // for each client)
-// const url = 'http://localhost:8080/api/admin'
-const url = '/api/admin'
+const url = 'http://localhost:8080/api/admin'
+// const url = '/api/admin'
 const api = axios.create({
   baseURL: url,
   withCredentials: true,

admin-console-ui/src/client/apiKeyClient.ts

@@ -1,13 +1,13 @@
 import { api } from 'boot/axios'
 import { ApiKey } from 'src/models/ApiKey'
 
-async function getAll(applicationId: string): Promise<ApiKey[]> {
-  const { data } = await api.get<ApiKey[]>(`/applications/${applicationId}/api-keys`)
+async function getAll(): Promise<ApiKey[]> {
+  const { data } = await api.get<ApiKey[]>('/api-keys')
   return data
 }
 
-async function create(applicationId: string, name: string, expirationDays: number): Promise<string> {
-  const { data, status } = await api.post(`/applications/${applicationId}/api-keys`, { name, expirationDays })
+async function create(name: string, expirationDays: number): Promise<string> {
+  const { data, status } = await api.post('/api-keys', { name, expirationDays })
 
   if (status != 201) {
     throw Error(`Failed to create Api Key: ${JSON.stringify(data)}`)
@@ -16,11 +16,11 @@ async function create(applicationId: string, name: string, expirationDays: numbe
   return data.token
 }
 
-async function deleteApiKey(applicationId: string, apiKeyId: string): Promise<void> {
-  const { data, status } = await api.delete(`/applications/${applicationId}/api-keys/${apiKeyId}`)
+async function deleteApiKey(apiKeyId: string): Promise<void> {
+  const { data, status } = await api.delete(`/api-keys/${apiKeyId}`)
 
   if (status != 204) {
-    throw Error(`Failed to delete Application: ${JSON.stringify(data)}`)
+    throw Error(`Failed to delete ApiKey: ${JSON.stringify(data)}`)
   }
 }
 

admin-console-ui/src/components/application/CreateApiKey.vue → admin-console-ui/src/components/CreateApiKey.vue

@@ -31,7 +31,6 @@ import { defineProps, ref } from 'vue'
 import apiKeyClient from 'src/client/apiKeyClient'
 
 const props = defineProps<{
-  applicationId: string,
   onCreate: () => void,
 }>()
 
@@ -50,7 +49,7 @@ async function create() {
     return
   }
 
-  token.value = await apiKeyClient.create(props.applicationId, keyName, expirationDays.value)
+  token.value = await apiKeyClient.create(keyName, expirationDays.value)
 
   props.onCreate()
 }

admin-console-ui/src/components/application/ApiKeys.vue → admin-console-ui/src/pages/ApiKeysPage.vue

@@ -37,18 +37,14 @@
     </q-card>
   </q-dialog>
 
-  <CreateApiKey v-model="showCreate" :application-id="applicationId" :on-create="load"/>
+  <CreateApiKey v-model="showCreate" :on-create="load"/>
 </template>
 
 <script setup lang="ts">
-import { defineProps, ref } from 'vue'
+import { ref } from 'vue'
 import { ApiKey } from 'src/models/ApiKey'
 import apiKeyClient from 'src/client/apiKeyClient'
-import CreateApiKey from 'components/application/CreateApiKey.vue'
-
-const props = defineProps<{
-  applicationId: string,
-}>()
+import CreateApiKey from 'components/CreateApiKey.vue'
 
 const columns = [
   { name: 'name', label: 'Name', field: 'name' },
@@ -66,7 +62,7 @@ const deletedApiKey = ref<ApiKey | null>(null)
 load()
 
 async function load() {
-  apiKeys.value = await apiKeyClient.getAll(props.applicationId)
+  apiKeys.value = await apiKeyClient.getAll()
 }
 
 function initiateDeletion(apiKey: ApiKey) {
@@ -81,7 +77,7 @@ async function deleteKey() {
     return
   }
 
-  await apiKeyClient.deleteApiKey(props.applicationId, apiKey.id)
+  await apiKeyClient.deleteApiKey(apiKey.id)
   await load()
 
   showDelete.value = false

admin-console-ui/src/pages/LoginPage.vue

@@ -14,10 +14,8 @@
 import { ref } from 'vue'
 import authClient from 'src/client/authClient'
 import { userStore } from 'stores/userStore'
-import { useRouter } from 'vue-router'
 import { useQuasar } from 'quasar'
 
-const router = useRouter()
 const quasar = useQuasar()
 
 const user = userStore()

admin-console-ui/src/router/routes.ts

@@ -24,17 +24,8 @@ const routes: RouteRecordRaw[] = [
     props: true,
   },
   {
-    path: '/applications',
-    component: () => import('pages/application/ApplicationsPage.vue'),
-  },
-  {
-    path: '/applications/create',
-    component: () => import('pages/application/CreateApplicationPage.vue'),
-  },
-  {
-    path: '/applications/:id',
-    component: () => import('pages/application/ApplicationPage.vue'),
-    props: true,
+    path: '/api-keys',
+    component: () => import('pages/ApiKeysPage.vue'),
   },
   {
     path: '/:catchAll(.*)*',