Skip to content

Commit 87d70ea

Browse files
petersirkapetersirka
committed
new changes
1 parent 45770cf commit 87d70ea

File tree

204 files changed

+18453
-1215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+18453
-1215
lines changed

‎0-learn/controllers/api.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
var Users = MODEL('Users');
22

33
exports.install = function() {
4-
F.route('/api/users/', json_users_query);
5-
F.route('/api/users/{id}/', json_users_read);
6-
F.route('/api/users/{id}/', json_users_remove, ['delete']);
7-
F.route('/api/users/', json_users_save, ['put', 'json', '*User']);
4+
F.restful('/api/users/', ['*User'], json_users_query, json_users_read, json_users_remove, json_users_save);
5+
// Is same as:
6+
// F.route('/api/users/', json_users_query);
7+
// F.route('/api/users/{id}/', json_users_read);
8+
// F.route('/api/users/', json_users_save, ['post', '*User']);
9+
// F.route('/api/users/{id}/', json_users_save, ['put', '*User']);
10+
// F.route('/api/users/{id}/', json_users_remove, ['delete']);
811
};
912

1013
function json_users_query() {
@@ -22,7 +25,8 @@ function json_users_remove(id) {
2225
Users.User.remove({ _id: id }, self.callback());
2326
}
2427

25-
function json_users_save() {
28+
function json_users_save(id) {
2629
var self = this;
30+
self.body._id = ObjectID.parse(id);
2731
self.body.$async(self.callback()).$workflow('check').$save();
2832
}

‎assertion-testing/controllers/default.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
exports.install = function() {
2-
framework.route('/1/', test1);
3-
framework.route('/2/', test2);
4-
framework.route('/3/', test3, ['post', 'json']);
2+
F.route('/1/', test1);
3+
F.route('/2/', test2);
4+
F.route('/3/', test3, ['post', 'json']);
55
};
66

77
exports.functions = {

‎assertion-testing/tests/default.js‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
exports.run = function(framework) {
1+
exports.run = function() {
22

3-
/**
4-
* @see {@link http://docs.totaljs.com/Framework/#framework.assert|Documentation}
5-
*/
6-
7-
framework.assert('controller.increment()', function(next, name) {
8-
assert.ok(framework.controller('default').functions.increment(1) === 2, name);
3+
F.assert('controller.increment()', function(next, name) {
4+
assert.ok(F.controller('default').functions.increment(1) === 2, name);
95
next();
106
});
117

12-
framework.assert('Test URL 1', '/1/', ['get'], function(error, data, code, headers, cookies, name) {
8+
F.assert('Test URL 1', '/1/', ['get'], function(error, data, code, headers, cookies, name) {
139
assert.ok(code === 200 && data === '1', name);
1410
});
1511

16-
framework.assert('Test URL 2', '/2/', ['get'], function(error, data, code, headers, cookies, name) {
12+
F.assert('Test URL 2', '/2/', ['get'], function(error, data, code, headers, cookies, name) {
1713
assert.ok(code === 200 && data === '2', name);
1814
});
1915

20-
framework.assert('Test URL 3', '/3/', ['post', 'json'], function(error, data, code, headers, cookies, name) {
16+
F.assert('Test URL 3', '/3/', ['post', 'json'], function(error, data, code, headers, cookies, name) {
2117
// throws error, data === 4
2218
assert.ok(code === 200 && JSON.parse(data).data === 3, name);
2319
}, { data: 4 });

‎async/controllers/default.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
exports.install = function() {
2-
framework.route('/', view_index);
2+
F.route('/', view_index);
33
};
44

55
function view_index() {
@@ -56,12 +56,9 @@ function view_index() {
5656
}, 1000);
5757
});
5858

59-
6059
async.run(function() {
61-
6260
if (self.xhr)
6361
return self.json(builder);
6462
self.view('index', builder);
6563
});
66-
6764
}

‎authorization-roles/controllers/default.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
exports.install = function() {
2-
framework.route('/');
2+
F.route('/');
33

4-
framework.route('/', view_administrator, ['authorize', '@administrator']);
5-
framework.route('/', view_moderator, ['authorize', '@moderator']);
6-
framework.route('/both/', view_both, ['authorize', '@moderator', '@administrator']);
4+
F.route('/', view_administrator, ['authorize', '@administrator']);
5+
F.route('/', view_moderator, ['authorize', '@moderator']);
6+
F.route('/both/', view_both, ['authorize', '@moderator', '@administrator']);
77

8-
framework.route('/login/', redirect_login, ['unauthorize']);
9-
framework.route('/logoff/', redirect_logoff);
8+
F.route('/login/', redirect_login, ['unauthorize']);
9+
F.route('/logoff/', redirect_logoff);
1010
};
1111

1212
function view_both() {

‎authorization-roles/definitions/authorization.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
// AUTHORIZATION
33
// ================================================
44

5-
framework.onAuthorization = function(req, res, flags, next) {
5+
F.onAuthorization = function(req, res, flags, next) {
66

7-
var self = this;
87
var cookie = req.cookie('__user');
98

109
switch (cookie) {

‎authorization-www-basic/controllers/default.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
exports.install = function() {
2-
framework.route('/', authorization);
2+
F.route('/', authorization);
33
};
44

55
function authorization() {

‎authorization/controllers/default.js‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
exports.install = function() {
2-
framework.route('/', view_logged, ['authorize']);
3-
framework.route('/', view_homepage);
4-
framework.route('/', json_homepage, ['xhr', 'post']);
5-
framework.route('/logout/', logout, ['authorize', 'get']);
2+
F.route('/', view_logged, ['authorize']);
3+
F.route('/', view_homepage);
4+
F.route('/', json_homepage, ['xhr', 'post']);
5+
F.route('/logout/', logout, ['authorize', 'get']);
66
};
77

88
function view_logged() {
99
var self = this;
10-
self.plain('You are logged as {0}. To unlogged remove cookie __user or click http://{1}:{2}/logout/'.format(self.user.email, framework.ip, framework.port));
10+
self.plain('You are logged as {0}. To unlogged remove cookie __user or click http://{1}:{2}/logout/'.format(self.user.email, F.ip, F.port));
1111
}
1212

1313
function view_homepage() {
@@ -18,31 +18,29 @@ function view_homepage() {
1818
function json_homepage() {
1919

2020
var self = this;
21-
var errorBuilder = self.validate(self.post, ['LoginName', 'LoginPassword']);
21+
var error = self.validate(self.post, ['LoginName', 'LoginPassword']);
2222

2323
if (self.user !== null)
24-
errorBuilder.add('Logged');
24+
error.add('Logged');
2525

26-
if (errorBuilder.hasError()) {
27-
self.json(errorBuilder);
26+
if (error.hasError()) {
27+
self.json(error);
2828
return;
2929
}
3030

3131
var db = self.database('users');
32-
var filter = function(o) { return o.email === self.post.LoginName && o.password === self.post.LoginPassword; };
33-
34-
db.one(filter, function(user) {
32+
db.one(n => n.email === self.body.LoginName && n.password === self.body.LoginPassword, function(err, user) {
3533

3634
if (user === null) {
37-
errorBuilder.add('LoginError');
38-
self.json(errorBuilder);
35+
error.add('LoginError');
36+
self.json(error);
3937
return;
4038
}
4139

4240
self.database('users-logs').insert({ id: user.id, email: user.email, ip: self.req.ip, date: new Date() });
4341

4442
// Save to cookie
45-
self.res.cookie(self.config.cookie, framework.encrypt({ id: user.id, ip: self.req.ip }, 'user'), new Date().add('m', 5));
43+
self.res.cookie(F.config.cookie, F.encrypt({ id: user.id, ip: self.req.ip }, 'user'), new Date().add('5 minutes'));
4644

4745
// Return result
4846
self.json({ r: true });
@@ -51,6 +49,6 @@ function json_homepage() {
5149

5250
function logout() {
5351
var self = this;
54-
self.res.cookie(self.config.cookie, '', new Date().add('y', -1));
52+
self.res.cookie(F.config.cookie, '', new Date().add('-1 year'));
5553
self.redirect('/');
5654
}

‎authorization/databases/users-logs.nosql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
{"id":1,"email":"petersirka@gmail.com","ip":"127.0.0.1","date":"2014-12-22T12:26:54.301Z"}
1414
{"id":1,"email":"petersirka@gmail.com","ip":"127.0.0.1","date":"2014-12-22T12:33:02.373Z"}
1515
{"id":1,"email":"petersirka@gmail.com","ip":"127.0.0.1","date":"2014-12-22T12:33:31.005Z"}
16+
{"id":1,"email":"petersirka@gmail.com","ip":"127.0.0.1","date":"2015-07-17T20:55:24.303Z"}

‎authorization/definitions/authorization.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,49 @@
22
// AUTHORIZATION
33
// ================================================
44

5-
framework.onAuthorization = function(req, res, flags, callback) {
5+
F.onAuthorization = function(req, res, flags, callback) {
66

7-
var self = this;
8-
9-
var cookie = req.cookie(self.config.cookie);
7+
var cookie = req.cookie(F.config.cookie);
108
if (cookie === null || cookie.length < 10) {
119
callback(false);
1210
return;
1311
}
1412

15-
var obj = self.decrypt(cookie, 'user');
13+
var obj = F.decrypt(cookie, 'user');
1614

1715
if (obj === null || obj === '' || obj.ip !== req.ip) {
1816
callback(false);
1917
return;
2018
}
2119

22-
var user = self.cache.read('user_' + obj.id);
20+
var user = F.cache.read('user_' + obj.id);
2321
if (user !== null) {
2422
req.user = user;
2523
callback(true);
2624
return;
2725
}
2826

29-
var db = self.database('users');
27+
var db = F.database('users');
3028

3129
// find the user in database
32-
db.one('doc.id === {0}'.format(obj.id), function(user) {
30+
db.one(n => n.id === obj.id, function(err, user) {
3331

3432
if (user === null) {
3533
callback(false);
3634
return;
3735
}
3836

39-
self.cache.add('user_' + user.id, user, new Date().add('m', 5));
37+
F.cache.add('user_' + user.id, user, new Date().add('m', 5));
4038
callback(true, user);
4139
});
4240

4341
};
4442

4543

46-
framework.onValidation = function(name, value) {
44+
F.onValidation = function(name, value) {
4745
switch (name) {
4846
case 'LoginName':
49-
return utils.isEmail(value);
47+
return U.isEmail(value);
5048
case 'LoginPassword':
5149
return value.length > 0;
5250
};

0 commit comments

Comments
 (0)