Merge pull request #77 from FreeClimbAPI/pagination-fix

Fix pagination issue

Author: lunderwood99

CHANGELOG.md

@@ -9,6 +9,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 None
 
+<a name="3.7.1"></a>
+
+## [3.7.1] - 2024-09-12
+
+### Fixed
+
+- getNextPage() bug that incorrectly built url 
+
 <a name="3.7.0"></a>
 
 ## [3.7.0] - 2024-08-28

README.md

@@ -14,9 +14,9 @@ For more information, please visit [https://www.freeclimb.com/support/](https://
 ## Installing
 
 ```sh
-npm install @freeclimb/sdk@3.7.0
+npm install @freeclimb/sdk@3.7.1
 or 
-yarn add @freeclimb/sdk@3.7.0
+yarn add @freeclimb/sdk@3.7.1
 ```
 
 ## Getting Started 

__tests__/DefaultApi.spec.ts

@@ -7,10 +7,11 @@ import {AccountStatus, AccountType, CallStatus, MessageDirection, PlayBeep, SMST
 describe('DefaultAPI', () => {
 
     let apiInstance: freeclimb.DefaultApi
+    const accountId = 'YOUR_ACCOUNT_ID'
     beforeAll(() => {
         const configuration = freeclimb.createConfiguration({
             baseServer: new ServerConfiguration<{  }>("http://127.0.0.1:4010", {  }),
-            accountId: 'YOUR_ACCOUNT_ID',
+            accountId: accountId,
             apiKey: 'YOUR_API_KEY'
         });
         apiInstance = new freeclimb.DefaultApi(configuration);
@@ -464,7 +465,7 @@ describe('DefaultAPI', () => {
             page: 0,
             numPages: 0,
             pageSize: 0,
-            nextPageUri: '/Recordings?cursor=1',
+            nextPageUri: `/Accounts/${accountId}/Recordings?cursor=1`,
             recordings: []
         }
         const expectedResponseObject: RecordingList = {

apis/DefaultApi.ts

@@ -2486,14 +2486,9 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
 
     public async getNextPage<T extends PaginationModel>(responseObject: T, _options?: Configuration): Promise<RequestContext> {
         const _config = _options || this.configuration;
-        const { accountId } = this.configuration
-        // Path Params
-        const localVarPath = `/Accounts/{accountId}${responseObject.nextPageUri}`
-            .replace('{' + 'accountId' + '}', encodeURIComponent(String(accountId)));
         // Make Request Context
-        const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        const requestContext = _config.baseServer.makeRequestContext(responseObject.nextPageUri!, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
-        
 
         let authMethod: SecurityAuthentication | undefined;
         // Apply auth methods

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freeclimb/sdk",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "OpenAPI client for @freeclimb/sdk",
   "author": "OpenAPI-Generator Contributors",
   "keywords": [