From 119a1d265f998e4b09b22f7ccdbff1d5ccf4108f Mon Sep 17 00:00:00 2001 From: hatim boufnichel Date: Sun, 19 Sep 2021 19:41:58 +0200 Subject: [PATCH] init as a separate route --- .../windows-2network-alice/docker-compose.yml | 17 +++++++++++++++++ services/gunDB/Mediator/index.js | 12 +----------- services/initializer.js | 12 ++++++++++++ src/routes.js | 17 +++++++++++++++++ 4 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 composers/windows-2network-alice/docker-compose.yml create mode 100644 services/initializer.js diff --git a/composers/windows-2network-alice/docker-compose.yml b/composers/windows-2network-alice/docker-compose.yml new file mode 100644 index 00000000..95c107df --- /dev/null +++ b/composers/windows-2network-alice/docker-compose.yml @@ -0,0 +1,17 @@ +version: "3.8" +networks: + default: + external: true + name: 2_default +services: + web: + image: shockwallet/api:latest + command: -c -h 0.0.0.0 -l polar-n2-alice:10009 -m /root/.lnd/data/chain/bitcoin/regtest/admin.macaroon -d /root/.lnd/tls.cert + restart: on-failure + stop_grace_period: 1m + ports: + - 9835:9835 + volumes: + - C:\Users\boufn\.polar\networks\2\volumes\lnd\alice:/root/.lnd + environment: + TRUSTED_KEYS: 'false' \ No newline at end of file diff --git a/services/gunDB/Mediator/index.js b/services/gunDB/Mediator/index.js index 49b83284..ced3416c 100644 --- a/services/gunDB/Mediator/index.js +++ b/services/gunDB/Mediator/index.js @@ -518,17 +518,7 @@ const register = async (alias, pass) => { // don't work instantiateGun() - return authenticate(alias, pass).then(async pub => { - await API.Actions.setDisplayName('anon' + pub.slice(0, 8), user) - await API.Actions.generateHandshakeAddress() - await API.Actions.generateOrderAddress(user) - await API.Actions.initWall() - await API.Actions.setBio('A little bit about myself.', user) - await API.Actions.setDefaultSeedProvider('', user) - await API.Actions.setSeedServiceData('', user) - await API.Actions.setCurrentStreamInfo('', user) - return pub - }) + return authenticate(alias, pass) } module.exports = { diff --git a/services/initializer.js b/services/initializer.js new file mode 100644 index 00000000..9d12684c --- /dev/null +++ b/services/initializer.js @@ -0,0 +1,12 @@ +const API = require('./gunDB/contact-api') + +module.exports.InitUserData = async (user) => { + await API.Actions.setDisplayName('anon' + user._.sea.pub.slice(0, 8), user) + await API.Actions.generateHandshakeAddress() + await API.Actions.generateOrderAddress(user) + await API.Actions.initWall() + await API.Actions.setBio('A little bit about myself.', user) + await API.Actions.setDefaultSeedProvider('', user) + await API.Actions.setSeedServiceData('', user) + await API.Actions.setCurrentStreamInfo('', user) +} \ No newline at end of file diff --git a/src/routes.js b/src/routes.js index 2660b1d0..78f020cd 100644 --- a/src/routes.js +++ b/src/routes.js @@ -38,6 +38,7 @@ const Key = require('../services/gunDB/contact-api/key') const { startedStream, endStream } = require('../services/streams') const channelRequest = require('../utils/lightningServices/channelRequests') const TipsForwarder = require('../services/tipsCallback') +const UserInitializer = require('../services/initializer') const DEFAULT_MAX_NUM_ROUTES_TO_QUERY = 10 const SESSION_ID = uuid() @@ -2826,6 +2827,22 @@ module.exports = async ( }) } }) + + ap.post('/api/initUserInformation', async (req, res) => { + try { + const user = require('../services/gunDB/Mediator').getUser() + await UserInitializer.InitUserData(user) + } catch (err) { + logger.error(err) + res + .status( + err.message === Common.Constants.ErrorCode.NOT_AUTH ? 401 : 500 + ) + .json({ + errorMessage: err.message + }) + } + }) } catch (err) { logger.warn('Unhandled rejection:', err) }