Merge pull request #51 from TrustyFund/fix-registration-subscription

Remove processSubscription, now we got id from faucet
TrustyFund · Apr 2, 2018 · 6b71b6a · 6b71b6a
2 parents 3a39d73 + a0f811c
commit 6b71b6a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 38 deletions.
diff --git a/src/actions/account.js b/src/actions/account.js
@@ -2,7 +2,6 @@ import { PrivateKey, key, Aes } from 'bitsharesjs';
 import * as types from '../mutations';
 // import { getAccountIdByOwnerPubkey, getAccount } from '../services/wallet.js';
 import API from '../services/api';
-import Subscriptions from '../services/api/subscriptions';
 import PersistentStorage from '../services/persistent-storage';
 
 const OWNER_KEY_INDEX = 1;
@@ -71,18 +70,15 @@ export const signup = async (state, { name, password, dictionary }) => {
   const { commit } = state;
   commit(types.ACCOUNT_SIGNUP_REQUEST);
   const brainkey = API.Account.suggestBrainkey(dictionary);
-  console.log(brainkey);
   const result = await API.Account.createAccount({
     name,
     activeKey: key.get_brainPrivateKey(brainkey, ACTIVE_KEY_INDEX),
     ownerKey: key.get_brainPrivateKey(brainkey, OWNER_KEY_INDEX),
   });
-  console.log('Account created : ', result.success);
+  console.log('Account created : ', result);
   if (result.success) {
-    const signUpSubscription = new Subscriptions.SignUp({ name });
-    const userId = await API.ChainListener.processSubscription(signUpSubscription);
+    const userId = result.id;
     const wallet = createWallet({ password, brainkey });
-    console.log(userId);
     commit(types.ACCOUNT_SIGNUP_COMPLETE, { wallet, userId });
     PersistentStorage.saveUserData({
       id: userId,

diff --git a/src/services/api/account.js b/src/services/api/account.js
@@ -59,12 +59,13 @@ export const createAccount = async ({ name, activeKey, ownerKey }) => {
     const result = await response.json();
     if (result.result === 'OK') {
       return {
-        success: true
+        success: true,
+        id: result.id
       };
     }
     return {
       success: false,
-      error: 'Account creation error'
+      error: result.result
     };
   } catch (error) {
     return {

diff --git a/src/services/api/chain-listener.js b/src/services/api/chain-listener.js
@@ -20,17 +20,6 @@ class ChainListener {
     });
   }
 
-  processSubscription(subscription) {
-    return new Promise((resolve) => {
-      const wrapped = (result) => {
-        this.deleteSubscription(subscription.getType());
-        resolve(result);
-      };
-      subscription.setCallback(wrapped);
-      this._subscribers.push(subscription);
-    });
-  }
-
   addSubscription(subscription) {
     this._subscribers.push(subscription);
     return true;

diff --git a/src/services/api/subscriptions.js b/src/services/api/subscriptions.js
@@ -54,24 +54,6 @@ class Markets extends Subscription {
   }
 }
 
-class SignUp extends Subscription {
-  constructor({ name }) {
-    super('userSignUp');
-    this.name = name;
-  }
-
-  notify(operation) {
-    if (operation.id && operation.id.startsWith(history_prefix)
-      && operation.op[0] === ChainTypes.operations.account_create) {
-      const payload = operation.op[1];
-      const { name } = payload;
-      if (this.name === name) {
-        this._callback(operation.result[1]);
-      }
-    }
-  }
-}
-
 class UserOperations extends Subscription {
   constructor({ userId, callback }) {
     super('userOperation');
@@ -117,7 +99,6 @@ class UserOperations extends Subscription {
 
 const Subscriptions = {
   Markets,
-  SignUp,
   UserOperations
 };