Merge lp:~stephen-stewart/snapweb/prototype-macaroons into lp:~snappy-dev/snapweb/trunk

Proposed by Stephen Stewart
Status: Work in progress
Proposed branch: lp:~stephen-stewart/snapweb/prototype-macaroons
Merge into: lp:~snappy-dev/snapweb/trunk
Diff against target: 65 lines (+44/-0)
2 files modified
package.json (+1/-0)
www/src/js/app.js (+43/-0)
To merge this branch: bzr merge lp:~stephen-stewart/snapweb/prototype-macaroons
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+282311@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

160. By Stephen Stewart

end of quick test

159. By Stephen Stewart

quick test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'package.json'
--- package.json 2015-09-25 19:27:33 +0000
+++ package.json 2016-01-12 14:43:23 +0000
@@ -35,6 +35,7 @@
35 "karma-jasmine-ajax": "^0.1.12",35 "karma-jasmine-ajax": "^0.1.12",
36 "karma-phantomjs-launcher": "~0.1.4",36 "karma-phantomjs-launcher": "~0.1.4",
37 "lodash": "~3.3.1",37 "lodash": "~3.3.1",
38 "macaroons.js": "^0.3.5",
38 "moment": "^2.10.3",39 "moment": "^2.10.3",
39 "normalize.css": "^3.0.3",40 "normalize.css": "^3.0.3",
40 "postcss-bem-linter": "^0.6.0",41 "postcss-bem-linter": "^0.6.0",
4142
=== modified file 'www/src/js/app.js'
--- www/src/js/app.js 2015-05-05 11:20:39 +0000
+++ www/src/js/app.js 2016-01-12 14:43:23 +0000
@@ -12,6 +12,49 @@
12var LayoutView = require('./views/layout.js');12var LayoutView = require('./views/layout.js');
13var router = require('./routers/router.js');13var router = require('./routers/router.js');
1414
15/** quick test of macaroons, check console in your browser **/
16
17//create
18
19var MacaroonsBuilder = require('macaroons.js').MacaroonsBuilder;
20
21var location = 'http://webdm.local';
22var secretKey = 'this is our super secret key; only we should know it';
23var identifier = 'we used our secret key';
24var macaroon = MacaroonsBuilder.create(location, secretKey, identifier);
25
26console.log(macaroon);
27
28//verify
29
30console.log('verify is valid');
31
32var MacaroonsVerifier = require('macaroons.js').MacaroonsVerifier;
33
34var verifier = new MacaroonsVerifier(macaroon);
35var valid = verifier.isValid(secretKey);
36
37console.log(valid);
38
39//add caveat
40
41console.log('add caveat');
42
43var macaroon = MacaroonsBuilder.modify(macaroon)
44.add_first_party_caveat("account = 3735928559")
45.getMacaroon();
46
47console.log(macaroon);
48
49//verify caveat
50
51verifier.satisfyExact("account = 3735928559");
52console.log((verifier.isValid(secretKey)));
53
54
55
56/** as you were **/
57
15var webdm = new Marionette.Application();58var webdm = new Marionette.Application();
16var layout = new LayoutView();59var layout = new LayoutView();
17layout.render();60layout.render();

Subscribers

People subscribed via source and target branches