✨ disable CORS for public APIs

devlille · Apr 10, 2019 · 5e5475d · 5e5475d
1 parent 114f960
commit 5e5475d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 34 deletions.
diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -17,6 +17,6 @@ exports.makeBillingForPartner = functions.firestore.document('partners/{partnerI
 exports.findAllActiveSpeakers = functions.https.onRequest(findAllActiveSpeakers);
 exports.findAllSpeakersFromConferenceHall = functions.https.onCall(findAllSpeakersFromConferenceHall);
 
-exports.findAllActiveTasks = functions.https.onRequest(findAllActiveTalks);
+exports.findAllActiveTalks = functions.https.onRequest(findAllActiveTalks);
 
 exports.findOneFromConferenceHall = functions.https.onCall(findOneFromConferenceHall);
diff --git a/functions/src/partners/functions/find-all-active-partners.ts b/functions/src/partners/functions/find-all-active-partners.ts
@@ -2,20 +2,12 @@ import * as cors from 'cors';
 import editionsService from '../../editions/business/services/editions.service';
 import partnersService from '../business/services/partners.service';
 
-function checkOrigin(request, callback) {
-    const editionId = request.query.editionId;
-    const origin = request.header('Origin');
-
-    editionsService.findOne(editionId)
-        .then(edition => `https://${edition.url}` === origin ? callback(null, {origin: true}) : callback(null, {origin: false}))
-        .catch(err => {
-            console.error('checkOrigin', err);
-            callback(err, {origin: false});
-        });
+function disableCors(request, callback) {
+    callback(null, true);
 }
 
 export default (request, response) => {
-    cors(checkOrigin)(request, response, () => {
+    cors(disableCors)(request, response, () => {
         const editionId = request.query.editionId;
         console.log('editionId', editionId);
 

diff --git a/functions/src/speakers/functions/find-all-active-speakers.ts b/functions/src/speakers/functions/find-all-active-speakers.ts
@@ -3,20 +3,12 @@ import editionsService from '../../editions/business/services/editions.service';
 
 import speakersService from '../business/services/speakers.service';
 
-function checkOrigin(request, callback) {
-    const editionId = request.query.editionId;
-    const origin = request.header('Origin');
-
-    editionsService.findOne(editionId)
-        .then(edition => `https://${edition.url}` === origin ? callback(null, {origin: true}) : callback(null, {origin: false}))
-        .catch(err => {
-            console.error('checkOrigin', err);
-            callback(err, {origin: false});
-        });
+function disableCors(request, callback) {
+    callback(null, true);
 }
 
 export default (request, response) => {
-    cors(checkOrigin)(request, response, () => {
+    cors(disableCors)(request, response, () => {
         const editionId = request.query.editionId;
         console.log('editionId', editionId);
 

diff --git a/functions/src/talks/functions/find-all-active-talks.ts b/functions/src/talks/functions/find-all-active-talks.ts
@@ -4,20 +4,12 @@ import speakersService from '../../speakers/business/services/speakers.service';
 
 import talksService from '../business/services/talks.service';
 
-function checkOrigin(request, callback) {
-    const editionId = request.query.editionId;
-    const origin = request.header('Origin');
-
-    editionsService.findOne(editionId)
-        .then(edition => `https://${edition.url}` === origin ? callback(null, {origin: true}) : callback(null, {origin: false}))
-        .catch(err => {
-            console.error('checkOrigin', err);
-            callback(err, {origin: false});
-        });
+function disableCors(request, callback) {
+    callback(null, true);
 }
 
 export default (request, response) => {
-    cors(checkOrigin)(request, response, () => {
+    cors(disableCors)(request, response, () => {
         const editionId = request.query.editionId;
         console.log('editionId', editionId);