Merge branch 'main_server' of github.com:AlmostGreatBand/lemon-server into heroku-multiapp

Author: ALEGATOR1209

src/datasources/LemonRepository.js

@@ -58,7 +58,8 @@ class LemonRepository {
       return { ok: false, error: new Error('Wrong password') };
     }
     const ok = this.db.setBank(profile.account_id, bank);
-    return { ok, error: null };
+    if (!ok) return { ok, error: new Error('Database error') };
+    return setCards(bank);
   }
 
   /** @return Array<Card>, error */
@@ -74,22 +75,8 @@ class LemonRepository {
   }
 
   /** @return boolean, error */
-  async setCard(user) {
+  async setCards(bank) {
     try {
-      const profile = this.db.getAccount(user.login);
-      if (!profile) {
-        return { ok: false, error: new Error('Account Not Found') };
-      }
-      if (!profile.token) {
-        return { ok: false, error: new Error('Account Has No Token') };
-      }
-      if (user.password !== profile.password) {
-        return { ok: false, error: new Error('Wrong password') };
-      }
-      const bank = this.db.getMonobank(profile);
-      if (!bank) {
-        return { ok: false, error: new Error('No cards present') };
-      }
       const monoCards = await this.monoDS.getAccounts(bank.token);
       const monoAccounts = monoCards.accounts;
       const ok = this.db.setMonoCards(monoAccounts, profile);
@@ -114,17 +101,14 @@ class LemonRepository {
     try {
       const profile = this.db.getAccount(user.login);
       if (!profile) {
-        throw new Error('Account Not Found');
-      }
-      if (!profile.token) {
-        return { transactions: null, error: new Error('Account Has No Token') };
+        return { transactions: null, error: new Error('Account Not Found') };
       }
       if (user.password !== profile.password) {
-        throw new Error('Wrong password');
+        return { transactions: null, error: new Error('Wrong password') };
       }
       const bank = this.db.getMonobank(profile);
       if (!bank) {
-        throw new Error('No cards present');
+        return { transactions: null, error: new Error('No cards present') };
       }
       const cards = this.db.getCards(profile.account_id);
       const accounts = this._formMonoTrRequest(cards);

src/routing.js

@@ -88,7 +88,7 @@ const routing = {
   'POST': {
     '/': () => makeResponse(200, 'Welcome to Lemon&#127819 Server!'),
     '/profile/': (user, newInfo) => changeUserInfo(user, newInfo),
-    '/cards/': user => setCards(user),
+    '/banks/add/': async (user, bank) => setBank(user, bank),
     '/transactions/': (user, transaction) => addTransaction(user, transaction),
     '/registration/': (_, user) => registerUser(user),
   },

src/server.js

@@ -28,7 +28,7 @@ const authorizeUser = (req, res) => {
 };
 
 const createServer = (protocol, options) => (
-  protocol.createServer(options, (req, res) => {
+  protocol.createServer(options, async (req, res) => {
     const credentials = authorizeUser(req, res);
     if (!credentials) return;
     const handler = routing[req.method][normalizePath(req.url)];
@@ -45,13 +45,13 @@ const createServer = (protocol, options) => (
       req.on('data', chunk => {
           body += chunk.toString();
       });
-      req.on('end', () => {
-        const { code, data } = handler(user, body);
+      req.on('end', async () => {
+        const { code, data } = await handler(user, body);
         res.writeHead(code);
         res.end(JSON.stringify(data));
       })
     } else {
-      const { code, data } = handler(user);
+      const { code, data } = await handler(user);
       res.writeHead(code);
       res.end(JSON.stringify(data));
     }