@pax2pay/client 0.3.52 → 0.3.53

package/Client/Accounts/index.ts

@@ -1,25 +1,13 @@
 import * as model from "../../model"
-import { Account } from "../Account"
 import { Connection } from "../Connection"
 import { List } from "../List"
 import { Paginated } from "../Paginated"
-import { Resource } from "../Resource"
 
-export class Accounts extends List<model.AccountResponse, model.AccountSearchRequest> {
+export class Accounts extends List<model.AccountResponse> {
 	protected folder = "funding-accounts"
 	private constructor(connection: Connection) {
 		super(connection)
 	}
-	protected getResourcePath(resource: model.AccountResponse): string {
-		return [this.folder, resource.provider, resource.providerAccountId].join("/")
-	}
-	protected createResource(response: model.AccountResponse): Resource<model.AccountResponse, { [key: string]: any }> {
-		return new Account(
-			this.connection,
-			[this.folder, response.provider, response.providerAccountId].join("/"),
-			response
-		)
-	}
 	static create(connection: Connection) {
 		return new Accounts(connection)
 	}
@@ -35,28 +23,29 @@ export class Accounts extends List<model.AccountResponse, model.AccountSearchReq
 					totalCount: number
 			  }
 			| model.ErrorResponse
-		>(`account-summaries?refresh=false&providerCodes=${providerCodes}${accountId ? `&accountId=${accountId}` : ""}${
-			accountStates ? `&accountStates=${accountStates}` : ""
-		}${providerAccountId ? `&providerAccountId=${providerAccountId}` : ""}
-`)
-		return this.extractResponse(response)
+		>(`account-summaries`, {
+			refresh: false,
+			providerCodes: providerCodes,
+			accountId: accountId,
+			accountStates: accountStates,
+			providerAccountId: providerAccountId,
+		})
+		return this.extractResponse<model.AccountSummary>(response)
 	}
 	async updateFundingAccount(
 		providerCode: model.ProviderCode,
 		providerAccountId: string,
 		request: model.UpdateAccountRequest
 	) {
-		const response = await this.connection.put<Promise<model.ErrorResponse | model.AccountResponse>>(
-			`funding-accounts/${providerCode}/${providerAccountId}`,
+		return await this.connection.put<Promise<model.ErrorResponse | model.AccountResponse>>(
+			`${this.folder}/${providerCode}/${providerAccountId}`,
 			request
 		)
-		return response
 	}
 	async cancelLimitAlert(providerCode: model.ProviderCode, providerAccountId: string) {
-		const response = await this.connection.remove<Promise<model.ErrorResponse | model.AccountResponse>>(
-			`funding-accounts/${providerCode}/${providerAccountId}/limits`
+		return await this.connection.remove<Promise<model.ErrorResponse | model.AccountResponse>>(
+			`${this.folder}/${providerCode}/${providerAccountId}/limits`
 		)
-		return response
 	}
 
 	async getAllFundingAccountsV2Paginated(
@@ -71,7 +60,7 @@ export class Accounts extends List<model.AccountResponse, model.AccountSearchReq
 			(page, size, sort) =>
 				this.connection.get<
 					{ list: model.FundingAccountResponseV2Basic[]; totalCount: number } | model.FundingAccountResponseV2Basic[]
-				>(`v2/funding-accounts`, {
+				>(`v2/${this.folder}`, {
 					page: page,
 					size: size,
 					sort: sort,
@@ -95,7 +84,7 @@ export class Accounts extends List<model.AccountResponse, model.AccountSearchReq
 			(page, size, sort) =>
 				this.connection.get<
 					{ list: model.FundingAccountResponseV2Full[]; totalCount: number } | model.FundingAccountResponseV2Full[]
-				>(`v2/funding-accounts/info`, {
+				>(`v2/${this.folder}/info`, {
 					page: page,
 					size: size,
 					sort: sort,
@@ -108,15 +97,34 @@ export class Accounts extends List<model.AccountResponse, model.AccountSearchReq
 		)
 	}
 	async getFundingAccountV2(providerCode: model.ProviderCode, providerCodeId: string) {
-		const response = await this.connection.get<model.FundingAccountResponseV2Basic>(
-			`v2/funding-accounts/${providerCode}/${providerCodeId}`
+		return await this.connection.get<model.FundingAccountResponseV2Basic>(
+			`v2/${this.folder}/${providerCode}/${providerCodeId}`
 		)
-		return response
 	}
 	async getFundingAccountV2Full(providerCode: model.ProviderCode, providerCodeId: string) {
-		const response = await this.connection.get<model.FundingAccountResponseV2Full>(
-			`v2/funding-accounts/${providerCode}/${providerCodeId}/info`
+		return await this.connection.get<model.FundingAccountResponseV2Full>(
+			`v2/${this.folder}/${providerCode}/${providerCodeId}/info`
+		)
+	}
+	async getFundingAccounts(
+		searchRequest: model.FundingAccountSearchRequest
+	): Promise<model.ErrorResponse | model.AccountResponse[]> {
+		const response = await this.connection.post<{ list: model.AccountResponse[]; totalCount: number }>(
+			`${this.folder}/searches`,
+			searchRequest
 		)
-		return response
+		return this.extractResponse(response)
+	}
+	async getAllFundingAccounts(
+		providerCode: model.ProviderCode,
+		size = 500,
+		sort = "friendlyName"
+	): Promise<model.ErrorResponse | model.AccountResponse[]> {
+		const response = await this.connection.get<{ list: model.AccountResponse[]; totalCount: number }>(this.folder, {
+			provider: providerCode,
+			size: size,
+			sort: sort,
+		})
+		return this.extractResponse(response)
 	}
 }

package/Client/Beneficiaries/index.ts

@@ -1,9 +1,8 @@
 import * as model from "../../model"
-import { Beneficiary } from "../Beneficiary"
 import { Connection } from "../Connection"
 import { List } from "../List"
 
-export class Beneficiaries extends List<model.BeneficiaryResponse, model.BeneficiaryRequest> {
+export class Beneficiaries extends List<model.BeneficiaryResponse> {
 	protected folder = "beneficiaries"
 	constructor(connection: Connection) {
 		super(connection)
@@ -11,16 +10,14 @@ export class Beneficiaries extends List<model.BeneficiaryResponse, model.Benefic
 	static create(connection: Connection): Beneficiaries {
 		return new Beneficiaries(connection)
 	}
-	protected getResourcePath(resource: model.BeneficiaryResponse): string {
-		return [this.folder, resource.beneficiaryId].join("/")
-	}
-	protected createResource(response: model.BeneficiaryResponse): Beneficiary {
-		return new Beneficiary(this.connection, [this.folder, response.beneficiaryId].join("/"), response)
-	}
-
 	async getAll(sort?: string): Promise<model.ErrorResponse | model.BeneficiaryResponse[]> {
 		const response = await this.connection.get<{ list: model.BeneficiaryResponse[]; totalCount: number }>(
-			`${this.folder}?page=0&size=1500${sort ? "&sort=" + sort : ""}`
+			`${this.folder}`,
+			{
+				page: 0,
+				size: 1500,
+				sort: sort,
+			}
 		)
 		return this.extractResponse(response)
 	}
@@ -29,17 +26,18 @@ export class Beneficiaries extends List<model.BeneficiaryResponse, model.Benefic
 	}
 	async searchBeneficiary(request: model.SearchBeneficiaryRequest, sort?: string) {
 		const response = await this.connection.post<model.ErrorResponse | model.BeneficiaryResponse[]>(
-			`${this.folder}/searches?page=0&size=1500${sort ? "&sort=" + sort : ""}`,
-			request
+			`${this.folder}/searches`,
+			request,
+			{
+				page: 0,
+				size: 1500,
+				sort: sort,
+			}
 		)
 		return this.extractResponse(response)
 	}
-	protected map(response: model.BeneficiaryResponse): Beneficiary & model.BeneficiaryResponse {
-		return Object.assign(new Beneficiary(this.connection, this.getResourcePath(response), response), response)
-	}
 	async create(request: model.BeneficiaryRequest) {
-		const result = await this.connection.post<model.BeneficiaryResponse>(`${this.folder}`, request)
-		return model.ErrorResponse.is(result) ? result : this.map(result)
+		return await this.connection.post<model.BeneficiaryResponse>(`${this.folder}`, request)
 	}
 	async update(beneficiaryId: string, request: model.UpdateBeneficiaryRequest) {
 		return await this.connection.put<model.BeneficiaryResponse>(`${this.folder}/${beneficiaryId}`, request)

package/Client/Cards/index.ts

@@ -1,34 +1,15 @@
 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,
-	model.CardSearch,
-	model.CreateCardRequest,
-	Card
-> {
-	protected folder = "cards/virtual"
+export class Cards extends List<model.CardResponseV2 | model.CardResponse> {
+	protected readonly folder = "cards"
 	constructor(connection: Connection) {
 		super(connection)
 	}
-	protected getResourcePath(resource: model.CardResponseV2 | model.CardResponse): string {
-		return [this.folder, resource.providerCode, resource.providerCardId].join("/")
-	}
-	protected createResource(response: model.CardResponseV2): Card {
-		return new Card(this.connection, [this.folder, response.providerCode, response.providerCardId].join("/"), response)
-	}
-	protected map(response: model.CardResponseV2): Card & model.CardResponseV2 {
-		return Object.assign(new Card(this.connection, this.getResourcePath(response), response), response)
-	}
-	protected mapLegacy(response: model.CardResponse): Card & model.CardResponse {
-		return Object.assign(new Card(this.connection, this.getResourcePath(response), response), response)
-	}
 	async create(request: model.CreateCardRequest) {
-		const result = await this.connection.post<model.CardResponseV2>("v2/cards/virtual/tokenised", request)
-		return model.ErrorResponse.is(result) ? result : this.map(result)
+		return await this.connection.post<model.CardResponseV2>(`v2/${this.folder}/virtual/tokenised`, request)
 	}
 	async createCardWithRemittanceAdvice(request: model.CreateCardRequest, file: File) {
 		const formData = new FormData()
@@ -39,12 +20,10 @@ export class Cards extends List<
 				type: "application/json",
 			})
 		)
-		const result = await this.connection.post<model.CardResponseV2>("v2/cards/virtual", formData)
-		return model.ErrorResponse.is(result) ? result : this.map(result)
+		return await this.connection.post<model.CardResponseV2>(`v2/${this.folder}/virtual`, formData)
 	}
 	async createLegacy(request: model.CreateCardRequest) {
-		const result = await this.connection.post<model.CardResponse>("cards/virtual", request)
-		return model.ErrorResponse.is(result) ? result : this.mapLegacy(result)
+		return await this.connection.post<model.CardResponse>(`${this.folder}/virtual`, request)
 	}
 	static create(connection: Connection): Cards {
 		return new Cards(connection)
@@ -60,13 +39,16 @@ export class Cards extends List<
 		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,
-					provider: providerCode,
-					includeCount: includeCount,
-				}),
+				this.connection.get<{ list: model.CardResponseV2[]; totalCount: number } | model.CardResponseV2[]>(
+					`v2/${this.folder}`,
+					{
+						page: page,
+						size: size,
+						sort: sort,
+						provider: providerCode,
+						includeCount: includeCount,
+					}
+				),
 			undefined,
 			page,
 			size,
@@ -74,73 +56,64 @@ export class Cards extends List<
 		)
 	}
 	async getCard(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection
-			.get<model.CardResponse>(`cards/virtual/${providerCode}/${providerCardId}?includeSchedules=true
-`)
-		return model.ErrorResponse.is(result) ? result : this.mapLegacy(result)
+		return await this.connection.get<model.CardResponse>(`${this.folder}/virtual/${providerCode}/${providerCardId}`, {
+			includeSchedules: true,
+		})
 	}
 	async getCardV2(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardResponseV2>(`v2/cards/virtual/${providerCode}/${providerCardId}
+		return await this.connection.get<model.CardResponseV2>(`v2/${this.folder}/virtual/${providerCode}/${providerCardId}
 `)
-		return model.ErrorResponse.is(result) ? result : this.map(result)
 	}
 	async createCard(request: model.CreateCardRequest) {
-		const result = await this.connection.post<model.CardResponse>(`cards/virtual`, request)
-		return model.ErrorResponse.is(result) ? result : this.mapLegacy(result)
+		return await this.connection.post<model.CardResponse>(`${this.folder}/virtual`, request)
 	}
 	async cancelCard(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.remove<model.CardResponse>(
-			`cards/virtual/${providerCode}/${providerCardId}/cancel`
+		return await this.connection.remove<model.CardResponse>(
+			`${this.folder}/virtual/${providerCode}/${providerCardId}/cancel`
 		)
-		return result
 	}
 	async cancelCardV2(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.remove<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/cancel`
+		return await this.connection.remove<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/cancel`
 		)
-		return result
 	}
 	async generateCardV2(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/generate/tokenised`
+		return await this.connection.get<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/generate/tokenised`
 		)
-		return result
 	}
 	async approveCardV2(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.post<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/approve`,
+		return await this.connection.post<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/approve`,
 			undefined
 		)
-		return result
 	}
 	async declineCardV2(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.post<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/decline`,
+		return await this.connection.post<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/decline`,
 			undefined
 		)
-		return result
 	}
 	async thawCardV2(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/thaw`
+		return await this.connection.get<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/thaw`
 		)
-		return result
 	}
 	async freezeCardV2(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/freeze`
+		return await this.connection.get<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/freeze`
 		)
-		return result
 	}
+	//Possibly should be moved to its own class
 	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}`
+			`v2/${this.folder}/types/${providerCode}`
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<model.CardTypeResponseV2>(response)
 	}
+	//Possibly should be moved to its own class
 	async getCardTypes(providerCode: model.ProviderCode) {
-		const result = await this.connection.get<model.CardTypeResponse>(`cards/types/${providerCode}`)
-		return result
+		return await this.connection.get<model.CardTypeResponse>(`${this.folder}/types/${providerCode}`)
 	}
 
 	async searchCardsV2(
@@ -148,11 +121,11 @@ export class Cards extends List<
 		parameters?: Record<string, any>
 	): Promise<model.ErrorResponse | model.CardResponseV2[]> {
 		const response = await this.connection.post<{ list: model.CardResponseV2[]; totalCount: number }>(
-			`v2/cards/searches`,
+			`v2/${this.folder}/searches`,
 			searchRequest,
 			parameters
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<model.CardResponseV2>(response)
 	}
 	async searchCardsV2Paginated(
 		request: model.CardSearchRequest,
@@ -166,7 +139,7 @@ export class Cards extends List<
 			previous,
 			(page, size, sort, request) =>
 				this.connection.post<{ list: model.CardResponseV2[]; totalCount: number } | model.CardResponseV2[]>(
-					`v2/cards/searches`,
+					`v2/${this.folder}/searches`,
 					request,
 					{
 						page: page,
@@ -181,6 +154,7 @@ export class Cards extends List<
 			sort
 		)
 	}
+	// "Deprecated". This was added to the Accounts class so it can be removed from this when switched over wherever it's used
 	async getFundingAccounts(
 		searchRequest: model.FundingAccountSearchRequest
 	): Promise<model.ErrorResponse | model.AccountResponse[]> {
@@ -188,8 +162,9 @@ export class Cards extends List<
 			"funding-accounts/searches",
 			searchRequest
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<model.AccountResponse>(response)
 	}
+	// "Deprecated". This was added to the Accounts class so it can be removed from this when switched over wherever it's used
 	async getAllFundingAccounts(
 		providerCode: model.ProviderCode,
 		size = 500,
@@ -199,39 +174,39 @@ export class Cards extends List<
 			`funding-accounts`,
 			{ provider: providerCode, size: size, sort: sort }
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<model.AccountResponse>(response)
 	}
+	//Possibly should be moved to its own class
 	async getCardBookingInfo(providerCardId: string, providerCode: model.ProviderCode) {
-		const result = await this.connection
-			.get<model.BookingInfoResponse>(`booking-info/cards/${providerCode}/${providerCardId}
+		return await this.connection.get<model.BookingInfoResponse>(`booking-info/cards/${providerCode}/${providerCardId}
 `)
-		return result
 	}
+	//Possibly should be moved to its own class
 	async editCardBookingInfo(providerCardId: string, providerCode: model.ProviderCode, request: Record<string, any>) {
-		const result = await this.connection.put<model.BookingInfoResponse>(
+		return await this.connection.put<model.BookingInfoResponse>(
 			`booking-info/cards/${providerCode}/${providerCardId}`,
 			request
 		)
-		return result
 	}
 	async getCardStatements(
 		providerCardId: string,
 		providerCode: model.ProviderCode
 	): Promise<model.ErrorResponse | model.CardStatement[]> {
 		const response = await this.connection.get<{ list: model.CardStatement[]; totalCount: number }>(
-			`cards/virtual/${providerCode}/${providerCardId}/statements`
+			`${this.folder}/virtual/${providerCode}/${providerCardId}/statements`
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<model.CardStatement>(response)
 	}
 	async getCardTransactions(
 		providerCardId: string,
 		providerCode: model.ProviderCode
 	): Promise<model.ErrorResponse | model.CardTransaction[]> {
 		const response = await this.connection.get<{ list: model.CardTransaction[]; totalCount: number }>(
-			`cards/virtual/${providerCode}/${providerCardId}/transactions`
+			`${this.folder}/virtual/${providerCode}/${providerCardId}/transactions`
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<model.CardTransaction>(response)
 	}
+	//Possibly should be moved to its own class
 	async searchTransaction(accountId: number): Promise<model.ErrorResponse | model.CardTransaction[]> {
 		const response = await this.connection.post<{ list: model.CardTransaction[]; totalCount: number }>(
 			`transactions/searches`,
@@ -239,25 +214,24 @@ export class Cards extends List<
 				accountId: accountId,
 			}
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<model.CardTransaction>(response)
 	}
 	async editSchedule(providerCardId: string, providerCode: model.ProviderCode, request: model.ScheduleEntry[]) {
-		const result = await this.connection.put<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/schedule`,
+		return await this.connection.put<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/schedule`,
 			{
 				schedule: request,
 			}
 		)
-		return result
 	}
 	async amendExistingCardV2(providerCardId: string, providerCode: model.ProviderCode, request: model.AmendCardRequest) {
-		const result = await this.connection.put<model.CardResponseV2>(
-			`v2/cards/virtual/${providerCode}/${providerCardId}/amend`,
+		return await this.connection.put<model.CardResponseV2>(
+			`v2/${this.folder}/virtual/${providerCode}/${providerCardId}/amend`,
 			request
 		)
-		return result
 	}
+	//Possibly should be moved to its own class
 	async getDisplayableCardTypesForProvider(provider: model.ProviderCode = "modulr") {
-		return await this.connection.get<Record<string, string>>(`v2/cards/types/displayable/${provider}`)
+		return await this.connection.get<Record<string, string>>(`v2/${this.folder}/types/displayable/${provider}`)
 	}
 }

package/Client/Categories/index.ts

@@ -1,29 +1,29 @@
 import * as model from "../../model"
 import { CategoryResponse } from "../../model/CategoryResponse"
 import { Connection } from "../Connection"
-export class Categories {
+import { List } from "../List"
+export class Categories extends List<model.CategoryResponse> {
 	protected folder = "category"
-	constructor(private readonly connection: Connection) {}
+	private constructor(connection: Connection) {
+		super(connection)
+	}
 	static create(connection: Connection) {
 		return new Categories(connection)
 	}
 	async getAllCategories() {
-		const result = await this.connection.get<{ list: CategoryResponse[]; totalCount: number }>(`category`, {
+		const result = await this.connection.get<{ list: CategoryResponse[]; totalCount: number }>(this.folder, {
 			size: 100,
 			sort: "name",
 		})
-		if (!model.ErrorResponse.is(result) && "list" in result)
-			return result.list
-		else
-			return result
+		return this.extractResponse(result)
 	}
 	async editCategoryLimits(
 		category: string,
 		request: model.UpdateCategoryRequest
 	): Promise<model.CategoryResponse | model.ErrorResponse> {
-		return await this.connection.put<model.CategoryResponse>(`category/${category}`, request)
+		return await this.connection.put<model.CategoryResponse>(`${this.folder}/${category}`, request)
 	}
 	async getCategory(category: string): Promise<model.CategoryResponse | model.ErrorResponse> {
-		return await this.connection.get<model.CategoryResponse>(`category/${category}`)
+		return await this.connection.get<model.CategoryResponse>(`${this.folder}/${category}`)
 	}
 }

package/Client/Configuration/index.ts

@@ -9,24 +9,20 @@ export class Configuration {
 		return new Configuration(connection)
 	}
 	async getAvailableCurrency(providerCode: ProviderCode = "modulr"): Promise<Currency[] | model.ErrorResponse> {
-		const result = await this.connection.get<Currency[]>(`config/currencies`, { provider: providerCode })
-		return result
+		return await this.connection.get<Currency[]>(`${this.folder}/currencies`, { provider: providerCode })
 	}
 	async updateOrganisationConfig(
 		request: model.OrganisationConfig
 	): Promise<model.OrganisationConfig | model.ErrorResponse> {
-		const result = await this.connection.post<model.OrganisationConfig>(`config/organisation`, request)
-		return result
+		return await this.connection.post<model.OrganisationConfig>(`${this.folder}/organisation`, request)
 	}
 	async getOrganisationConfig(): Promise<model.OrganisationConfig | model.ErrorResponse> {
-		const result = await this.connection.get<model.OrganisationConfig>(`config/organisation`)
-		return result
+		return await this.connection.get<model.OrganisationConfig>(`${this.folder}/organisation`)
 	}
 	async getUserConfig(): Promise<model.UserConfig | model.ErrorResponse> {
-		const result = await this.connection.get<model.UserConfig>(`config/user`)
-		return result
+		return await this.connection.get<model.UserConfig>(`${this.folder}/user`)
 	}
 	async getPortalFeatures(): Promise<model.PaxpayFeature[] | model.ErrorResponse> {
-		return await this.connection.get<model.PaxpayFeature[]>(`config/portal`)
+		return await this.connection.get<model.PaxpayFeature[]>(`${this.folder}/portal`)
 	}
 }

package/Client/Email/index.ts

@@ -8,7 +8,6 @@ export class Email {
 		return new Email(connection)
 	}
 	async validateEmail(email: string) {
-		const result = await this.connection.get<model.EmailValidationResponse>(`email/validate/${email}`)
-		return result
+		return await this.connection.get<model.EmailValidationResponse>(`${this.folder}/validate/${email}`)
 	}
 }

package/Client/List.ts

@@ -1,15 +1,8 @@
 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<
-	Response extends { [key: string]: any },
-	Search extends { [key: string]: any },
-	Request extends { [key: string]: any } = { [key: string]: any },
-	T extends Resource<Response, Request> = Resource<Response, Request>
-> {
+export abstract class List<Response extends { [key: string]: any }> {
 	private DEFAULT_PAGE_SIZE = 20
 	#connection: Connection
 	protected get connection() {
@@ -19,28 +12,7 @@ export abstract class List<
 	constructor(connection: Connection) {
 		this.#connection = connection
 	}
-	protected abstract createResource(response: Response): T
-	protected map(response: Response): T & Response {
-		return Object.assign(this.createResource(response), response)
-	}
-	protected convert<S extends model.ErrorResponse & { status: number }>(result: Response | S): (T & Response) | S
-	protected convert<S extends model.ErrorResponse & { status: number }>(result: Response[] | S): (T & Response)[] | S
-	protected convert<S extends model.ErrorResponse & { status: number }>(
-		result: Response[] | Response | S
-	): (T & Response)[] | (T & Response) | S {
-		return Array.isArray(result) ? result.map(r => this.map(r)) : Connection.isError(result) ? result : this.map(result)
-	}
-	async list(page = 0, size = 20, sort: model.Sorting<Response>[] = []) {
-		return this.convert(await this.connection.get<Response[]>(`${this.folder}${generatePagination(page, size, sort)}`))
-	}
-	async search(pattern: Search | string, page = 0, size = 20, sort: model.Sorting<Response>[] = []) {
-		return this.convert(
-			await (typeof pattern == "string"
-				? this.connection.get<Response[]>(`${this.folder}/searches/${pattern}${generatePagination(page, size, sort)}`)
-				: this.connection.post<Response[]>(`${this.folder}/searches${generatePagination(page, size, sort)}`, pattern))
-		)
-	}
-	async getNextPaginated<R>(
+	async getNextPaginated<R = Response>(
 		previous: Paginated<R> | undefined,
 		callback: (
 			page: number,
@@ -66,7 +38,7 @@ export abstract class List<
 			size = previous.size
 		} else {
 			page = page ?? 0
-			size = size ?? 20
+			size = size ?? this.DEFAULT_PAGE_SIZE
 		}
 
 		const response = await callback(page, size, sort, request)
@@ -87,7 +59,7 @@ export abstract class List<
 		return result
 	}
 
-	extractResponse<R>(value: R[] | { list: R[]; totalCount: number } | model.ErrorResponse) {
+	extractResponse<R = Response>(value: R[] | { list: R[]; totalCount: number } | model.ErrorResponse) {
 		if (!model.ErrorResponse.is(value) && "list" in value)
 			return value.list
 		else

package/Client/Omnisetup/index.ts

@@ -19,6 +19,8 @@ export class Omnisetup {
 		omnisetupRequest: OmnisetupRequest,
 		commit = true
 	): Promise<OmnisetupResponse | ErrorResponse> {
-		return this.connection.post<OmnisetupResponse | ErrorResponse>(`${this.folder}?commit=${commit}`, omnisetupRequest)
+		return this.connection.post<OmnisetupResponse | ErrorResponse>(`${this.folder}`, omnisetupRequest, {
+			commit: commit,
+		})
 	}
 }