feat: remove 'account' column from 'Users' table

interledger-deprecated · Jan 6, 2017 · 35b7377 · 35b7377
1 parent a31687e
commit 35b7377
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 59 deletions.
diff --git a/api/src/controllers/auth.js b/api/src/controllers/auth.js
@@ -40,7 +40,6 @@ function AuthControllerFactory(User, log, ledger, mailer) {
        *    HTTP/1.1 200 OK
        *    {
        *      "username": "alice",
-       *      "account": "https://wallet.example/ledger/accounts/alice",
        *      "name": "Alice Faye",
        *      "balance": "1000",
        *      "id": 1
@@ -101,7 +100,6 @@ function AuthControllerFactory(User, log, ledger, mailer) {
      *    HTTP/1.1 200 OK
      *    {
      *      "username": "alice",
-     *      "account": "https://wallet.example/ledger/accounts/alice",
      *      "name": "Alice Faye",
      *      "balance": "1000",
      *      "id": 1

diff --git a/api/src/controllers/misc.js b/api/src/controllers/misc.js
@@ -35,7 +35,6 @@ function MiscControllerFactory (Auth, log, config, ledger, utils) {
      *    {
      *      {
      *        "type": "local",
-     *        "accountUri": "http://wallet.example/ledger/accounts/alice",
      *        "ledgerUri": "http://wallet.example/ledger",
      *        "paymentUri": "http://wallet.example/api/receivers/alice",
      *        "ilpAddress": "wallet.alice",

diff --git a/api/src/controllers/payments.js b/api/src/controllers/payments.js
@@ -128,7 +128,7 @@ function PaymentsControllerFactory (Auth, Payment, log, ledger, config, utils, s
      * @apiDescription Make payment
      *
      * @apiParam {String} id generated payment uuid
-     * @apiParam {String} destination destination account
+     * @apiParam {String} destination destination
      * @apiParam {String} sourceAmount source amount
      * @apiParam {String} destinationAmount destination amount
      * @apiParam {String} message text message for the destination

diff --git a/api/src/controllers/users.js b/api/src/controllers/users.js
@@ -75,7 +75,6 @@ function UsersControllerFactory(auth, User, Invite, log, ledger, socket, config,
      *    HTTP/1.1 200 OK
      *    {
      *      "username": "alice",
-     *      "account": "https://wallet.example/ledger/accounts/alice",
      *      "name": "Alice Faye",
      *      "balance": "1000",
      *      "id": 1
@@ -117,7 +116,6 @@ function UsersControllerFactory(auth, User, Invite, log, ledger, socket, config,
      *    HTTP/1.1 201 OK
      *    {
      *      "username": "alice",
-     *      "account": "https://wallet.example/ledger/accounts/alice",
      *      "balance": "1000",
      *      "id": 1
      *    }
@@ -212,8 +210,6 @@ function UsersControllerFactory(auth, User, Invite, log, ledger, socket, config,
         throw new UsernameTakenError('Ledger rejected username')
       }
 
-      userObj.account = ledgerUser.id
-
       // Create the db user
       dbUser = new User()
       dbUser.setDataExternal(userObj)
@@ -292,7 +288,6 @@ function UsersControllerFactory(auth, User, Invite, log, ledger, socket, config,
      *    HTTP/1.1 200 OK
      *    {
      *      "username": "alice",
-     *      "account": "https://wallet.example/ledger/accounts/alice",
      *      "name": "Alice Faye",
      *      "balance": "1000",
      *      "id": 1
@@ -399,7 +394,6 @@ function UsersControllerFactory(auth, User, Invite, log, ledger, socket, config,
      *    HTTP/1.1 200 OK
      *    {
      *      "username": "alice",
-     *      "account": "https://wallet.example/ledger/accounts/alice",
      *      "balance": "1000",
      *      "id": 1,
      *      "email_verified": true

diff --git a/api/src/controllers/webfinger.js b/api/src/controllers/webfinger.js
@@ -49,10 +49,6 @@ function WebfingerControllerFactory(log, config, ledger) {
      *          "href": "https://wallet.example/socket.io"
      *        },
      *        {
-     *          "rel": "https://interledger.org/rel/ledgerAccount",
-     *          "href": "https://wallet.example/ledger/accounts/alice"
-     *        },
-     *        {
      *          "rel": "https://interledger.org/rel/sender/payment",
      *          "href": "https://wallet.example/payments"
      *        },
@@ -117,10 +113,6 @@ function WebfingerControllerFactory(log, config, ledger) {
               'rel': 'https://interledger.org/rel/ilpAddress',
               'href': config.data.getIn(['ledger', 'prefix']) + ledgerUser.name
             },
-            {
-              'rel': 'https://interledger.org/rel/ledgerAccount',
-              'href': config.data.getIn(['ledger', 'public_uri']) + '/accounts/' + ledgerUser.name
-            },
             {
               'rel': 'https://interledger.org/rel/sender/payment',
               'href': config.data.getIn(['server', 'base_uri']) + '/payments'

diff --git a/api/src/lib/connector.js b/api/src/lib/connector.js
@@ -72,7 +72,7 @@ module.exports = class Conncetor {
 
     const publicKey = hostInfo.publicKey
 
-    const token = getToken(this.config.get('secret'), hostInfo.publicKey)
+    const token = getToken(this.config.get('secret'), publicKey)
     const ledgerName = 'peer.' + token.substring(0, 5) + '.' + peer.currency.toLowerCase() + '.'
 
     yield connector.addPlugin(ledgerName, {

diff --git a/api/src/lib/utils.js b/api/src/lib/utils.js
@@ -1,7 +1,7 @@
 "use strict"
 
 const _ = require('lodash')
-const url = require("url")
+const url = require('url')
 const WebFinger = require('webfinger.js')
 const superagent = require('superagent-promise')(require('superagent'), Promise)
 
@@ -21,14 +21,6 @@ module.exports = class Utils {
     this.localHost = config.data.getIn(['server', 'base_host'])
   }
 
-  isAccountUri(destination) {
-    return destination.indexOf('http://') > -1 || destination.indexOf('https://') > -1
-  }
-
-  isForeignAccountUri(destination) {
-    return this.isAccountUri(destination) && destination.indexOf(this.ledgerUriPublic) === -1
-  }
-
   * getAccount(accountUri) {
     let response
 
@@ -50,13 +42,6 @@ module.exports = class Utils {
   * getWebfingerAccount(address) {
     const parsed = url.parse(address)
 
-    // This dirty hack will stay here until there's a resolution to
-    // https://github.com/silverbucket/webfinger.js/issues/18
-    if (parsed.protocol === 'http:' || parsed.protocol === 'https:') {
-      const username = parsed.path.match(/([^\/]*)\/*$/)[1]
-      address = username + '@' + parsed.hostname
-    }
-
     const webfinger = new WebFinger({
       webfist_fallback: false,
       tls_only: true,
@@ -84,7 +69,6 @@ module.exports = class Utils {
     }
 
     return {
-      accountUri: _.filter(response.links, {rel: 'https://interledger.org/rel/ledgerAccount'})[0].href,
       ledgerUri: _.filter(response.links, {rel: 'https://interledger.org/rel/ledgerUri'})[0].href,
       paymentUri: _.filter(response.links, {rel: 'https://interledger.org/rel/receiver'})[0].href,
       ilpAddress: _.filter(response.links, {rel: 'https://interledger.org/rel/ilpAddress'})[0].href
@@ -95,47 +79,42 @@ module.exports = class Utils {
    * TODO better docs
    *
    * options
-   *  - destination - string
+   *  - destination - string (username or webfinger)
    */
   * parseDestination(options) {
     const self = this
 
     const destination = options.destination
 
-    let accountUri
     let ledgerUri
     let paymentUri
     let ilpAddress
 
     // Webfinger lookup
-    if (self.isWebfinger(destination) || self.isForeignAccountUri(destination)) {
+    if (self.isWebfinger(destination)) {
       // TODO use debug module
       console.log('webfinger account')
       const account = yield self.getWebfingerAccount(destination)
 
-      accountUri = account.accountUri
       ledgerUri = account.ledgerUri
       paymentUri = account.paymentUri
       ilpAddress = account.ilpAddress
     }
 
     // Local account
     else {
-      accountUri = self.isAccountUri(destination) ? destination : self.ledgerUriPublic + '/accounts/' + destination
       ledgerUri = self.ledgerUriPublic
       paymentUri = self.localUri + '/receivers/' + destination
       ilpAddress = self.ledgerPrefix + destination
 
       // Check if account exists
-      yield self.getAccount(accountUri)
+      yield self.getAccount(self.ledgerUriPublic + '/accounts/' + destination)
     }
 
     // Get SPSP receiver info
     const receiver = yield self.getAccount(paymentUri)
 
     return {
-      type: this.isForeignAccountUri(accountUri) ? 'foreign' : 'local',
-      accountUri: accountUri,
       ledgerUri: ledgerUri,
       paymentUri: paymentUri,
       ilpAddress: ilpAddress,

diff --git a/api/src/migrations/20170106-account.js b/api/src/migrations/20170106-account.js
@@ -0,0 +1,10 @@
+const Sequelize = require('sequelize')
+
+module.exports = {
+  up: (sequelize) => {
+    return sequelize.queryInterface.removeColumn('Users', 'account')
+  },
+  down: (sequelize) => {
+    return sequelize.queryInterface.addColumn('Users', 'account', Sequelize.STRING)
+  }
+}
diff --git a/api/src/models/user.js b/api/src/models/user.js
@@ -87,7 +87,6 @@ function UserFactory (sequelize, validator, ledger, config, utils) {
         dbUser = new this()
 
         dbUser.username = username
-        dbUser.account = config.data.get(['ledger', 'public_uri']) + '/accounts/' + username
 
         dbUser = this.fromDatabaseModel(yield dbUser.save())
 
@@ -121,7 +120,6 @@ function UserFactory (sequelize, validator, ledger, config, utils) {
         dbUser = new this()
 
         dbUser.username = username
-        dbUser.account = config.data.get(['ledger', 'public_uri']) + '/accounts/' + username
 
         dbUser = this.fromDatabaseModel(yield dbUser.save())
 
@@ -235,10 +233,6 @@ function UserFactory (sequelize, validator, ledger, config, utils) {
       type: Sequelize.STRING,
       unique: true
     },
-    account: {
-      type: Sequelize.STRING,
-      unique: true
-    },
     email: {
       type: Sequelize.STRING,
       unique: true

diff --git a/api/test/data/api.json b/api/test/data/api.json
@@ -2,7 +2,6 @@
   "accounts": {
     "admin": {
       "id": 1,
-      "account": "http://localhost/accounts/admin",
       "name": null,
       "username": "admin",
       "balance": 0,
@@ -13,7 +12,6 @@
     },
     "alice": {
       "id": 1,
-      "account": "http://localhost/accounts/alice",
       "name": null,
       "username": "alice",
       "balance": 1000,
@@ -24,7 +22,6 @@
     },
     "bob": {
       "id": 1,
-      "account": "http://localhost/accounts/bob",
       "name": null,
       "username": "bob",
       "balance": 1000,
@@ -34,4 +31,4 @@
       "email_verified": null
     }
   }
-}
+}
diff --git a/api/test/data/webfinger.json b/api/test/data/webfinger.json
@@ -13,10 +13,6 @@
       "rel": "https://interledger.org/rel/ilpAddress",
       "href": "localhost.alice"
     },
-    {
-      "rel": "https://interledger.org/rel/ledgerAccount",
-      "href": "http://localhost/ledger/accounts/alice"
-    },
     {
       "rel" : "https://interledger.org/rel/sender/payment",
       "href" : "http://localhost/api/payments"

diff --git a/api/test/users.test.js b/api/test/users.test.js
@@ -25,7 +25,6 @@ describe('Users', () => {
       .expect({
         id: 1,
         username: 'alice',
-        account: 'http://localhost/accounts/alice',
         name: null,
         email: 'alice@example.com',
         email_verified: null,