From 167eb83c30003ee896599c18c991dc371d6b8adf Mon Sep 17 00:00:00 2001
From: Frank <frank.pfeift@protonmail.com>
Date: Tue, 13 Feb 2024 14:58:35 +0100
Subject: [PATCH] fix: frontend graphql queries

---
 frontend/composables/useAuth.ts          |  6 +++---
 frontend/containers/SessionContainer.vue |  4 ++--
 frontend/graphql/me.gql                  |  8 ++++++--
 frontend/graphql/sessions.gql            | 24 ++++++++++++++----------
 frontend/nuxt.config.ts                  |  2 +-
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/frontend/composables/useAuth.ts b/frontend/composables/useAuth.ts
index dc8c3d43..232e0c9b 100644
--- a/frontend/composables/useAuth.ts
+++ b/frontend/composables/useAuth.ts
@@ -4,7 +4,7 @@ import decode from 'jwt-decode'
 import useWallet from './useWallet'
 
 export declare interface User {
-    address: string;
+  address: string;
 }
 
 const user = ref(undefined as User | undefined)
@@ -22,11 +22,11 @@ const useAuth = function () {
   const checkAuthValidity = async () => {
     try {
       const { data, error } = await useAsyncGql('me')
-      if (error.value || !data.value?.me) {
+      if (error.value || !data.value?.system?.auth?.me) {
         user.value = undefined
         return
       }
-      user.value = data.value?.me
+      user.value = data.value?.system?.auth?.me
     } finally {
       isLoading.value = false
     }
diff --git a/frontend/containers/SessionContainer.vue b/frontend/containers/SessionContainer.vue
index 8ca5c11c..68f79f50 100644
--- a/frontend/containers/SessionContainer.vue
+++ b/frontend/containers/SessionContainer.vue
@@ -30,10 +30,10 @@ const getSessions = async () => {
   try {
     errorMessage.value = ''
     const { data, error } = await useAsyncGql('getSessions')
-    if (error.value || !data.value?.sessions) {
+    if (error.value || !data.value?.system?.auth?.sessions) {
       errorMessage.value = error.value?.gqlErrors?.[0]?.message ?? 'Unknown error'
     }
-    sessions.value = data.value?.sessions as Session[]
+    sessions.value = data.value?.system?.auth?.sessions as Session[]
   } finally {
     areSessionsLoading.value = false
   }
diff --git a/frontend/graphql/me.gql b/frontend/graphql/me.gql
index 9012430d..43b49948 100644
--- a/frontend/graphql/me.gql
+++ b/frontend/graphql/me.gql
@@ -1,5 +1,9 @@
 query me {
-    me {
-        address
+    system {
+        auth {
+            me {
+                address
+            }
+        }
     }
 }
diff --git a/frontend/graphql/sessions.gql b/frontend/graphql/sessions.gql
index 9bbef1f8..5a2dd9a2 100644
--- a/frontend/graphql/sessions.gql
+++ b/frontend/graphql/sessions.gql
@@ -1,13 +1,17 @@
 query getSessions {
-    sessions {
-        id
-        createdAt
-        createdBy
-        referenceExpiryDate
-        referenceTokenId
-        isUserCreated
-        name
-        revokedAt
-        allowedOrigins
+    system {
+        auth {
+            sessions {
+                id
+                createdAt
+                createdBy
+                referenceExpiryDate
+                referenceTokenId
+                isUserCreated
+                name
+                revokedAt
+                allowedOrigins
+            }
+        }
     }
 }
diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts
index fdbc8d8b..0511e06d 100644
--- a/frontend/nuxt.config.ts
+++ b/frontend/nuxt.config.ts
@@ -66,7 +66,7 @@ export default defineNuxtConfig({
     clients: {
       default: {
         host: `${API_BASE}/drives`,
-        schema: '../api/src/generated/schema.graphql'
+        schema: '../api/src/graphql/generated/index/schema.graphql'
       }
     }
   }