Skip to content

Commit e21b3ea

Browse files
committed
Merge branch 'master' into feature/internationalize-error-messages
2 parents 4dafae1 + 63181a7 commit e21b3ea

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,14 @@ React Firebase Admin is our in-house admin dashboard boilerplate, used in many o
139139
### Cloud functions
140140

141141
- [Express](https://github.com/expressjs/express) (★ 47.5k) fast, unopinionated, minimalist web framework for node.
142+
- [Cors](https://github.com/expressjs/cors) (★ 4.4k) Node.js CORS middleware.
142143
- [Firebase-admin](https://github.com/firebase/firebase-admin-node) (★ 790) Firebase Admin Node.js SDK.
143144
- [Firebase-functions](https://github.com/firebase/firebase-functions) (★ 658) Firebase SDK for Cloud Functions.
144145
- [@google-cloud/storage](https://github.com/googleapis/nodejs-storage) (★ 421) Node.js client for Google Cloud Storage.
145146
- [Firebase-function-tools](https://github.com/TarikHuber/react-most-wanted) (★ 780) a tool for naming and loading our Cloud Functions.
146147
- [Cookie-parser](https://github.com/expressjs/cookie-parser) (★ 1.4k) parse HTTP request cookies.
147148
- [Uuid](https://github.com/uuidjs/uuid) (★ 8.7k) generate RFC-compliant UUIDs in JavaScript.
149+
- [Glob](https://github.com/isaacs/node-glob) (★ 6.2k) glob functionality for Node.js.
148150
- [Fs-extra](https://github.com/jprichardson/node-fs-extra) (★ 6.6k) Node.js: extra methods for the fs object like copy(), remove(), mkdirs().
149151
- [Resize Image](https://github.com/firebase/extensions/tree/master/storage-resize-images) (★ 372) Firebase Extension to create resized versions of images uploaded to Cloud Storage.
150152

functions/requests/app.function.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
const { https } = require('firebase-functions');
22
const express = require('express');
33
const cookieParser = require('cookie-parser')();
4+
const cors = require('cors')({ origin: true });
45

56
const validateFirebaseIdToken = require('./middlewares/auth');
67
const usersRoute = require('./routes/users');
78

89
const app = express();
910

11+
app.use(cors);
1012
app.use(cookieParser);
1113
app.use(validateFirebaseIdToken);
1214

functions/requests/routes/users.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const express = require('express');
22
const admin = require('firebase-admin');
3+
const cors = require('cors')({ origin: true });
34
const { v4: uuid } = require('uuid');
45

56
const router = express.Router();
@@ -14,22 +15,25 @@ const createUserAuth = async (email, isAdmin) => {
1415
return uid;
1516
};
1617

17-
router.post('/', async (request, response) => {
18-
const { email, isAdmin } = request.body;
18+
router.post('/', (request, response) => {
19+
cors(request, response, async () => {
20+
const { email, isAdmin } = request.body;
1921

20-
if (!email) {
21-
return response.status(400).json({ error: { code: 'auth/invalid-email' } });
22-
}
22+
if (!email) {
23+
return response
24+
.status(400)
25+
.json({ error: { code: 'auth/invalid-email' } });
26+
}
2327

24-
let uid;
25-
try {
26-
uid = await createUserAuth(email, isAdmin);
27-
} catch (error) {
28-
console.error('Error while creating user', error);
29-
return response.status(500).json({ error });
30-
}
28+
let uid;
29+
try {
30+
uid = await createUserAuth(email, isAdmin);
31+
} catch (error) {
32+
return response.status(500).json({ error });
33+
}
3134

32-
return response.status(200).json({ uid });
35+
return response.status(200).json({ uid });
36+
});
3337
});
3438

3539
module.exports = router;

0 commit comments

Comments
 (0)