corrected access to docs #19

added npm cors package
changed location of swagger config ro differ from docs url
improve access to swagger css
added localhost as one of the urls for local testing

Author: lopezjuanma96

functions/getter.js

@@ -9,8 +9,7 @@ function getApp () {
     } catch (e){
         admin.initializeApp({
             credential: admin.credential.cert(serviceAccount),
-            databaseURL: "https://ottaaproject-realiser-lexicons.firebaseio.com/",
-            databaseURL: `${process.env.DATABASE_URL}`,
+            databaseURL: `${process.env.DATABASE_URL}`
         }, 'realiser');
         return admin.app('realiser')
     }

functions/handlers.js

@@ -1,6 +1,5 @@
 const { dbGetter } = require("./getter.js");
 
-
 /*
 async function findART(obj, langRef){
     const addART = []

functions/package.json

@@ -17,6 +17,7 @@
   },
   "main": "index.js",
   "dependencies": {
+    "cors": "^2.8.5",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "firebase-admin": "^10.0.2",

functions/routing.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const swaggerUi = require('swagger-ui-express');
-const swaggerDoc = require('./docs/swagger.config.json')
+const swaggerDoc = require('./swagger/swagger.config.json');
+const cors = require('cors')
 const { log, error } = require("firebase-functions/lib/logger");
 
 const { 
@@ -10,42 +11,26 @@ const {
     realiseSentence 
 } = require('./methods.js');
 
-function allowCors(req, res, next){
-    res.set('Access-Control-Allow-Origin', '*'); //this should be configured for only the apps we want to be able to access the API
-
-    if (req.method === 'OPTIONS') {
-        res.set('Access-Control-Allow-Methods', 'POST');
-        res.set('Access-Control-Allow-Methods', 'GET');
-        res.set('Access-Control-Allow-Headers', 'Content-Type');
-        res.set('Access-Control-Max-Age', '3600');
-        res.status(204).send('');
-    } else {
-        next();
-    }
-}
-
 const app = express()
 
+app.use(cors())
 app.use(express.json());
 app.use(express.urlencoded({extended: true}));
 app.use(express.static(__dirname)); //swagger customCssUrl requires defining an static path on functions (root)
-app.use(
-    '/docs',
-    allowCors,
-    swaggerUi.serve,
-    swaggerUi.setup(swaggerDoc, {
-        customCssUrl: '/assets/swagger.css',
-        customSiteTitle: 'OTTAA Realiser Docs',
-        customfavIcon: '/assets/logo.ico',
-        swaggerOptions: {
-            supportedSubmitMethods: [] //to disable the "Try it out" button
-        }
-    })
-)
+app.use('/docs', swaggerUi.serve)
+app.get('/docs', swaggerUi.setup(swaggerDoc, {
+    customCssUrl: '../assets/swagger.css',
+    customSiteTitle: 'OTTAA Realiser Docs',
+    customfavIcon: '../assets/logo.ico',
+    swaggerOptions: {
+        supportedSubmitMethods: [] //to disable the "Try it out" button
+    }
+}))
+
 
 app.get('/', (req, res) => res.send('Welcome to the coolest Realiser!'))
 
-app.post('/prepare', allowCors, (req, res) => {
+app.post('/prepare', (req, res) => {
     const body = req.body;
     if (!body.words || !body.types) {
         res.status(400).send({err: 'Wrong request body, missing properties words and/or types'})
@@ -59,7 +44,7 @@ app.post('/prepare', allowCors, (req, res) => {
     })
 })
 
-app.post('/parse', allowCors, (req, res) => {
+app.post('/parse', (req, res) => {
     const body = req.body;
     if (!body.words || !body.types) {
         res.status(400).send({err: 'Wrong request body, missing properties words and/or types'})
@@ -75,7 +60,7 @@ app.post('/parse', allowCors, (req, res) => {
     })
 })
 
-app.post('/process', allowCors, (req, res) => {
+app.post('/process', (req, res) => {
     const body = req.body;
     if (!body.words || !body.types) {
         res.status(400).send({err: 'Wrong request body, missing properties words and/or types'})
@@ -92,7 +77,7 @@ app.post('/process', allowCors, (req, res) => {
     })
 })
 
-app.post('/realise', allowCors, (req, res) => {
+app.post('/realise', (req, res) => {
     const body = req.body;
     if (!body.words || !body.types) {
         res.status(400).send({err: 'Wrong request body, missing properties words and/or types'})
@@ -110,7 +95,7 @@ app.post('/realise', allowCors, (req, res) => {
     })
 })
 
-app.post('/replicate', allowCors, (req, res) => {
+app.post('/replicate', (req, res) => {
     res.status(200).json(req.body)
 })
 

functions/docs/swagger.config.json functions/swagger/swagger.config.json

@@ -9,6 +9,10 @@
     {
       "url": "https://us-central1-ottaaproject-flutter.cloudfunctions.net/realiser",
       "description": "deploy"
+    },
+    {
+      "url": "http://localhost:9090",
+      "description": "local"
     }
   ],
   "paths": {