diff --git a/backend/src/graphql/inputs/GdtInputs.ts b/backend/src/graphql/inputs/GdtInputs.ts index 1404fbf14..e11ce24c1 100644 --- a/backend/src/graphql/inputs/GdtInputs.ts +++ b/backend/src/graphql/inputs/GdtInputs.ts @@ -17,9 +17,6 @@ export class GdtTransactionInput { @ArgsType() export class GdtTransactionSessionIdInput { - @Field(() => Number) - sessionId: number - @Field(() => Int, { nullable: true }) currentPage?: number diff --git a/backend/src/graphql/resolvers/GdtResolver.ts b/backend/src/graphql/resolvers/GdtResolver.ts index 0ff187bd1..b69f6ad7e 100644 --- a/backend/src/graphql/resolvers/GdtResolver.ts +++ b/backend/src/graphql/resolvers/GdtResolver.ts @@ -1,5 +1,7 @@ -// import jwt from 'jsonwebtoken' -import { Resolver, Query, /* Mutation, */ Args } from 'type-graphql' +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ + +import { Resolver, Query, Args, Ctx, Authorized } from 'type-graphql' import CONFIG from '../../config' import { GdtEntryList } from '../models/GdtEntryList' import { GdtTransactionSessionIdInput } from '../inputs/GdtInputs' @@ -7,14 +9,16 @@ import { apiGet } from '../../apis/loginAPI' @Resolver() export class GdtResolver { + @Authorized() @Query(() => GdtEntryList) // eslint-disable-next-line @typescript-eslint/no-explicit-any async listGDTEntries( @Args() - { currentPage = 1, pageSize = 5, order = 'DESC', sessionId }: GdtTransactionSessionIdInput, + { currentPage = 1, pageSize = 5, order = 'DESC' }: GdtTransactionSessionIdInput, + @Ctx() context: any, ): Promise { const result = await apiGet( - `${CONFIG.COMMUNITY_API_URL}listGDTTransactions/${currentPage}/${pageSize}/${order}/${sessionId}`, + `${CONFIG.COMMUNITY_API_URL}listGDTTransactions/${currentPage}/${pageSize}/${order}/${context.sessionId}`, ) if (!result.success) { throw new Error(result.data) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 40a4be074..64e7c4994 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -113,8 +113,8 @@ export const checkUsername = gql` ` export const listGDTEntriesQuery = gql` - query($currentPage: Int!, $pageSize: Int!, $sessionId: Float!) { - listGDTEntries(currentPage: $currentPage, pageSize: $pageSize, sessionId: $sessionId) { + query($currentPage: Int!, $pageSize: Int!) { + listGDTEntries(currentPage: $currentPage, pageSize: $pageSize) { count gdtEntries { amount diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js index 5ad12be97..a3c737d10 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js @@ -57,11 +57,6 @@ describe('GdtTransactionList', () => { $t: jest.fn((t) => t), $n: jest.fn((n) => n), $d: jest.fn((d) => d), - $store: { - state: { - sessionId: 1, - }, - }, $toasted: { error: toastErrorMock, }, @@ -89,7 +84,6 @@ describe('GdtTransactionList', () => { expect(apolloMock).toBeCalledWith( expect.objectContaining({ variables: { - sessionId: 1, currentPage: 1, pageSize: 25, }, diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index 8193717cf..cc42399b7 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -199,7 +199,6 @@ export default { .query({ query: listGDTEntriesQuery, variables: { - sessionId: this.$store.state.sessionId, currentPage: this.currentPage, pageSize: this.pageSize, },