Fix ?

HugoGresse · Feb 1, 2024 · 0ee0cb9 · 0ee0cb9
1 parent 0df83a6
commit 0ee0cb9
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 17 deletions.
diff --git a/functions/package-lock.json b/functions/package-lock.json
diff --git a/functions/package.json b/functions/package.json
@@ -33,7 +33,7 @@
         "@types/qs": "^6.9.4",
         "firebase-functions-test": "^0.1.6",
         "tslint": "^5.12.0",
-        "typescript": "^3.2.2"
+        "typescript": "^5.3.3"
     },
     "private": true
 }
diff --git a/functions/src/callable/getUpcomingEventsManually.ts b/functions/src/callable/getUpcomingEventsManually.ts
@@ -17,10 +17,12 @@ export const getUpcomingEventManually = functions.https.onCall(
         await assertOrganizationAdmins(context, data.organizationId)
 
         const icals: Ical[] = []
+
         const ical = await getIcal(data.icalId)
         if (ical) {
             icals.push(ical)
         }
+
         const icalsDatas = await getIcalFiles(icals)
         return getUpcomingEvents(icalsDatas)
     }

diff --git a/functions/src/eventUpdater/getIcalFiles.ts b/functions/src/eventUpdater/getIcalFiles.ts
@@ -10,7 +10,28 @@ const getIcalFiles = async (icals: Ical[]): Promise<IcalFile[]> => {
     const icalFiles: IcalFile[] = []
     for (const ical of icals) {
         try {
-            const data = await fetch(ical.url).then(res => res.text())
+            const response = await fetch(ical.url, {
+                headers: {
+                    Cookie: 'MEETUP_MEMBER=id=184681297; ',
+                },
+            })
+
+            console.log(
+                'response',
+                response.status,
+                response.statusText,
+                response.ok
+            )
+            if (!response.ok) {
+                throw new Error(
+                    'Error fetching ical: ' +
+                        response.status +
+                        ' ' +
+                        response.statusText
+                )
+            }
+
+            const data = await response.text()
 
             icalFiles.push({
                 data,

diff --git a/functions/src/https/slackOauthRedirect.ts b/functions/src/https/slackOauthRedirect.ts
@@ -5,38 +5,43 @@ import { db, serverTimestamp } from '../utils/initFirebase'
 import { OrganizationId } from '../types/Organization'
 
 export const slackOauthRedirect = functions.https.onRequest(
-    async (request, response) => {
+    async (request, response): Promise<void> => {
         const { slack } = functions.config()
 
         if (!slack || !slack.client_id || !slack.client_secret) {
             console.error(
                 'Missing slack credentials (client_id or client_secret)'
             )
-            return response.status(501).send('Missing slack credentials')
+            response.status(501).send('Missing slack credentials')
+            return
         }
 
         if (request.method !== 'GET') {
             console.error(
                 'Got unsupported ${request.method} request. Expected GET.'
             )
-            return response.status(405).send('Only GET requests are accepted')
+            response.status(405).send('Only GET requests are accepted')
+            return
         }
 
         // SSL_CHECK by slack to confirm SSL cert
         if (request.query && request.query.ssl_check === '1') {
             console.log('Confirmed SSL Cert')
-            return response.status(200).send()
+            response.status(200).send()
+            return
         }
 
         // @ts-ignore
         if (!request.query && !request.query.code && !request.query.status) {
-            return response.status(401).send("Missing query attribute 'code'")
+            response.status(401).send("Missing query attribute 'code'")
+            return
         }
 
         const [organizationId] = request.query.state.split(',')
 
         if (!organizationId) {
-            return response.status(401).send('Missing required attribute')
+            response.status(401).send('Missing required attribute')
+            return
         }
 
         const params = new URLSearchParams()
@@ -55,12 +60,13 @@ export const slackOauthRedirect = functions.https.onRequest(
 
         if (!result.ok) {
             console.error('The request was not ok: ' + JSON.stringify(result))
-            return response
+            response
                 .header(
                     'Location',
                     `https://${process.env.GCLOUD_PROJECT}.web.app`
                 )
                 .send(302)
+            return
         }
 
         const slackResultData = await result.json()
@@ -69,12 +75,13 @@ export const slackOauthRedirect = functions.https.onRequest(
             slackResultData
         )
 
-        return response
+        response
             .header(
                 'Location',
                 `https://${process.env.GCLOUD_PROJECT}.web.app/slackResult?slackInstallId=${installId}`
             )
             .sendStatus(302)
+        return
     }
 )
 
@@ -105,5 +112,5 @@ export const saveNewInstallation = async (
             createdAt: serverTimestamp(),
             organizationId,
         })
-        .then(ref => ref.id)
+        .then((ref) => ref.id)
 }
diff --git a/src/utils/firebase.js b/src/utils/firebase.js
@@ -23,7 +23,7 @@ export const serverTimestamp = firebase.firestore.FieldValue.serverTimestamp
 export const nowTimestamp = firebase.firestore.Timestamp.now
 export const deleteField = firebase.firestore.FieldValue.delete
 
-// firebase.functions().useFunctionsEmulator('http://localhost:5000')
+firebase.functions().useFunctionsEmulator('http://localhost:5000')
 export const functions = {
     getUpcomingEventManually: firebase
         .functions()