incyclist-services 1.7.108 → 1.7.110

package/lib/cjs/activities/list/utils.js

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._createUIActivityDetails = exports.createUIActivityDetails = exports.createUIActivitySummary = exports.createUIActivityInfo = void 0;
 const i18n_1 = require("../../i18n");
+const formatOrUndefined = (value, dimension, C, U, digits) => {
+    const converted = C(value, dimension, { digits });
+    if (converted === undefined)
+        return undefined;
+    return { value: converted, unit: U(dimension) };
+};
 const createUIActivityInfo = (a) => {
     if (!a)
         return a;
@@ -17,10 +23,10 @@ const createUIActivitySummary = (summary) => {
         return summary;
     const ui = { ...summary };
     const [C, U] = (0, i18n_1.getUnitConversionShortcuts)();
-    ui.distance = { value: C(summary.distance, 'distance', { digits: 1 }), unit: U('distance') };
-    if (ui.distance.value > 100)
+    ui.distance = formatOrUndefined(summary.distance, 'distance', C, U, 1);
+    if (ui.distance !== undefined && ui.distance.value > 100)
         ui.distance.value = Math.round(ui.distance.value);
-    ui.totalElevation = { value: C(summary.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    ui.totalElevation = formatOrUndefined(summary.totalElevation, 'elevation', C, U, 0);
     return ui;
 };
 exports.createUIActivitySummary = createUIActivitySummary;
@@ -29,9 +35,7 @@ const createUIActivityDetails = (details) => {
         return details;
     const ui = { ...details };
     const [C, U] = (0, i18n_1.getUnitConversionShortcuts)();
-    const formatSpeed = (v) => {
-        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
-    };
+    const formatSpeed = (v) => formatOrUndefined(v, 'speed', C, U, 1);
     if (details.stats?.speed) {
         ui.stats = {
             ...details.stats,
@@ -42,8 +46,8 @@ const createUIActivityDetails = (details) => {
             ui.stats.speed[field] = formatSpeed(ui.stats.speed[field]);
         }
     }
-    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
-    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    ui.distance = formatOrUndefined(details.distance, 'distance', C, U, 1);
+    ui.totalElevation = formatOrUndefined(details.totalElevation, 'elevation', C, U, 0);
     ui.logs = (details.logs ?? []).map(log => {
         const { speed, distance, elevation } = log;
         return {
@@ -61,13 +65,11 @@ const _createUIActivityDetails = (details) => {
         return details;
     const ui = structuredClone(details);
     const [C, U] = (0, i18n_1.getUnitConversionShortcuts)();
-    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
-    if (ui.distance.value > 100)
+    ui.distance = formatOrUndefined(details.distance, 'distance', C, U, 1);
+    if (ui.distance !== undefined && ui.distance.value > 100)
         ui.distance.value = Math.round(ui.distance.value);
-    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
-    const formatSpeed = (v) => {
-        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
-    };
+    ui.totalElevation = formatOrUndefined(details.totalElevation, 'elevation', C, U, 0);
+    const formatSpeed = (v) => formatOrUndefined(v, 'speed', C, U, 1);
     if (ui.stats?.speed) {
         const fields = ['min', 'max', 'avg'];
         for (const field of fields) {

package/lib/cjs/activities/upload/factory.js

@@ -1,4 +1,11 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
     function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
     var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
@@ -26,31 +33,30 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActivityUploadFactory = void 0;
 const types_1 = require("../../base/types");
+const Injection_1 = require("../../base/decorators/Injection");
+const apps_1 = require("../../apps");
 let ActivityUploadFactory = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
+    let _instanceExtraInitializers = [];
+    let _getAppsService_decorators;
     var ActivityUploadFactory = class {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _getAppsService_decorators = [Injection_1.Injectable];
+            __esDecorate(this, null, _getAppsService_decorators, { kind: "method", name: "getAppsService", static: false, private: false, access: { has: obj => "getAppsService" in obj, get: obj => obj.getAppsService }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivityUploadFactory = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        uploaders;
+        uploaders = __runInitializers(this, _instanceExtraInitializers);
         constructor() {
             this.uploaders = [];
         }
@@ -72,7 +78,7 @@ let ActivityUploadFactory = (() => {
             const uploads = [];
             this.uploaders.forEach(ui => {
                 const { service, uploader } = ui;
-                if (uploader.isConnected()) {
+                if (uploader.isConnected() && this.getAppsService().isEnabled(service, 'ActivityUpload')) {
                     const promise = uploader.upload(activity, format)
                         .then(success => ({ service, success }))
                         .catch(err => ({ service, success: false, error: err.message }));
@@ -87,6 +93,16 @@ let ActivityUploadFactory = (() => {
             else
                 return [];
         }
+        isUploadEnabled(service) {
+            const requested = this.uploaders.find(ui => ui.service === service);
+            if (!requested)
+                return false;
+            const uploader = requested.uploader;
+            return (uploader.isConnected() && this.getAppsService().isEnabled(service, 'ActivityUpload'));
+        }
+        getAppsService() {
+            return (0, apps_1.useAppsService)();
+        }
     };
     return ActivityUploadFactory = _classThis;
 })();

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/service.js

@@ -145,10 +145,13 @@ let AppsService = (() => {
         getConnectedServices(operation) {
             const available = this.services[operation];
             if (operation === 'ActivityUpload') {
-                const uploaders = available.map(a => this.getActivityUploadFactory().get(a));
+                const factory = this.getActivityUploadFactory();
+                const uploaders = available.map(a => factory.get(a));
                 const connected = uploaders.map((u, idx) => ({ connected: u?.isConnected(), key: available[idx] }))
                     .filter(s => s.connected);
-                return this.serviceMap.filter(s => connected.find(c => c.key === s.key));
+                const enabled = connected
+                    .filter(s => factory.isUploadEnabled(s.key));
+                return this.serviceMap.filter(s => enabled.find(c => c.key === s.key));
             }
             else if (operation === 'WorkoutDownload') {
                 return this.serviceMap.filter(s => available.includes(s.key) && s.connection.isConnected());

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/cjs/devices/ride/service.js

@@ -50,6 +50,7 @@ const service_2 = require("../../base/service");
 const types_1 = require("../../base/types");
 const Injection_1 = require("../../base/decorators/Injection");
 const apps_1 = require("../../apps");
+const workouts_1 = require("../../workouts");
 const NO_DATA_THRESHOLD = 10000;
 const UNHEALTHY_THRESHOLD = 60000;
 let DeviceRideService = (() => {
@@ -63,6 +64,7 @@ let DeviceRideService = (() => {
     let _getUserSettings_decorators;
     let _getDeviceAccess_decorators;
     let _getGoogleMaps_decorators;
+    let _getWorkoutList_decorators;
     var DeviceRideService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -71,10 +73,12 @@ let DeviceRideService = (() => {
             _getUserSettings_decorators = [Injection_1.Injectable];
             _getDeviceAccess_decorators = [Injection_1.Injectable];
             _getGoogleMaps_decorators = [Injection_1.Injectable];
+            _getWorkoutList_decorators = [Injection_1.Injectable];
             __esDecorate(this, null, _getDeviceConfiguration_decorators, { kind: "method", name: "getDeviceConfiguration", static: false, private: false, access: { has: obj => "getDeviceConfiguration" in obj, get: obj => obj.getDeviceConfiguration }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getDeviceAccess_decorators, { kind: "method", name: "getDeviceAccess", static: false, private: false, access: { has: obj => "getDeviceAccess" in obj, get: obj => obj.getDeviceAccess }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getGoogleMaps_decorators, { kind: "method", name: "getGoogleMaps", static: false, private: false, access: { has: obj => "getGoogleMaps" in obj, get: obj => obj.getGoogleMaps }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             DeviceRideService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -1361,6 +1365,8 @@ let DeviceRideService = (() => {
         }
         canEnforceSimulator() {
             const selected = (0, routes_1.getRouteList)().getSelected();
+            if (this.getWorkoutList().getSelected() && !selected)
+                return true;
             const personalApiKey = this.getGoogleMaps().hasPersonalApiKey();
             if (!selected?.description)
                 return false;
@@ -1416,6 +1422,9 @@ let DeviceRideService = (() => {
         getGoogleMaps() {
             return (0, apps_1.useGoogleMaps)();
         }
+        getWorkoutList() {
+            return (0, workouts_1.useWorkoutList)();
+        }
     };
     return DeviceRideService = _classThis;
 })();

package/lib/esm/activities/list/utils.js

@@ -1,4 +1,10 @@
 import { getUnitConversionShortcuts } from "../../i18n";
+const formatOrUndefined = (value, dimension, C, U, digits) => {
+    const converted = C(value, dimension, { digits });
+    if (converted === undefined)
+        return undefined;
+    return { value: converted, unit: U(dimension) };
+};
 export const createUIActivityInfo = (a) => {
     if (!a)
         return a;
@@ -13,10 +19,10 @@ export const createUIActivitySummary = (summary) => {
         return summary;
     const ui = { ...summary };
     const [C, U] = getUnitConversionShortcuts();
-    ui.distance = { value: C(summary.distance, 'distance', { digits: 1 }), unit: U('distance') };
-    if (ui.distance.value > 100)
+    ui.distance = formatOrUndefined(summary.distance, 'distance', C, U, 1);
+    if (ui.distance !== undefined && ui.distance.value > 100)
         ui.distance.value = Math.round(ui.distance.value);
-    ui.totalElevation = { value: C(summary.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    ui.totalElevation = formatOrUndefined(summary.totalElevation, 'elevation', C, U, 0);
     return ui;
 };
 export const createUIActivityDetails = (details) => {
@@ -24,9 +30,7 @@ export const createUIActivityDetails = (details) => {
         return details;
     const ui = { ...details };
     const [C, U] = getUnitConversionShortcuts();
-    const formatSpeed = (v) => {
-        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
-    };
+    const formatSpeed = (v) => formatOrUndefined(v, 'speed', C, U, 1);
     if (details.stats?.speed) {
         ui.stats = {
             ...details.stats,
@@ -37,8 +41,8 @@ export const createUIActivityDetails = (details) => {
             ui.stats.speed[field] = formatSpeed(ui.stats.speed[field]);
         }
     }
-    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
-    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    ui.distance = formatOrUndefined(details.distance, 'distance', C, U, 1);
+    ui.totalElevation = formatOrUndefined(details.totalElevation, 'elevation', C, U, 0);
     ui.logs = (details.logs ?? []).map(log => {
         const { speed, distance, elevation } = log;
         return {
@@ -55,13 +59,11 @@ export const _createUIActivityDetails = (details) => {
         return details;
     const ui = structuredClone(details);
     const [C, U] = getUnitConversionShortcuts();
-    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
-    if (ui.distance.value > 100)
+    ui.distance = formatOrUndefined(details.distance, 'distance', C, U, 1);
+    if (ui.distance !== undefined && ui.distance.value > 100)
         ui.distance.value = Math.round(ui.distance.value);
-    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
-    const formatSpeed = (v) => {
-        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
-    };
+    ui.totalElevation = formatOrUndefined(details.totalElevation, 'elevation', C, U, 0);
+    const formatSpeed = (v) => formatOrUndefined(v, 'speed', C, U, 1);
     if (ui.stats?.speed) {
         const fields = ['min', 'max', 'avg'];
         for (const field of fields) {

package/lib/esm/activities/upload/factory.js

@@ -1,3 +1,10 @@
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
     function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
     var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
@@ -25,29 +32,28 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 import { Singleton } from "../../base/types";
+import { Injectable } from "../../base/decorators/Injection";
+import { useAppsService } from "../../apps";
 let ActivityUploadFactory = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
+    let _instanceExtraInitializers = [];
+    let _getAppsService_decorators;
     var ActivityUploadFactory = class {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _getAppsService_decorators = [Injectable];
+            __esDecorate(this, null, _getAppsService_decorators, { kind: "method", name: "getAppsService", static: false, private: false, access: { has: obj => "getAppsService" in obj, get: obj => obj.getAppsService }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivityUploadFactory = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        uploaders;
+        uploaders = __runInitializers(this, _instanceExtraInitializers);
         constructor() {
             this.uploaders = [];
         }
@@ -69,7 +75,7 @@ let ActivityUploadFactory = (() => {
             const uploads = [];
             this.uploaders.forEach(ui => {
                 const { service, uploader } = ui;
-                if (uploader.isConnected()) {
+                if (uploader.isConnected() && this.getAppsService().isEnabled(service, 'ActivityUpload')) {
                     const promise = uploader.upload(activity, format)
                         .then(success => ({ service, success }))
                         .catch(err => ({ service, success: false, error: err.message }));
@@ -84,6 +90,16 @@ let ActivityUploadFactory = (() => {
             else
                 return [];
         }
+        isUploadEnabled(service) {
+            const requested = this.uploaders.find(ui => ui.service === service);
+            if (!requested)
+                return false;
+            const uploader = requested.uploader;
+            return (uploader.isConnected() && this.getAppsService().isEnabled(service, 'ActivityUpload'));
+        }
+        getAppsService() {
+            return useAppsService();
+        }
     };
     return ActivityUploadFactory = _classThis;
 })();

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/service.js

@@ -142,10 +142,13 @@ let AppsService = (() => {
         getConnectedServices(operation) {
             const available = this.services[operation];
             if (operation === 'ActivityUpload') {
-                const uploaders = available.map(a => this.getActivityUploadFactory().get(a));
+                const factory = this.getActivityUploadFactory();
+                const uploaders = available.map(a => factory.get(a));
                 const connected = uploaders.map((u, idx) => ({ connected: u?.isConnected(), key: available[idx] }))
                     .filter(s => s.connected);
-                return this.serviceMap.filter(s => connected.find(c => c.key === s.key));
+                const enabled = connected
+                    .filter(s => factory.isUploadEnabled(s.key));
+                return this.serviceMap.filter(s => enabled.find(c => c.key === s.key));
             }
             else if (operation === 'WorkoutDownload') {
                 return this.serviceMap.filter(s => available.includes(s.key) && s.connection.isConnected());

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/esm/devices/ride/service.js

@@ -44,6 +44,7 @@ import { IncyclistService } from "../../base/service";
 import { Singleton } from "../../base/types";
 import { Injectable } from "../../base/decorators/Injection";
 import { useGoogleMaps } from "../../apps";
+import { useWorkoutList } from "../../workouts";
 const NO_DATA_THRESHOLD = 10000;
 const UNHEALTHY_THRESHOLD = 60000;
 let DeviceRideService = (() => {
@@ -57,6 +58,7 @@ let DeviceRideService = (() => {
     let _getUserSettings_decorators;
     let _getDeviceAccess_decorators;
     let _getGoogleMaps_decorators;
+    let _getWorkoutList_decorators;
     var DeviceRideService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -65,10 +67,12 @@ let DeviceRideService = (() => {
             _getUserSettings_decorators = [Injectable];
             _getDeviceAccess_decorators = [Injectable];
             _getGoogleMaps_decorators = [Injectable];
+            _getWorkoutList_decorators = [Injectable];
             __esDecorate(this, null, _getDeviceConfiguration_decorators, { kind: "method", name: "getDeviceConfiguration", static: false, private: false, access: { has: obj => "getDeviceConfiguration" in obj, get: obj => obj.getDeviceConfiguration }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getDeviceAccess_decorators, { kind: "method", name: "getDeviceAccess", static: false, private: false, access: { has: obj => "getDeviceAccess" in obj, get: obj => obj.getDeviceAccess }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getGoogleMaps_decorators, { kind: "method", name: "getGoogleMaps", static: false, private: false, access: { has: obj => "getGoogleMaps" in obj, get: obj => obj.getGoogleMaps }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             DeviceRideService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -1355,6 +1359,8 @@ let DeviceRideService = (() => {
         }
         canEnforceSimulator() {
             const selected = getRouteList().getSelected();
+            if (this.getWorkoutList().getSelected() && !selected)
+                return true;
             const personalApiKey = this.getGoogleMaps().hasPersonalApiKey();
             if (!selected?.description)
                 return false;
@@ -1410,6 +1416,9 @@ let DeviceRideService = (() => {
         getGoogleMaps() {
             return useGoogleMaps();
         }
+        getWorkoutList() {
+            return useWorkoutList();
+        }
     };
     return DeviceRideService = _classThis;
 })();

package/lib/types/activities/upload/factory.d.ts

@@ -9,4 +9,6 @@ export declare class ActivityUploadFactory {
         string: any;
         boolean: any;
     }>>;
+    isUploadEnabled(service: string): boolean;
+    protected getAppsService(): import("../../apps").AppsService;
 }

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/lib/types/devices/ride/service.d.ts

@@ -135,6 +135,7 @@ export declare class DeviceRideService extends IncyclistService {
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getDeviceAccess(): import("../access/service").DeviceAccessService;
     protected getGoogleMaps(): import("../../apps").GoogleMapsService;
+    protected getWorkoutList(): import("../../workouts").WorkoutListService;
 }
 export declare const useDeviceRide: () => DeviceRideService;
 export {};

package/package.json

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