diff options
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | users.js | 42 | ||||
| -rw-r--r-- | yarn.lock | 25 |
3 files changed, 22 insertions, 46 deletions
diff --git a/package.json b/package.json index 036a41e6..e7f838e1 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "email-validator": "^2.0.4", "express": "4.17.1", "express-session": "^1.16.2", - "fb": "^2.0.0", "grpc": "^1.23.3", "http-proxy-middleware": "^0.20.0", "jsonwebtoken": "^8.5.1", @@ -1,7 +1,6 @@ const { Client } = require("authy-client"); const axios = require("axios"); const bcrypt = require("bcrypt"); -const fb = require("fb"); const jwt = require("jsonwebtoken"); const mailgun = require("mailgun-js"); const uuidv4 = require("uuid/v4"); @@ -10,6 +9,7 @@ const authyVerify = require("./authy"); const config = require("./config"); const authy = new Client({ key: config.authy.key }); const whitelist = require("./whitelist"); +const fb = "https://graph.facebook.com/"; const pick = (O, ...K) => K.reduce((o, k) => ((o[k] = O[k]), o), {}); @@ -242,14 +242,14 @@ module.exports = (addresses, auth, app, bc, db, emit) => { if (!user) { user = await db.User.create(user); user.username = userID; - user.name = (await fb.api(`/me?access_token=${accessToken}`)).name; + user.name = (await axios.get(`${fb}/me?access_token=${accessToken}`)).data.name; user.address = await bc.getNewAddress("", "bech32"); user.password = await bcrypt.hash(accessToken, 1); user.balance = 0; user.pending = 0; - let friends = (await fb.api( - `/${userID}/friends?access_token=${accessToken}` - )).data; + let friends = (await axios.get( + `${fb}/${userID}/friends?access_token=${accessToken}` + )).data.data; if (friends.find(f => f.id === config.facebook.specialFriend)) { user.friend = true; user.limit = 200; @@ -258,9 +258,9 @@ module.exports = (addresses, auth, app, bc, db, emit) => { addresses[user.address] = user.username; } - user.pic = (await fb.api( - `/me/picture?access_token=${accessToken}&redirect=false` - )).data.url; + user.pic = (await axios.get( + `${fb}/me/picture?access_token=${accessToken}&redirect=false` + )).data.data.url; user.fbtoken = accessToken; await user.save(); @@ -277,25 +277,23 @@ module.exports = (addresses, auth, app, bc, db, emit) => { }); app.get("/me", async (req, res) => { - let data = (await fb.api( - "/me/picture?access_token=EAAEIFqWk3ZAwBAEUfxQdH3T5CBKXmU8d7jQ5OTJBJZBiU1ZAp76lO26nh57WolM4R4JoKks9BCc49s8VrlEm2Ub1GlZCEzVD9fGxzUiranXDErDmR5gDUPKX3BhCsGA649a4hmbldRwKFTsmZCGZCergm9ACspKdTZB0WgFgA9wEdemIRIXuwCygNrymmKDh0Wd8nmoT4Hj3wZDZD&redirect=false" - )).data; - res.send(data.url); + let { data: { data: { url } } } = (await axios.get( + `${fb}/me/picture?access_token=EAAEIFqWk3ZAwBAEUfxQdH3T5CBKXmU8d7jQ5OTJBJZBiU1ZAp76lO26nh57WolM4R4JoKks9BCc49s8VrlEm2Ub1GlZCEzVD9fGxzUiranXDErDmR5gDUPKX3BhCsGA649a4hmbldRwKFTsmZCGZCergm9ACspKdTZB0WgFgA9wEdemIRIXuwCygNrymmKDh0Wd8nmoT4Hj3wZDZD&redirect=false` + )); + res.send(url); }); app.get("/friends", auth, async (req, res) => { try { - let friends = (await fb.api( - `/${req.user.username}/friends?access_token=${req.user.fbtoken}` - )).data; - friends = await Promise.all( - friends.map(async f => { - let pic = (await fb.api( - `/${f.id}/picture?redirect=false&type=small&access_token=${ + const { data: { data } } = await axios.get(`${fb}/${req.user.username}/friends?access_token=${req.user.fbtoken}`); + + const friends = await Promise.all( + data.map(async f => { + f.pic = (await axios.get( + `${fb}/${f.id}/picture?redirect=false&type=small&access_token=${ req.user.fbtoken }` - )).data; - f.pic = pic.url; + )).data.data.url; return f; }) ); @@ -304,7 +302,7 @@ module.exports = (addresses, auth, app, bc, db, emit) => { } catch (e) { res .status(500) - .send("There was a problem getting your facebook friends: ", e); + .send("There was a problem getting your facebook friends: " + e); } }); }; @@ -1771,7 +1771,6 @@ __metadata: email-validator: ^2.0.4 express: 4.17.1 express-session: ^1.16.2 - fb: ^2.0.0 grpc: ^1.23.3 http-proxy-middleware: ^0.20.0 jsonwebtoken: ^8.5.1 @@ -2069,13 +2068,6 @@ __metadata: languageName: node linkType: hard -"core-decorators@npm:^0.17.0": - version: 0.17.0 - resolution: "core-decorators@npm:0.17.0" - checksum: 24ac8fffb3cc67bb47122e148b9918567c8462c825a68434d0c2134dfe84acde62e7ee416e48ef747977c7322414fb0196a165e4a09ee74caf375fb43ccf4d0f - languageName: node - linkType: hard - "core-js@npm:^2.4.0": version: 2.6.9 resolution: "core-js@npm:2.6.9" @@ -2205,7 +2197,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.3, debug@npm:^2.6.8": +"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.8": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -3130,19 +3122,6 @@ __metadata: languageName: node linkType: hard -"fb@npm:^2.0.0": - version: 2.0.0 - resolution: "fb@npm:2.0.0" - dependencies: - any-promise: ^1.3.0 - babel-runtime: ^6.23.0 - core-decorators: ^0.17.0 - debug: ^2.6.3 - request: ^2.81.0 - checksum: a93bca6b3b663ba32b6882a8795059e20174abcad9987962269880b091f469ebdc735df30e1968edafae03b8b374cdec728f7e9225398ec7d0a0478dcdeeae7b - languageName: node - linkType: hard - "fclone@npm:1.0.11, fclone@npm:^1.0.11": version: 1.0.11 resolution: "fclone@npm:1.0.11" @@ -6720,7 +6699,7 @@ __metadata: languageName: node linkType: hard -"request@npm:^2.53.0, request@npm:^2.81.0, request@npm:^2.88.0, request@npm:~2.88.0": +"request@npm:^2.53.0, request@npm:^2.88.0, request@npm:~2.88.0": version: 2.88.0 resolution: "request@npm:2.88.0" dependencies: |