merged signing branch

app.js

@@ -8,6 +8,7 @@ var express = require('express')
 	, assets = require('./routes/assets')
 	, auth = require('./routes/auth')
 	, http = require('http')
+	, user = require('./routes/user')
 	, path = require('path');
 
 var app = express();
@@ -32,19 +33,65 @@ app.configure('development', function(){
 	app.use(express.errorHandler());
 });
 
+function requireLogin(req, res, next) {
+	if (req.session.email) {
+		next(); // allow the next route to run
+	} else {
+		// require the user to log in
+		res.redirect("/login"); // or render a form, etc.
+	}
+}
+
 app.get('/', routes.index);
+
+app.get('/login', routes.login);
+
+app.post('/user/set/username', user.setUsername);
+
 app.post('/auth/verify', auth.verify);
+app.post('/user/payswarm', auth.payswarmVerify);
+
 app.get('/auth/createKeyPair', auth.createKeyPair);
 app.post('/payswarm/register', auth.registerKey);
 app.post('/payswarm/complete', auth.complatePayswarmRegistration);
 
-app.get('/newasset', routes.newasset);
-app.post('/newasset/process/', assets.processAsset);
+
+/*
+	New asset
+*/
+app.get('/newasset', requireLogin, routes.newasset);
+app.post('/newasset/process/', assets.createAssetAndListing);
 app.post('/newasset/save', assets.saveAsset);
 
 app.get('/assets/created', assets.getUserAssets);
 app.get('/assets/:count', assets.getLatestAssets);
 
+app.get('/resign/listing/:id', assets.resignListing);
+
+app.get('/assets/asset/:id', assets.getAsset);
+
+app.get('/assets/asset/:id/purchase', assets.purchase);
+app.post('/assets/asset/:id/purchased', assets.purchased);
+app.post('/assets/asset/:id/preview', assets.preview);
+app.get('/assets/asset/:id/preview', assets.preview);
+
+app.get('/listings/listing/:id', assets.getListing);
+
+app.get('/assets/asset/:id/content', function (req, res){
+	res.end('The content!');
+});
+
+app.get('/decrypt/:type/:id', assets.decrypt);
+
+app.get('/test', function (req, res){
+	res.render('test');
+});
+
+app.post('/upload', function (req, res) {
+	console.log(req.files);
+	res.json(req.files);
+});
+
 http.createServer(app).listen(app.get('port'), function(){
 	console.log("Express server listening on port " + app.get('port'));
 });

lib/asset.js

@@ -6,7 +6,8 @@ var _ = require('underscore'),
 	utils = require('../lib/utils')(),
 	payswarm = require('payswarm'),
 	mongoose = require('mongoose'),
-	db = require('../lib/db')
+	db = require(__dirname + '/db.js'),
+	host = 'webpayments.fwd.wf';
 ;
 
 module.exports = function (options) {
@@ -24,9 +25,6 @@ module.exports = function (options) {
 						cb(err);
 					} else {
 						// set the asset to the listing
-						signedListing.asset = signedAsset.id;
-						signedListing.assetHash = assetHash;
-						signedListing.licenseHash = listingHash;
 						var assetAndListing = {
 							"@context": 'https://w3id.org/payswarm/v1',
 							"@graph": [signedAsset, signedListing]
@@ -136,6 +134,40 @@ module.exports = function (options) {
 		db.save.asset(graph, cb);
 	}
 
+	function getOne (query, cb) {
+		getOneAsset(query, function (asset) {
+			getOneListing({'assetId': query['_id']}, function (listing) {
+				var assetAndListing = {
+					"@context": 'https://w3id.org/payswarm/v1',
+					"@graph": [asset[0], listing[0]]
+				}
+				cb(assetAndListing);
+			});
+		});
+	}
+
+	function getOneAsset (query, cb) {
+		db.get.asset(query, function (err, doc) {
+			if (err) {
+				console.log('Error getting one asset' + err);
+				cb(err, {});
+			} else {
+				cb(null, doc);
+			}
+		});
+	}
+
+	function getOneListing (query, cb) {
+		db.get.listing(query, function (err, doc) {
+			if (err) {
+				console.log('Error getting one listing' + err);
+				cb({});
+			} else {
+				cb(doc);
+			}
+		});
+	}
+
 	function getUserAssets (query, cb) {
 		db.get.userAssets(query, function (err, assets) {
 			if (err) {
@@ -144,8 +176,10 @@ module.exports = function (options) {
 			} else {
 				var docs = [];
 				var l = assets.length;
+				console.log('found' + l + 'assets for query',query);
+				if(!l) cb(docs);
 				assets.forEach(function (asset) {
-					db.get.userListings(asset['_id'], function (err, doc) {
+					db.get.listing({'assetId':asset.listingId}, function (err, doc) {
 						if (err) {
 							console.log(err);
 							cb({'error':err});
@@ -164,10 +198,39 @@ module.exports = function (options) {
 		})
 	}
 
+	function getListing (query, cb) {
+		console.log('query', arguments);
+		var errMsg = {'error': 'Listing not found'};
+		db.get.listing(query, function (err, doc) {
+			if (err || !doc.length) {
+				console.log(err);
+				cb(errMsg);
+			} else {
+				cb(doc[0] || errMsg);
+			}
+		});
+	}
+
+	function getAsset (query, cb) {
+		var errMsg = {'error': 'Asset not found'};
+		db.get.asset(query, function (err, doc) {
+			if (err || !doc.length) {
+				console.log(err);
+				cb(errMsg);
+			} else {
+				cb(doc[0] || errMsg);
+			}
+		});
+	}
+
 	// sign is a facade for creating + signing
 	assetUtils.sign = sign;
 	assetUtils.save = saveAssetAndListing;
 	assetUtils.getUserAssets = getUserAssets;
+	assetUtils.getOne = getOne;
+	assetUtils.getListing = getListing;
+	assetUtils.getAsset = getAsset;
+	assetUtils.getOneListing = getOneListing;
 
 	return assetUtils;
 };

lib/asset.simple.cfg

@@ -1,13 +1,14 @@
 {
     "@context": "https://w3id.org/payswarm/v1",
-    "id": "http: //listings.dev.payswarm.com/mozhacks/demo#asset",
+    "id": "http://listings.dev.payswarm.com/mozhacks/demo#asset",
+    "userId": "~",
     "type": [
         "Asset"
     ],
     "creator": {
         "fullName": "DeveloperJoe"
     },
     "title": "MozillaHacksDemoAsset",
-    "assetContent": "http: //listings.dev.payswarm.com/mozhacks/demo#asset",
-    "assetProvider": "https: //dev.payswarm.com/i/YOUR_IDENTITY_HERE"
+    "assetContent": "http://listings.dev.payswarm.com/mozhacks/demo#asset",
+    "assetProvider": "https://dev.payswarm.com/i/YOUR_IDENTITY_HERE"
 }

lib/db.js

@@ -1,12 +1,23 @@
 var mongoose = require('mongoose');
+var _ = require('underscore');
 
 if (process.env.NODE_ENV)
 	var db = mongoose.connect('mongodb://nodejitsu:[email protected]:10074/nodejitsudb4747069906');
-else
-	var db = mongoose.connect('mongodb://localhost:27017/webpayments');
+else {
+	console.log('localhost');
+	var db = mongoose.connect('mongodb://localhost:27017/webpay');
+}
 
 var schemas = require('./schemas')(db);
 
+function assert() {
+	argv = _.toArray(arguments);
+	if(!argv[0]) {
+		console.log(argv[2]);
+		throw new Error('Expected ' + argv[1] + ' to be defined');
+	}
+}
+
 var dbUtils = {
 	find: function (schema, query, fields, cb) {
 		if (typeof fields === 'function') {
@@ -26,21 +37,28 @@ var dbUtils = {
 		}
 	},
 	save : {
-		asset : function (graph, cb) {
-			var listing = new schemas.Listing(graph.listing);
-			console.log(graph.asset);
-			var asset = new schemas.Asset(graph.asset);
+		asset: function (assetAndListing, cb) {
+
+			console.log(arguments);
 
-			asset.save(function (err, d) {
-				if (err) cb(err);
-				else {
-					listing.assetId = d['_id'];
+			var asset = new schemas.Asset(assetAndListing['@graph'][0]);
+			var listing = new schemas.Listing(assetAndListing['@graph'][1]);
+
+			asset.save(function (err) {
+				console.log('asset err', err);
+				if (err) {
+					cb(err);
+				} else {
 					listing.save(function (err) {
-						if (err) cb(err);
-						else cb(null);
+						console.log('listing err', err);
+						if (err) {
+							cb(err);
+						} else {
+							cb(null);
+						}
 					})
 				}
-			});
+			})
 		}
 	},
 	findOne: {
@@ -67,21 +85,14 @@ var dbUtils = {
 		user: function (fields, user, cb) {
 			schemas.User.findOne(user, fields, dbUtils.next(cb));
 		},
+		asset: function (query, cb) {
+			schemas.Asset.find(query, dbUtils.next(cb));
+		},
+		listing: function (query, cb) {
+			schemas.Listing.find(query, dbUtils.next(cb));
+		},
 		userAssets: function (query, cb) {
-			dbUtils.get.user({
-				owner: 1
-			}, query, function (err, doc) {
-				if (err) {
-					console.log(err);
-					cb(err);
-				} else {
-					console.log(doc);
-					console.log(query);
-					schemas.Asset.find({
-						assetProvider: doc.owner
-					}, dbUtils.next(cb));
-				}
-			})
+			schemas.Asset.find(query, dbUtils.next(cb));
 		},
 		userListings: function (id, cb) {
 			dbUtils.find(schemas.Listing, {assetId: id}, dbUtils.next(cb));

lib/keys.js

@@ -17,7 +17,7 @@ module.exports = function(opts) {
 				console.log('Error reading keys: ', err);
 			} else {
 				keyPair = JSON.parse(data);
-				payswarm.decrypt(encryptedMessage, {privateKey: keyPair.privateKeyPem}, cb);
+				payswarm.decrypt(encryptedMessage, {privateKey: keyPair.publicKey.privateKeyPem}, cb);
 			}
 		});
 	}

lib/listing

@@ -0,0 +1,30 @@
+{
+  "@context": "https://w3id.org/payswarm/v1",
+  "id": "http://listings.dev.payswarm.com/mozhacks/html5-me-song#listing",
+  "userId": "~",
+  "type": ["Listing"],
+  "vendor": "https://dev.payswarm.com/i/the-webdevs",
+  "payee": [{
+    "type": "Payee",
+    "destination": "https://dev.payswarm.com/i/the-webdevs/accounts/royalties",
+    "payeeGroup": ["vendor"],
+    "payeeRateType": "FlatAmount",
+    "payeeRate": "1.00",
+    "currency": "USD",
+    "payeeApplyType": "ApplyExclusively",
+    "comment": "Payment to The Webdevs for creating the HTML5 Me, Baby song"
+  }],
+  "payeeRule": [{
+    "type": "PayeeRule",
+    "payeeGroupPrefix": ["authority"],
+    "payeeRateType": "Percentage",
+    "maximumPayeeRate": "5",
+    "payeeApplyType": "ApplyInclusively"
+  }],
+  "asset": "http://listings.dev.payswarm.com/mozhacks/html5-me-song#asset",
+  "assetHash": "assetHash",
+  "license": "https://w3id.org/payswarm/licenses/personal-use",
+  "licenseHash": "urn:sha256:d9dcfb7b3ba057df52b99f777747e8fe0fc598a3bb364e3d3eb529f90d58e1b9",
+  "validFrom": "date",
+  "validUntil": "date"
+}

lib/listing.simple.cfg

@@ -1,11 +1,12 @@
 {
   "@context": "https://w3id.org/payswarm/v1",
   "id": "http://listings.dev.payswarm.com/mozhacks/html5-me-song#listing",
+  "userId": "~",
   "type": ["Listing"],
-  "vendor": "https://dev.payswarm.com/i/the-webdevs",
+  "vendor": "https://dev.payswarm.com/i/webpayments",
   "payee": [{
     "type": "Payee",
-    "destination": "https://dev.payswarm.com/i/the-webdevs/accounts/royalties",
+    "destination": "https://dev.payswarm.com/i/webpayments/accounts/primary",
     "payeeGroup": ["vendor"],
     "payeeRateType": "FlatAmount",
     "payeeRate": "1.00",
@@ -22,8 +23,13 @@
   }],
   "asset": "http://listings.dev.payswarm.com/mozhacks/html5-me-song#asset",
   "assetHash": "assetHash",
+  "listing": "listing",
   "license": "https://w3id.org/payswarm/licenses/personal-use",
   "licenseHash": "urn:sha256:d9dcfb7b3ba057df52b99f777747e8fe0fc598a3bb364e3d3eb529f90d58e1b9",
+  "listingHash": "whatev",
+  "nonce":"123123123",
+  "transactionId":"123789",
   "validFrom": "date",
-  "validUntil": "date"
+  "validUntil": "date",
+  "identity":"1"
 }

lib/payswarm.cfg

@@ -3,8 +3,8 @@
   "publicKey": {
     "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApJTzBuohTPiqliU5Vu8o\nfVZcRIAR16BCVd1CdY65SGOfQuiN3xsK5T4ZGQQiyAogdpYhiGEqB/wgqNr3Wzjv\nC2jxBHLHsiNRGvWkRFqFA8axlqyTkXlSV9fXKbFX0hwrqSByy4JzaNxGA74wYBtH\n2b1nLEIGPE8biB+hywWADPNWSUO/QYm9LRGYuFbl/ieDB9kF8w+JMyzX3yYI45KS\nd979n2ucMgXZ7zMoY9cQKdnaqYINjtMhSW1oTJ03CY5N1v6y5Fx1G2m8fh+X1Qpl\n23LauzIa4T+wWCv7d34kE1DmQEOShtVc8rvpjp6Qz41HOz/bJSa8DAr3xUxPco9G\nGQIDAQAB\n-----END PUBLIC KEY-----\n",
     "privateKeyPem": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEApJTzBuohTPiqliU5Vu8ofVZcRIAR16BCVd1CdY65SGOfQuiN\n3xsK5T4ZGQQiyAogdpYhiGEqB/wgqNr3WzjvC2jxBHLHsiNRGvWkRFqFA8axlqyT\nkXlSV9fXKbFX0hwrqSByy4JzaNxGA74wYBtH2b1nLEIGPE8biB+hywWADPNWSUO/\nQYm9LRGYuFbl/ieDB9kF8w+JMyzX3yYI45KSd979n2ucMgXZ7zMoY9cQKdnaqYIN\njtMhSW1oTJ03CY5N1v6y5Fx1G2m8fh+X1Qpl23LauzIa4T+wWCv7d34kE1DmQEOS\nhtVc8rvpjp6Qz41HOz/bJSa8DAr3xUxPco9GGQIDAQABAoIBAHjDMm/oa/bmn4T8\nW06Gvdb5/0nkDzOAzCvk5lcMGrgbIUkfCrqiRSRgpFnOxxaxF5DsKD7BzO1++xfr\nU4UECaL9pZv1/MGhWGnHxHjDUsaqjLRafQ1JUDpUjfRxxFbPhNncjV72oWhX+KfW\nbfiXC+mhKIs5BwpJoZIIY9dsecEFvxZGl7P5OdWYc7+6/ap/CS6r6H9b1a2Z9XZq\nGmHldvQa6mXJn8G/HT2QOKSThRbhQjgNVxhofjUYcSqgBdQFT7rd1BEEK0cDw1eR\nfcie812QefSjRWog1uJjXFuS81zfxTWrepRZuKgscKSwykyhr3AUh59tR25HHJZr\n76kyxAECgYEAzo0959lGa8Zqw3MyjYeaMMBW+Pd27FaoHOsVEGLtPohug4q0o/AO\n8pusO1JBSmpb4/LSgYo46/Gp6iIg5d6t4Ttnwx8n/qPH3t+ezTgsrh9CPf2glSEe\nGvdT3tr1WCFjVV3HiJaXFxUjrkPmEcG/L/QtV4TV+aCMOx5GyckAEikCgYEAy/uI\n5bQQ0c/VVSmi7sWHYcs1GPmy/ahZcagMSB80NUNfG9QhB0YEMler8fDa159YsV9W\nwRhog83Ip8I48IMwTOvBGuBKPsl+Hw9hNG8ksRE4BnXy/y82Jf3xCGM2u+7Cf2/f\n/i9WLli71NFV6LrdJUelvpciANX5a10rkF4JcnECgYBcTnKj8k2uTHXZ8tlctoUJ\n1GsJyE21QOTQR56aPBuaHo6E6q/fs6B6e2d0+0WCZBW8wP+iNItLpiwxHh9lmyZJ\nyaqNYJcXDUp9J6JoQ/pztjR8T6Q8ARjbJDyvE1shj4o81DQfrmzHPAM+FcnzlYpD\ne/PncM3PSRhiMx2ff9wwQQKBgBWrSOWt9UN0oqMDY02eKj2XSrK2g+8yXR4XzgYz\nWmZ2G7pnFIMjSvrWGWwAPB8/zDo7eInWv/OQfspjdY0HQrBJMyBZx0lYOk+uYJMj\nY3Bz9dGp4gB90XDDw0Ey2POp73t+NPtZp/wQbRO0kT3B7BAzxkWy5GfWU0K2iRQz\nCSnhAoGBAMnJ5266sq9ETo0taO15B7pkBLE48+jmLkYMRmu4iHnGYlqJcQxh/evv\nDZ8XbysUGgmT3TcEXqg/lwL8WxXtvqDCOlA7SIncf4tRW1RjcntWfCduWOP8SAe1\n+yXmQQnoqiBCSGswXLFtv3udWCbSJ5rl8e/dKFSMDuDUUXhKLaKK\n-----END RSA PRIVATE KEY-----\n",
-    "id": "https://dev.payswarm.com/i/webpayments/keys/3"
+    "id": "https://dev.payswarm.com/i/webpay/keys/1"
   },
-  "owner": "https://dev.payswarm.com/i/webpayments",
-  "source": "https://dev.payswarm.com/i/webpayments/accounts/primary"
+  "owner": "https://dev.payswarm.com/i/webpay",
+  "source": "https://dev.payswarm.com/i/webpay/accounts/primary"
 }

lib/ref

@@ -0,0 +1,3 @@
+Public Key Owner : https://dev.payswarm.com/i/piatra
+   Financial Account: https://dev.payswarm.com/i/piatra/accounts/primary
+   Public Key URL   : https://dev.payswarm.com/i/piatra/keys/30