incyclist-services 1.7.109 → 1.7.110

package/lib/cjs/apps/base/api/strava/api.js

@@ -9,6 +9,7 @@ const gd_eventlog_1 = require("gd-eventlog");
 const sleep_1 = require("../../../../utils/sleep");
 const API_BASE_URL = 'https://www.strava.com/api/v3';
 const OAUTH_URL = 'https://www.strava.com/oauth';
+const AUTH_SERVER_URL = 'https://auth.incyclist.com';
 class StravaApi extends base_1.AppApiBase {
     config;
     logger;
@@ -158,16 +159,14 @@ class StravaApi extends base_1.AppApiBase {
     async refreshToken() {
         this.logger.logEvent({ message: 'Strava refresh Token start' });
         let requestData;
+        const url = this.getAuthServerUrl() + '/strava/refresh';
         try {
             requestData = {
-                grant_type: 'refresh_token',
-                refresh_token: this.config.refreshToken,
-                client_secret: this.config.clientSecret,
-                client_id: this.config.clientId
+                refresh_token: this.config.refreshToken
             };
             const response = await this.getApi().request({
                 method: 'post',
-                url: this.getOauthBaseUrl() + '/token',
+                url,
                 data: requestData
             });
             this.logger.logEvent({ message: 'Strava refresh Token result', status: 'success' });
@@ -182,7 +181,7 @@ class StravaApi extends base_1.AppApiBase {
             let errorStr = err.message;
             if (err.response) {
                 const { response } = err;
-                errorStr = `HTTP error ${response.status}: ${response.statusText}, url:${this.getOauthBaseUrl() + '/token'}, data:${JSON.stringify(requestData)}`;
+                errorStr = `HTTP error ${response.status}: ${response.statusText}, url:${url}, data:${JSON.stringify(requestData)}`;
             }
             this.logger.logEvent({ message: 'Strava refresh Token result', status: 'error', error: errorStr });
         }
@@ -209,6 +208,14 @@ class StravaApi extends base_1.AppApiBase {
             return OAUTH_URL;
         }
     }
+    getAuthServerUrl() {
+        try {
+            return this.getUserSettings().get('STRAVA_AUTH_SERVER_URL', AUTH_SERVER_URL);
+        }
+        catch {
+            return AUTH_SERVER_URL;
+        }
+    }
     getBaseUrl() {
         try {
             return this.getUserSettings().get('STRAVA_API', API_BASE_URL);

package/lib/cjs/apps/strava/StravaAppConnection.js

@@ -123,9 +123,7 @@ let StravaAppConnection = (() => {
             let isInitialized;
             try {
                 const auth = this.getCredentials();
-                const clientId = this.getSecret('STRAVA_CLIENT_ID');
-                const clientSecret = this.getSecret('STRAVA_CLIENT_SECRET');
-                if (clientId && clientSecret && auth) {
+                if (auth) {
                     this.logEvent({ message: 'Strava init done', hasCredentials: true });
                     this.config = this.buildConfigFromCredentials(auth);
                     this.initApi(this.config);

package/lib/esm/apps/base/api/strava/api.js

@@ -6,6 +6,7 @@ import { EventLogger } from 'gd-eventlog';
 import { sleep } from "../../../../utils/sleep";
 const API_BASE_URL = 'https://www.strava.com/api/v3';
 const OAUTH_URL = 'https://www.strava.com/oauth';
+const AUTH_SERVER_URL = 'https://auth.incyclist.com';
 export class StravaApi extends AppApiBase {
     config;
     logger;
@@ -155,16 +156,14 @@ export class StravaApi extends AppApiBase {
     async refreshToken() {
         this.logger.logEvent({ message: 'Strava refresh Token start' });
         let requestData;
+        const url = this.getAuthServerUrl() + '/strava/refresh';
         try {
             requestData = {
-                grant_type: 'refresh_token',
-                refresh_token: this.config.refreshToken,
-                client_secret: this.config.clientSecret,
-                client_id: this.config.clientId
+                refresh_token: this.config.refreshToken
             };
             const response = await this.getApi().request({
                 method: 'post',
-                url: this.getOauthBaseUrl() + '/token',
+                url,
                 data: requestData
             });
             this.logger.logEvent({ message: 'Strava refresh Token result', status: 'success' });
@@ -179,7 +178,7 @@ export class StravaApi extends AppApiBase {
             let errorStr = err.message;
             if (err.response) {
                 const { response } = err;
-                errorStr = `HTTP error ${response.status}: ${response.statusText}, url:${this.getOauthBaseUrl() + '/token'}, data:${JSON.stringify(requestData)}`;
+                errorStr = `HTTP error ${response.status}: ${response.statusText}, url:${url}, data:${JSON.stringify(requestData)}`;
             }
             this.logger.logEvent({ message: 'Strava refresh Token result', status: 'error', error: errorStr });
         }
@@ -206,6 +205,14 @@ export class StravaApi extends AppApiBase {
             return OAUTH_URL;
         }
     }
+    getAuthServerUrl() {
+        try {
+            return this.getUserSettings().get('STRAVA_AUTH_SERVER_URL', AUTH_SERVER_URL);
+        }
+        catch {
+            return AUTH_SERVER_URL;
+        }
+    }
     getBaseUrl() {
         try {
             return this.getUserSettings().get('STRAVA_API', API_BASE_URL);

package/lib/esm/apps/strava/StravaAppConnection.js

@@ -120,9 +120,7 @@ let StravaAppConnection = (() => {
             let isInitialized;
             try {
                 const auth = this.getCredentials();
-                const clientId = this.getSecret('STRAVA_CLIENT_ID');
-                const clientSecret = this.getSecret('STRAVA_CLIENT_SECRET');
-                if (clientId && clientSecret && auth) {
+                if (auth) {
                     this.logEvent({ message: 'Strava init done', hasCredentials: true });
                     this.config = this.buildConfigFromCredentials(auth);
                     this.initApi(this.config);

package/lib/types/apps/base/api/strava/api.d.ts

@@ -36,5 +36,6 @@ export declare class StravaApi extends AppApiBase {
     protected refreshToken(): Promise<void>;
     protected get(url: string, config?: object): Promise<AxiosResponse>;
     protected getOauthBaseUrl(): any;
+    protected getAuthServerUrl(): any;
     protected getBaseUrl(): any;
 }

package/lib/types/apps/base/api/strava/types.d.ts

@@ -6,9 +6,6 @@ export type StravaConfig = {
     expiration?: Date;
 };
 export type StravaRefreshTokenRequest = {
-    clientId: string;
-    clientSecret: string;
-    grant_type: string;
     refresh_token: string;
 };
 export type StravaRefreshTokenResponse = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.109",
+  "version": "1.7.110",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },