From 5c52ed74671c20a9436ed234516e15b7f995fa22 Mon Sep 17 00:00:00 2001
From: Nikolas Poklitar <nikolas.poklitar@gmail.com>
Date: Tue, 15 Sep 2020 10:15:59 -0500
Subject: [PATCH] Add Club activities & RefreshTokenResponse typing (#95)

---
 index.d.ts        | 55 +++++++++++++++++++++++++++++++++++++++--------
 lib/httpClient.js |  2 +-
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 47fdba7..b582261 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,6 +1,10 @@
 
 type Callback = (error: any, payload: any) => void;
 
+interface BaseArgs {
+    access_token?: string;
+}
+
 export interface PushSubscriptionRoutes {
     list(done?: Callback): Promise<any>;
     create(args: any, done?: Callback): Promise<any>;
@@ -43,14 +47,39 @@ export interface RunningRacesRoutes {
 }
 
 export interface ClubsRoutes {
-    get(args: any, done?: Callback): Promise<any>;
-    listMembers(args: any, done?: Callback): Promise<any>;
-    listActivities(args: any, done?: Callback): Promise<any>;
-    listAnnouncements(args: any, done?: Callback): Promise<any>;
-    listEvents(args: any, done?: Callback): Promise<any>;
-    listAdmins(args: any, done?: Callback): Promise<any>;
-    joinClub(args: any, done?: Callback): Promise<any>;
-    leaveClub(args: any, done?: Callback): Promise<any>;
+    get(args: ClubsRoutesArgs, done?: Callback): Promise<any>;
+    listMembers(args: ClubsRoutesListArgs, done?: Callback): Promise<any>;
+    listActivities(args: ClubsRoutesListArgs, done?: Callback): Promise<ClubActivity[]>;
+    listAnnouncements(args: ClubsRoutesListArgs, done?: Callback): Promise<any>;
+    listEvents(args: ClubsRoutesListArgs, done?: Callback): Promise<any>;
+    listAdmins(args: ClubsRoutesListArgs, done?: Callback): Promise<any>;
+    joinClub(args: ClubsRoutesListArgs, done?: Callback): Promise<any>;
+    leaveClub(args: ClubsRoutesListArgs, done?: Callback): Promise<any>;
+}
+
+export interface ClubsRoutesArgs extends BaseArgs {
+    id: string;
+}
+
+export interface ClubsRoutesListArgs extends ClubsRoutesArgs {
+    page?: number;
+    per_page?: number;
+}
+
+export interface ClubActivity {
+    resource_state: number;
+    athlete: {
+        resource_state: number;
+        firstname: string;
+        lastname: string;
+    };
+    name: string;
+    distance: number;
+    moving_time: number;
+    elapsed_time: number;
+    total_elevation_gain: number;
+    type: string;
+    workout_type?: number | null;
 }
 
 export interface AthletesRoutes {
@@ -83,10 +112,18 @@ export interface AthleteRoutes {
 export interface OAuthRoutes {
     getRequestAccessURL(args: any): Promise<any>;
     getToken(code: string, done?: Callback): Promise<any>;
-    refreshToken(code: string): Promise<any>;
+    refreshToken(code: string): Promise<RefreshTokenResponse>;
     deauthorize(args: any, done?: Callback): Promise<any>;
 }
 
+export interface RefreshTokenResponse {
+    token_type: string;
+    access_token: string;
+    expires_at: number;
+    expires_in: number;
+    refresh_token: string;
+}
+
 export interface RateLimiting {
     exceeded(): boolean;
     fractionReached(): boolean;
diff --git a/lib/httpClient.js b/lib/httpClient.js
index 72defd6..2cfce8a 100644
--- a/lib/httpClient.js
+++ b/lib/httpClient.js
@@ -193,7 +193,7 @@ HttpClient.prototype._requestHelper = function (options, done) {
       if (e.response && e.response.headers) {
         limits = rateLimiting.updateRateLimits(e.response.headers)
       }
-    
+
       return Promise.reject(e)
     })
     .asCallback(callback)