Fix redirect link to calendar

Author: c-harding

server/calendar.ts

@@ -19,8 +19,9 @@ export default function calendarRouter(domain: string): express.Router {
     const token = req.cookies.token;
     const requestLogin = mkRequestLogin(res);
     if (token && (await new Strava(domain, token, requestLogin).hasToken())) {
-      const path = req.get('Host') + req.originalUrl.replace(/\/?$/, '/');
-      const fullPath = `webcal://${path}${req.cookies.token}.ics`;
+      const webcalDomain = domain.replace(/\w+(?=:\/\/)/, 'webcal');
+      const pathWithSlash = req.originalUrl.replace(/\/?$/, '/');
+      const fullPath = webcalDomain + pathWithSlash + token + '.ics';
       res.redirect(fullPath);
     } else {
       await requestLogin();