@pax2pay/client 0.1.14 → 0.1.16

package/Client/Beneficiaries/index.ts

@@ -17,8 +17,12 @@ export class Beneficiaries extends List<model.BeneficiaryResponse, model.Benefic
 	protected createResource(response: model.BeneficiaryResponse): Beneficiary {
 		return new Beneficiary(this.connection, [this.folder, response.beneficiaryId].join("/"), response)
 	}
-	async getAll() {
-		return await this.connection.get<model.BeneficiaryResponse[]>(`${this.folder}`)
+
+	async getAll(): Promise<model.ErrorResponse | model.BeneficiaryResponse[]> {
+		const response = await this.connection.get<{ list: model.BeneficiaryResponse[]; totalCount: number }>(
+			`${this.folder}`
+		)
+		return this.extractResponse(response)
 	}
 	async getBeneficiary(beneficiaryId: string) {
 		return await this.connection.get<model.BeneficiaryResponse>([this.folder, beneficiaryId].join("/"))

package/Client/Cards/index.ts

@@ -2,6 +2,7 @@ import * as model from "../../model"
 import { Card } from "../Card"
 import { Connection } from "../Connection"
 import { List } from "../List"
+import { Paginated } from "../Paginated"
 
 export class Cards extends List<
 	model.CardResponseV2 | model.CardResponse,
@@ -36,14 +37,25 @@ export class Cards extends List<
 	static create(connection: Connection): Cards {
 		return new Cards(connection)
 	}
-	async getAllCard(page?: number, pageSize?: number) {
-		let path
-		if (page || pageSize)
-			path = `v2/cards?page=${page ?? 0}&size=${pageSize ?? 20}`
-		else
-			path = `v2/cards`
-		const result = await this.connection.get<model.CardResponseV2[]>(path)
-		return result
+	async getAllCardsPaginated(
+		previous?: Paginated<model.CardResponseV2>,
+		page?: number,
+		size?: number,
+		sort = "createdOn,desc"
+	): Promise<model.ErrorResponse | Paginated<model.CardResponseV2>> {
+		return await this.getNextPaginated<model.CardResponseV2>(
+			previous,
+			(page, size, sort) =>
+				this.connection.get<{ list: model.CardResponseV2[]; totalCount: number } | model.CardResponseV2[]>(`v2/cards`, {
+					page: page,
+					size: size,
+					sort: sort,
+				}),
+			undefined,
+			page,
+			size,
+			sort
+		)
 	}
 	async getCard(providerCardId: string, providerCode: model.ProviderCode) {
 		const result = await this.connection
@@ -85,26 +97,69 @@ export class Cards extends List<
 		)
 		return result
 	}
-	async getCardTypesV2(providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardTypeResponseV2[]>(`v2/cards/types/${providerCode}`)
-		return result
+	async getCardTypesV2(providerCode: model.ProviderCode): Promise<model.ErrorResponse | model.CardTypeResponseV2[]> {
+		const response = await this.connection.get<{ list: model.CardTypeResponseV2[]; totalCount: number }>(
+			`v2/cards/types/${providerCode}`
+		)
+		return this.extractResponse(response)
 	}
 	async getCardTypes(providerCode: model.ProviderCode) {
 		const result = await this.connection.get<model.CardTypeResponse>(`cards/types/${providerCode}`)
 		return result
 	}
-	async getFundingAccounts(searchRequest: model.FundingAccountSearchRequest) {
-		const result = await this.connection.post<model.CardFundingAccountResponse[]>(
+
+	async searchCardsV2(
+		searchRequest: model.CardSearchRequest,
+		parameters?: Record<string, any>
+	): Promise<model.ErrorResponse | model.CardResponseV2[]> {
+		const response = await this.connection.post<{ list: model.CardResponseV2[]; totalCount: number }>(
+			`v2/cards/searches`,
+			searchRequest,
+			parameters
+		)
+		return this.extractResponse(response)
+	}
+	async searchCardsV2Paginated(
+		request: model.CardSearchRequest,
+		previous?: Paginated<model.CardResponseV2>,
+		page?: number,
+		size?: number,
+		sort = "createdOn,desc"
+	): Promise<model.ErrorResponse | Paginated<model.CardResponseV2>> {
+		return await this.getNextPaginated<model.CardResponseV2>(
+			previous,
+			(page, size, sort, request) =>
+				this.connection.post<{ list: model.CardResponseV2[]; totalCount: number } | model.CardResponseV2[]>(
+					`v2/cards/searches`,
+					request,
+					{
+						page: page,
+						size: size,
+						sort: sort,
+					}
+				),
+			request,
+			page,
+			size,
+			sort
+		)
+	}
+	async getFundingAccounts(
+		searchRequest: model.FundingAccountSearchRequest
+	): Promise<model.ErrorResponse | model.CardFundingAccountResponse[]> {
+		const response = await this.connection.post<{ list: model.CardFundingAccountResponse[]; totalCount: number }>(
 			"funding-accounts/searches",
 			searchRequest
 		)
-		return result
+		return this.extractResponse(response)
 	}
-	async getAllFundingAccounts(providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardFundingAccountResponse[]>(
+	async getAllFundingAccounts(
+		providerCode: model.ProviderCode
+	): Promise<model.ErrorResponse | model.CardFundingAccountResponse[]> {
+		const response = await this.connection.get<{ list: model.CardFundingAccountResponse[]; totalCount: number }>(
 			`funding-accounts?provider=${providerCode}&size=500`
 		)
-		return result
+		return this.extractResponse(response)
 	}
 	async getCardBookingInfo(providerCardId: string, providerCode: model.ProviderCode) {
 		const result = await this.connection
@@ -119,17 +174,23 @@ export class Cards extends List<
 		)
 		return result
 	}
-	async getCardTransaction(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardProcessedTransaction[]>(
+	async getCardTransaction(
+		providerCardId: string,
+		providerCode: model.ProviderCode
+	): Promise<model.ErrorResponse | model.CardProcessedTransaction[]> {
+		const response = await this.connection.get<{ list: model.CardProcessedTransaction[]; totalCount: number }>(
 			`cards/virtual/${providerCode}/${providerCardId}/statements`
 		)
-		return result
+		return this.extractResponse(response)
 	}
-	async searchTransaction(accountId: number) {
-		const result = await this.connection.post<model.CardTransaction[]>(`transactions/searches`, {
-			accountId: accountId,
-		})
-		return result
+	async searchTransaction(accountId: number): Promise<model.ErrorResponse | model.CardTransaction[]> {
+		const response = await this.connection.post<{ list: model.CardTransaction[]; totalCount: number }>(
+			`transactions/searches`,
+			{
+				accountId: accountId,
+			}
+		)
+		return this.extractResponse(response)
 	}
 	async editSchedule(providerCardId: string, providerCode: model.ProviderCode, request: model.ScheduleEntry[]) {
 		const result = await this.connection.put<model.CardResponse>(

package/Client/Connection.ts

@@ -18,38 +18,61 @@ export class Connection {
 	async fetch<Response, Codes = 400 | 403 | 404 | 500>(
 		path: string,
 		method: string,
-		request?: any
+		request?: any,
+		parameters?: Record<string, any>
 	): Promise<Response | (model.ErrorResponse & { status: Codes | DefaultCodes })> {
 		const headers: Record<string, string> = {
 			"Content-Type": "application/json; charset=utf-8",
 		}
+		try {
+			const data = JSON.parse(window.sessionStorage.getItem("authData") ?? "{}")
+			this.#token = data.token
+		} catch (e) {
+			if (this.token)
+				console.error("Caught exception ", JSON.stringify(e))
+		}
 		if (this.token)
 			headers["X-Auth-Token"] = this.token
-		const response = await fetch(this.url + "/" + path, {
-			method,
-			headers,
-			body: request && JSON.stringify(request),
-		}).catch(_ => undefined)
+		const response = await fetch(
+			this.url +
+				"/" +
+				path +
+				(parameters
+					? "?" +
+					  Object.entries(parameters)
+							.map(param => param.join("="))
+							.join("&")
+					: ""),
+			{
+				method,
+				headers,
+				body: request && JSON.stringify(request),
+			}
+		).catch(_ => undefined)
 		return !response
 			? { status: 503 }
 			: response.status == 401 && (await this.unauthorized(this))
-			? await this.fetch<Response, Codes>(path, method, request)
+			? await this.fetch<Response, Codes>(path, method, request, parameters)
 			: response.headers.get("Content-Type")?.startsWith("application/json")
 			? response.ok
-				? await response.json()
+				? response.headers.get("x-total-count")
+					? { list: await response.json(), totalCount: response.headers.get("x-total-count") }
+					: await response.json()
 				: { status: response.status, ...(await response.json()) }
 			: { status: response.status, value: await response.text() }
 	}
 	async post<Response, Codes = 400 | 403 | 404 | 500>(
 		path: string,
-		request: any
+		request: any,
+		parameters?: Record<string, any>
 	): Promise<Response | (model.ErrorResponse & { status: Codes | DefaultCodes })> {
-		return await this.fetch<Response, Codes>(path, "POST", request)
+		return await this.fetch<Response, Codes>(path, "POST", request, parameters)
 	}
 	async get<Response, Codes = 400 | 403 | 404 | 500>(
-		path: string
+		path: string,
+		parameters?: Record<string, any>
 	): Promise<Response | (model.ErrorResponse & { status: Codes | DefaultCodes })> {
-		return await this.fetch<Response, Codes>(path, "GET")
+		return await this.fetch<Response, Codes>(path, "GET", undefined, parameters)
 	}
 	async put<Response, Codes = 400 | 403 | 404 | 500>(
 		path: string,
@@ -62,8 +85,8 @@ export class Connection {
 	): Promise<Response | (model.ErrorResponse & { status: Codes | DefaultCodes })> {
 		return await this.fetch<Response, Codes>(path, "DELETE")
 	}
-	static open(url: string | undefined, token: string | undefined): Connection | undefined {
-		return url ? new Connection(url, token) : undefined
+	static open(url: string, token: string | undefined): Connection {
+		return new Connection(url, token)
 	}
 	static isError(
 		value: (model.ErrorResponse & { status: number }) | any

package/Client/List.ts

@@ -1,6 +1,7 @@
 import * as model from "../model"
 import { Connection } from "./Connection"
 import { generatePagination } from "./generatePagination"
+import { Paginated } from "./Paginated"
 import { Resource } from "./Resource"
 
 export abstract class List<
@@ -9,6 +10,7 @@ export abstract class List<
 	Request extends { [key: string]: any } = { [key: string]: any },
 	T extends Resource<Response, Request> = Resource<Response, Request>
 > {
+	private DEFAULT_PAGE_SIZE = 20
 	#connection: Connection
 	protected get connection() {
 		return this.#connection
@@ -38,4 +40,57 @@ export abstract class List<
 				: this.connection.post<Response[]>(`${this.folder}/searches${generatePagination(page, size, sort)}`, pattern))
 		)
 	}
+	async getNextPaginated<R>(
+		previous: Paginated<R> | undefined,
+		callback: (
+			page: number,
+			size: number,
+			sort?: string,
+			request?: Record<string, any>
+		) => Promise<model.ErrorResponse | { list: R[]; totalCount: number } | R[]>,
+		request?: Record<string, any>,
+		chosenPage?: number,
+		chosenSize?: number,
+		chosenSort?: string
+	) {
+		const sort = chosenSort
+		let page = chosenPage
+		let size = chosenSize
+		let result
+		if (previous) {
+			if (previous.hasNextPage() == false) {
+				return new Paginated([], previous.totalCount, previous.page, previous.size, true)
+			}
+
+			page = previous.nextPage()
+			size = previous.size
+		} else {
+			page = page ?? 0
+			size = size ?? 20
+		}
+
+		const response = await callback(page, size, sort, request)
+		if (model.ErrorResponse.is(response)) {
+			result = response
+		} else {
+			let totalCount = -1
+			let list: R[]
+			if (!Array.isArray(response)) {
+				list = response.list
+				totalCount = response.totalCount
+			} else {
+				list = response
+			}
+
+			result = new Paginated(list, totalCount, page, size, list.length < size)
+		}
+		return result
+	}
+
+	extractResponse<R>(value: { list: R[]; totalCount: number } | model.ErrorResponse) {
+		if (!model.ErrorResponse.is(value))
+			return value.list
+		else
+			return value
+	}
 }

package/Client/Paginated.ts

@@ -0,0 +1,30 @@
+/**
+ * Class for handling pagination, one instance represents a page of the List/Collection.
+ * Can be used in combination with List#getNextPaginated
+ *
+ * data - list representing current page's data
+ * totalCount - the total amount of rows available in the List/Collection
+ * page - current page
+ * size - current size
+ * endReached - indicator whether there is no more data
+ */
+export class Paginated<T> {
+	constructor(
+		readonly data: T[],
+		readonly totalCount: number,
+		readonly page: number,
+		readonly size: number,
+		readonly endReached: boolean
+	) {}
+	nextPage(): number {
+		return this.page + 1
+	}
+
+	hasNextPage(): boolean {
+		return !this.endReached
+	}
+
+	isTotalCountKnown(): boolean {
+		return this.totalCount >= 0
+	}
+}

package/Client/Reports/index.ts

@@ -32,7 +32,7 @@ export class Reports {
 		return await this.connection.post<model.Report.Statement>(`../reports/statement`, request)
 	}
 
-	statementForTable(
+	async statementForTable(
 		request: model.StatementReportRequest,
 		page?: number,
 		pageSize?: number
@@ -46,7 +46,11 @@ export class Reports {
 		if (page || pageSize)
 			path = this.attachPageable(path, page, pageSize)
 
-		return this.connection.post<model.StatementReportResponse>(path, request)
+		let result
+		result = await this.connection.post<{ list: model.StatementReportResponse; totalCount: number }>(path, request)
+		if (!model.ErrorResponse.is(result))
+			result = result.list
+		return result
 	}
 	async getStatementForTable(rowId: string) {
 		const result = await this.connection.get<model.StatementReportResponseRow>(`statement/${rowId}

package/Client/Transfers/index.ts

@@ -21,8 +21,9 @@ export class Transfers extends List<model.TransferResponse, model.TransferSearch
 			response
 		)
 	}
-	async getAll() {
-		return await this.connection.get<model.TransferResponse[]>(`${this.folder}`)
+	async getAll(): Promise<model.ErrorResponse | model.TransferResponse[]> {
+		const response = await this.connection.get<{ list: model.TransferResponse[]; totalCount: number }>(`${this.folder}`)
+		return this.extractResponse(response)
 	}
 	async getTransfer(provider: model.ProviderCode, transferId: string) {
 		return await this.connection.get<model.TransferResponse>([this.folder, provider, transferId].join("/"))

package/Client/Users/index.ts

@@ -20,25 +20,28 @@ export class Users extends Collection<model.UserResponse, model.UserSearchReques
 		return result
 	}
 	async getAllUsers(): Promise<model.UserResponse[] | model.ErrorResponse> {
-		const result = await this.connection.get<model.UserResponse[]>(`users?size=500&sort=username`)
-		return result
+		const response = await this.connection.get<{ list: model.UserResponse[]; totalCount: number }>(
+			`users?size=500&sort=username`
+		)
+		return this.extractResponse(response)
 	}
 	async getCategory(): Promise<string[] | model.ErrorResponse> {
 		const result = await this.connection.get<string[]>(`users/category`)
 		return result
 	}
 	async getRolesets(): Promise<model.RolesetResponse[] | model.ErrorResponse> {
-		const result = await this.connection.get<model.RolesetResponse[]>(`rolesets`)
-		return result
+		const response = await this.connection.get<{ list: model.RolesetResponse[]; totalCount: number }>(`rolesets`)
+		return this.extractResponse(response)
 	}
 	async getUser(username: string): Promise<model.UserResponse | model.ErrorResponse> {
 		const result = await this.connection.get<model.UserResponse>(`users/${username}`)
 		return result
 	}
-	async getUsersActiveRoles(username: string, token: string): Promise<string[] | model.ErrorResponse> {
-		this.connection.token = token
-		const result = await this.connection.get<string[]>(`users/${username}/roles/minified`)
-		return result
+	async getUsersActiveRoles(username: string): Promise<string[] | model.ErrorResponse> {
+		const response = await this.connection.get<{ list: string[]; totalCount: number }>(
+			`users/${username}/roles/minified`
+		)
+		return this.extractResponse(response)
 	}
 	async resetPassword(username: string): Promise<model.PasswordResetResponse | model.ErrorResponse> {
 		const result = await this.connection.post<model.PasswordResetResponse>(`auth/passwordreset`, { username: username })

package/Client/index.ts

@@ -12,6 +12,7 @@ import { Email as ClientEmail } from "./Email"
 import { List as ClientList } from "./List"
 import { Organisation as ClientOrganisation } from "./Organisation"
 import { Organisations as ClientOrganisations } from "./Organisations"
+import { Paginated as ClientPaginated } from "./Paginated"
 import { Reports as ClientReports } from "./Reports"
 import { Resource as ClientResource } from "./Resource"
 import { Transfers as ClientTransfers } from "./Transfers"
@@ -70,4 +71,5 @@ export namespace Client {
 		Request
 	>
 	export type Resource<Response, Request> = ClientResource<Response, Request>
+	export type Paginated<T> = ClientPaginated<T>
 }

package/dist/Client/Beneficiaries/index.d.ts

@@ -8,9 +8,7 @@ export declare class Beneficiaries extends List<model.BeneficiaryResponse, model
     static create(connection: Connection): Beneficiaries;
     protected getResourcePath(resource: model.BeneficiaryResponse): string;
     protected createResource(response: model.BeneficiaryResponse): Beneficiary;
-    getAll(): Promise<model.BeneficiaryResponse[] | (model.ErrorResponse & {
-        status: 400 | 404 | 500 | 403 | 503;
-    })>;
+    getAll(): Promise<model.ErrorResponse | model.BeneficiaryResponse[]>;
     getBeneficiary(beneficiaryId: string): Promise<model.BeneficiaryResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;

package/dist/Client/Beneficiaries/index.js

@@ -16,7 +16,8 @@ export class Beneficiaries extends List {
         return new Beneficiary(this.connection, [this.folder, response.beneficiaryId].join("/"), response);
     }
     async getAll() {
-        return await this.connection.get(`${this.folder}`);
+        const response = await this.connection.get(`${this.folder}`);
+        return this.extractResponse(response);
     }
     async getBeneficiary(beneficiaryId) {
         return await this.connection.get([this.folder, beneficiaryId].join("/"));

package/dist/Client/Beneficiaries/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Beneficiaries/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE9B,MAAM,OAAO,aAAc,SAAQ,IAAyD;IAE3F,YAAY,UAAsB;QACjC,KAAK,CAAC,UAAU,CAAC,CAAA;QAFR,WAAM,GAAG,eAAe,CAAA;IAGlC,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,UAAsB;QACnC,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAA;IACrC,CAAC;IACS,eAAe,CAAC,QAAmC;QAC5D,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvD,CAAC;IACS,cAAc,CAAC,QAAmC;QAC3D,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAA;IACnG,CAAC;IACD,KAAK,CAAC,MAAM;QACX,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA8B,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;IAChF,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,aAAqB;QACzC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACpG,CAAC;IACS,GAAG,CAAC,QAAmC;QAChD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC3G,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAiC;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAA4B,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;QAC/F,OAAO,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAClE,CAAC;CACD"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Beneficiaries/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE9B,MAAM,OAAO,aAAc,SAAQ,IAAyD;IAE3F,YAAY,UAAsB;QACjC,KAAK,CAAC,UAAU,CAAC,CAAA;QAFR,WAAM,GAAG,eAAe,CAAA;IAGlC,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,UAAsB;QACnC,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAA;IACrC,CAAC;IACS,eAAe,CAAC,QAAmC;QAC5D,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvD,CAAC;IACS,cAAc,CAAC,QAAmC;QAC3D,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAA;IACnG,CAAC;IAED,KAAK,CAAC,MAAM;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CACzC,GAAG,IAAI,CAAC,MAAM,EAAE,CAChB,CAAA;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,aAAqB;QACzC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACpG,CAAC;IACS,GAAG,CAAC,QAAmC;QAChD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC3G,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAiC;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAA4B,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;QAC/F,OAAO,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAClE,CAAC;CACD"}

package/dist/Client/Cards/index.d.ts

@@ -2,6 +2,7 @@ import * as model from "../../model";
 import { Card } from "../Card";
 import { Connection } from "../Connection";
 import { List } from "../List";
+import { Paginated } from "../Paginated";
 export declare class Cards extends List<model.CardResponseV2 | model.CardResponse, model.CardSearch, model.CreateCardRequest, Card> {
     protected folder: string;
     constructor(connection: Connection);
@@ -16,9 +17,7 @@ export declare class Cards extends List<model.CardResponseV2 | model.CardRespons
         status: 400 | 404 | 500 | 403 | 503;
     }) | (Card & model.CardResponse)>;
     static create(connection: Connection): Cards;
-    getAllCard(page?: number, pageSize?: number): Promise<(model.ErrorResponse & {
-        status: 400 | 404 | 500 | 403 | 503;
-    }) | model.CardResponseV2[]>;
+    getAllCardsPaginated(previous?: Paginated<model.CardResponseV2>, page?: number, size?: number, sort?: string): Promise<model.ErrorResponse | Paginated<model.CardResponseV2>>;
     getCard(providerCardId: string, providerCode: model.ProviderCode): Promise<(model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     }) | (Card & model.CardResponse)>;
@@ -40,30 +39,22 @@ export declare class Cards extends List<model.CardResponseV2 | model.CardRespons
     freezeCard(providerCardId: string, providerCode: model.ProviderCode): Promise<model.CardResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;
-    getCardTypesV2(providerCode: model.ProviderCode): Promise<(model.ErrorResponse & {
-        status: 400 | 404 | 500 | 403 | 503;
-    }) | model.CardTypeResponseV2[]>;
+    getCardTypesV2(providerCode: model.ProviderCode): Promise<model.ErrorResponse | model.CardTypeResponseV2[]>;
     getCardTypes(providerCode: model.ProviderCode): Promise<model.CardTypeResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;
-    getFundingAccounts(searchRequest: model.FundingAccountSearchRequest): Promise<(model.ErrorResponse & {
-        status: 400 | 404 | 500 | 403 | 503;
-    }) | model.CardFundingAccountResponse[]>;
-    getAllFundingAccounts(providerCode: model.ProviderCode): Promise<(model.ErrorResponse & {
-        status: 400 | 404 | 500 | 403 | 503;
-    }) | model.CardFundingAccountResponse[]>;
+    searchCardsV2(searchRequest: model.CardSearchRequest, parameters?: Record<string, any>): Promise<model.ErrorResponse | model.CardResponseV2[]>;
+    searchCardsV2Paginated(request: model.CardSearchRequest, previous?: Paginated<model.CardResponseV2>, page?: number, size?: number, sort?: string): Promise<model.ErrorResponse | Paginated<model.CardResponseV2>>;
+    getFundingAccounts(searchRequest: model.FundingAccountSearchRequest): Promise<model.ErrorResponse | model.CardFundingAccountResponse[]>;
+    getAllFundingAccounts(providerCode: model.ProviderCode): Promise<model.ErrorResponse | model.CardFundingAccountResponse[]>;
     getCardBookingInfo(providerCardId: string, providerCode: model.ProviderCode): Promise<model.BookingInfoResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;
     editCardBookingInfo(providerCardId: string, providerCode: model.ProviderCode, request: Record<string, any>): Promise<model.BookingInfoResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;
-    getCardTransaction(providerCardId: string, providerCode: model.ProviderCode): Promise<(model.ErrorResponse & {
-        status: 400 | 404 | 500 | 403 | 503;
-    }) | model.CardProcessedTransaction[]>;
-    searchTransaction(accountId: number): Promise<(model.ErrorResponse & {
-        status: 400 | 404 | 500 | 403 | 503;
-    }) | model.CardTransaction[]>;
+    getCardTransaction(providerCardId: string, providerCode: model.ProviderCode): Promise<model.ErrorResponse | model.CardProcessedTransaction[]>;
+    searchTransaction(accountId: number): Promise<model.ErrorResponse | model.CardTransaction[]>;
     editSchedule(providerCardId: string, providerCode: model.ProviderCode, request: model.ScheduleEntry[]): Promise<model.CardResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;

package/dist/Client/Cards/index.js

@@ -29,14 +29,12 @@ export class Cards extends List {
     static create(connection) {
         return new Cards(connection);
     }
-    async getAllCard(page, pageSize) {
-        let path;
-        if (page || pageSize)
-            path = `v2/cards?page=${page !== null && page !== void 0 ? page : 0}&size=${pageSize !== null && pageSize !== void 0 ? pageSize : 20}`;
-        else
-            path = `v2/cards`;
-        const result = await this.connection.get(path);
-        return result;
+    async getAllCardsPaginated(previous, page, size, sort = "createdOn,desc") {
+        return await this.getNextPaginated(previous, (page, size, sort) => this.connection.get(`v2/cards`, {
+            page: page,
+            size: size,
+            sort: sort,
+        }), undefined, page, size, sort);
     }
     async getCard(providerCardId, providerCode) {
         const result = await this.connection
@@ -69,20 +67,31 @@ export class Cards extends List {
         return result;
     }
     async getCardTypesV2(providerCode) {
-        const result = await this.connection.get(`v2/cards/types/${providerCode}`);
-        return result;
+        const response = await this.connection.get(`v2/cards/types/${providerCode}`);
+        return this.extractResponse(response);
     }
     async getCardTypes(providerCode) {
         const result = await this.connection.get(`cards/types/${providerCode}`);
         return result;
     }
+    async searchCardsV2(searchRequest, parameters) {
+        const response = await this.connection.post(`v2/cards/searches`, searchRequest, parameters);
+        return this.extractResponse(response);
+    }
+    async searchCardsV2Paginated(request, previous, page, size, sort = "createdOn,desc") {
+        return await this.getNextPaginated(previous, (page, size, sort, request) => this.connection.post(`v2/cards/searches`, request, {
+            page: page,
+            size: size,
+            sort: sort,
+        }), request, page, size, sort);
+    }
     async getFundingAccounts(searchRequest) {
-        const result = await this.connection.post("funding-accounts/searches", searchRequest);
-        return result;
+        const response = await this.connection.post("funding-accounts/searches", searchRequest);
+        return this.extractResponse(response);
     }
     async getAllFundingAccounts(providerCode) {
-        const result = await this.connection.get(`funding-accounts?provider=${providerCode}&size=500`);
-        return result;
+        const response = await this.connection.get(`funding-accounts?provider=${providerCode}&size=500`);
+        return this.extractResponse(response);
     }
     async getCardBookingInfo(providerCardId, providerCode) {
         const result = await this.connection
@@ -95,14 +104,14 @@ export class Cards extends List {
         return result;
     }
     async getCardTransaction(providerCardId, providerCode) {
-        const result = await this.connection.get(`cards/virtual/${providerCode}/${providerCardId}/statements`);
-        return result;
+        const response = await this.connection.get(`cards/virtual/${providerCode}/${providerCardId}/statements`);
+        return this.extractResponse(response);
     }
     async searchTransaction(accountId) {
-        const result = await this.connection.post(`transactions/searches`, {
+        const response = await this.connection.post(`transactions/searches`, {
             accountId: accountId,
         });
-        return result;
+        return this.extractResponse(response);
     }
     async editSchedule(providerCardId, providerCode, request) {
         const result = await this.connection.put(`cards/virtual/${providerCode}/${providerCardId}/schedule`, {

package/dist/Client/Cards/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Cards/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Cards/index.ts"],"names":[],"mappings":"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"}