Skip to content

Commit c7a7434

Browse files
lisonglisong
committed
delete session
1 parent dc20e0e commit c7a7434

10 files changed

Lines changed: 33 additions & 173 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test-integration:
1111
@NODE_ENV=test CONFIG_FILE=${ROOT}/config/config.test.js mocha test/api/init &
1212
@NODE_ENV=test PORT=3000 HOST=127.0.0.1 CONFIG_FILE=${ROOT}/config/config.test.js node bin/www &
1313
@NODE_ENV=test CONFIG_FILE=${ROOT}/config/config.test.js mocha \
14-
test/api/users test/api/auth test/api/account test/api/accessKeys test/api/sessions test/api/apps test/api/index --recursive --timeout 15000
14+
test/api/users test/api/auth test/api/account test/api/accessKeys test/api/apps test/api/index --recursive --timeout 15000
1515

1616
coverage:
1717
@echo "\n\nRunning coverage report..."
@@ -21,7 +21,7 @@ coverage:
2121
@NODE_ENV=test CONFIG_FILE=${ROOT}/config/config.test.js mocha test/api/init &
2222
@NODE_ENV=test PORT=3000 HOST=127.0.0.1 CONFIG_FILE=${ROOT}/config/config.test.js node bin/www &
2323
@NODE_ENV=test CONFIG_FILE=${ROOT}/config/config.test.js ./node_modules/istanbul/lib/cli.js cover --report lcovonly --dir coverage/api ./node_modules/.bin/_mocha \
24-
test/api/users test/api/auth test/api/account test/api/accessKeys test/api/sessions test/api/apps test/api/index -- -R spec --recursive --timeout 15000
24+
test/api/users test/api/auth test/api/account test/api/accessKeys test/api/apps test/api/index -- -R spec --recursive --timeout 15000
2525
@NODE_ENV=test CONFIG_FILE=${ROOT}/config/config.test.js ./node_modules/istanbul/lib/cli.js report
2626

2727
.PHONY: coverage

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"init": "node ./bin/db init",
3535
"upgrade": "node ./bin/db upgrade",
3636
"test": "make test",
37-
"test-win": "mocha test/api/init test/api/users test/api/auth test/api/account test/api/accessKeys test/api/sessions test/api/apps test/api/index --recursive --timeout 15000",
37+
"test-win": "mocha test/api/init test/api/users test/api/auth test/api/account test/api/accessKeys test/api/apps test/api/index --recursive --timeout 15000",
3838
"coverage": "make coverage"
3939
},
4040
"dependencies": {

‎routes/account.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ var models = require('../models');
44
var _ = require('lodash');
55
var security = require('../core/utils/security');
66
var middleware = require('../core/middleware');
7+
var log4js = require('log4js');
8+
var log = log4js.getLogger("cps:account");
79

810
router.get('/', middleware.checkToken, (req, res) => {
911
var userInfo = {
1012
email:req.users.email,
11-
id:req.users.identical,
1213
linkedProviders: [],
1314
name:req.users.username,
1415
};
16+
log.debug(userInfo);
1517
res.send({account:userInfo});
1618
});
1719

‎routes/apps.js‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ var config = require('../core/config');
1515
const REGEX = /^(\w+)(-android|-ios)$/;
1616
const REGEX_ANDROID = /^(\w+)(-android)$/;
1717
const REGEX_IOS = /^(\w+)(-ios)$/;
18-
const OLD_REGEX_ANDROID = /^(android_)/;
19-
const OLD_REGEX_IOS = /^(ios_)/;
2018
var log4js = require('log4js');
2119
var log = log4js.getLogger("cps:apps");
2220

@@ -584,14 +582,10 @@ router.patch('/:appName',
584582
var appManager = new AppManager();
585583
return accountManager.ownerCan(uid, appName)
586584
.then((col) => {
587-
if (REGEX_ANDROID.test(appName) || OLD_REGEX_ANDROID.test(appName)) {
588-
if (!REGEX_ANDROID.test(newAppName)) {
589-
throw new AppError.AppError(`new appName have to point -android suffix! eg. Demo-android`);
590-
}
591-
} else if (REGEX_IOS.test(appName) || OLD_REGEX_IOS.test(appName)) {
592-
if (!REGEX_IOS.test(newAppName)) {
593-
throw new AppError.AppError(`new appName have to point -ios suffix! eg. Demo-ios`);
594-
}
585+
if (REGEX_ANDROID.test(appName) && !REGEX_ANDROID.test(newAppName)) {
586+
throw new AppError.AppError(`new appName have to point -android suffix! eg. Demo-android`);
587+
} else if (REGEX_IOS.test(appName) && !REGEX_IOS.test(newAppName)) {
588+
throw new AppError.AppError(`new appName have to point -ios suffix! eg. Demo-ios`);
595589
} else {
596590
throw new AppError.AppError(`appName have to point -android or -ios suffix! eg. ${appName}-android ${appName}-ios`);
597591
}

‎routes/auth.js‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
var express = require('express');
22
var router = express.Router();
33
var _ = require('lodash');
4-
var security = require('../core/utils/security');
5-
var accountManager = require('../core/services/account-manager')();
6-
var AppError = require('../core/app-error');
4+
var config = require('../core/config');
5+
var validator = require('validator');
6+
var log4js = require('log4js');
7+
var log = log4js.getLogger("cps:auth");
78

89
router.get('/login', (req, res) => {
9-
var config = require('../core/config');
1010
var codePushWebUrl = _.get(config, 'common.codePushWebUrl');
11-
var isRedirect = false;
12-
if (codePushWebUrl) {
13-
var validator = require('validator');
14-
if (validator.isURL(codePushWebUrl)){
15-
isRedirect = true;
16-
}
17-
}
18-
if (isRedirect) {
11+
if (codePushWebUrl && validator.isURL(codePushWebUrl)) {
12+
log.debug(`login redirect:${codePushWebUrl}`);
1913
res.redirect(`${codePushWebUrl}/login`);
2014
} else {
2115
res.render('auth/login', { title: 'CodePushServer' });
@@ -27,16 +21,10 @@ router.get('/link', (req, res) => {
2721
});
2822

2923
router.get('/register', (req, res) => {
30-
var config = require('../core/config');
3124
var codePushWebUrl = _.get(config, 'common.codePushWebUrl');
3225
var isRedirect = false;
33-
if (codePushWebUrl) {
34-
var validator = require('validator');
35-
if (validator.isURL(codePushWebUrl)){
36-
isRedirect = true;
37-
}
38-
}
39-
if (isRedirect) {
26+
if (codePushWebUrl && validator.isURL(codePushWebUrl)) {
27+
log.debug(`register redirect:${codePushWebUrl}`);
4028
res.redirect(`${codePushWebUrl}/register`);
4129
} else {
4230
res.render('auth/login', { title: 'CodePushServer' });
@@ -48,20 +36,25 @@ router.post('/logout', (req, res) => {
4836
});
4937

5038
router.post('/login', (req, res, next) => {
39+
var AppError = require('../core/app-error');
40+
var accountManager = require('../core/services/account-manager')();
41+
var security = require('../core/utils/security');
5142
var account = _.trim(req.body.account);
5243
var password = _.trim(req.body.password);
53-
var config = require('../core/config');
5444
var tokenSecret = _.get(config, 'jwt.tokenSecret');
45+
log.debug(`login:${account}`);
5546
accountManager.login(account, password)
5647
.then((users) => {
5748
var jwt = require('jsonwebtoken');
5849
return jwt.sign({ uid: users.id, hash: security.md5(users.ack_code), expiredIn: 7200 }, tokenSecret);
5950
})
6051
.then((token) => {
52+
log.debug(token);
6153
res.send({status:'OK', results: {tokens: token}});
6254
})
6355
.catch((e) => {
6456
if (e instanceof AppError.AppError) {
57+
log.debug(e);
6558
res.send({status:'ERROR', errorMessage: e.message});
6659
} else {
6760
next(e);

‎test/api/accessKeys/accessKeys.test.js‎

Lines changed: 4 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ describe('api/accessKeys/accessKeys.test.js', function() {
3030
it('should create accessKeys successful', function(done) {
3131
request.post(`/accessKeys`)
3232
.set('Authorization', `Basic ${authToken}`)
33-
.send({createdBy: 'tablee', friendlyName: friendlyName, isSession: false, ttl: 30*24*60*60})
33+
.send({createdBy: 'tablee', friendlyName: friendlyName, ttl: 30*24*60*60})
3434
.end(function(err, res) {
3535
should.not.exist(err);
3636
res.status.should.equal(200);
3737
var rs = JSON.parse(res.text);
3838
rs.should.have.properties('accessKey');
3939
rs.accessKey.should.have.properties(['name', 'createdTime', 'createdBy',
40-
'expires', 'isSession', 'description', 'friendlyName']);
40+
'expires', 'description', 'friendlyName']);
4141
done();
4242
});
4343
});
4444

4545
it('should not create accessKeys successful when friendlyName exist', function(done) {
4646
request.post(`/accessKeys`)
4747
.set('Authorization', `Basic ${authToken}`)
48-
.send({createdBy: 'tablee', friendlyName: friendlyName, isSession: true, ttl: 30*24*60*60})
48+
.send({createdBy: 'tablee', friendlyName: friendlyName, ttl: 30*24*60*60})
4949
.end(function(err, res) {
5050
should.not.exist(err);
5151
res.status.should.equal(406);
@@ -68,84 +68,13 @@ describe('api/accessKeys/accessKeys.test.js', function() {
6868
rs.accessKeys.should.be.an.instanceOf(Array);
6969
rs.accessKeys.should.matchEach(function(it) {
7070
return it.should.have.properties(['name', 'createdTime', 'createdBy',
71-
'expires', 'isSession', 'description', 'friendlyName']);
71+
'expires', 'description', 'friendlyName']);
7272
});
7373
done();
7474
});
7575
});
7676
});
7777

78-
describe('modify accessKeys', function(done) {
79-
it('should modify accessKeys add ttl successful', function(done) {
80-
request.patch(`/accessKeys/${encodeURI(friendlyName)}`)
81-
.set('Authorization', `Basic ${authToken}`)
82-
.send({ttl: 7*24*60*60*1000})
83-
.end(function(err, res) {
84-
should.not.exist(err);
85-
res.status.should.equal(200);
86-
var rs = JSON.parse(res.text);
87-
rs.should.have.properties('accessKey');
88-
rs.accessKey.should.have.properties(['name', 'createdTime', 'createdBy',
89-
'expires', 'isSession', 'description', 'friendlyName']);
90-
done();
91-
});
92-
});
93-
94-
it('should modify accessKeys substact ttl successful', function(done) {
95-
request.patch(`/accessKeys/${encodeURI(friendlyName)}`)
96-
.set('Authorization', `Basic ${authToken}`)
97-
.send({ttl: -7*24*60*60*1000})
98-
.end(function(err, res) {
99-
should.not.exist(err);
100-
res.status.should.equal(200);
101-
var rs = JSON.parse(res.text);
102-
rs.should.have.properties('accessKey');
103-
rs.accessKey.should.have.properties(['name', 'createdTime', 'createdBy',
104-
'expires', 'isSession', 'description', 'friendlyName']);
105-
done();
106-
});
107-
});
108-
109-
it('should not modify accessKeys friendlyName successful when friendlyName exists', function(done) {
110-
request.patch(`/accessKeys/${encodeURI(friendlyName)}`)
111-
.set('Authorization', `Basic ${authToken}`)
112-
.send({friendlyName: friendlyName})
113-
.end(function(err, res) {
114-
should.not.exist(err);
115-
res.status.should.equal(406);
116-
res.text.should.equal(`The access key "${friendlyName}" already exists.`);
117-
done();
118-
});
119-
});
120-
121-
it('should not modify accessKeys friendlyName successful when friendlyName invalid', function(done) {
122-
request.patch(`/accessKeys/${encodeURI(newFriendlyName)}`)
123-
.set('Authorization', `Basic ${authToken}`)
124-
.send({friendlyName: newFriendlyName})
125-
.end(function(err, res) {
126-
should.not.exist(err);
127-
res.status.should.equal(406);
128-
res.text.should.equal(`The access key "${newFriendlyName}" does not exist.`);
129-
done();
130-
});
131-
});
132-
133-
it('should modify accessKeys friendlyName successful', function(done) {
134-
request.patch(`/accessKeys/${encodeURI(friendlyName)}`)
135-
.set('Authorization', `Basic ${authToken}`)
136-
.send({friendlyName: newFriendlyName})
137-
.end(function(err, res) {
138-
should.not.exist(err);
139-
res.status.should.equal(200);
140-
var rs = JSON.parse(res.text);
141-
rs.should.have.properties('accessKey');
142-
rs.accessKey.should.have.properties(['name', 'createdTime', 'createdBy',
143-
'expires', 'isSession', 'description', 'friendlyName']);
144-
done();
145-
});
146-
});
147-
});
148-
14978
describe('delete accessKeys', function(done) {
15079
it('should delete accessKeys successful', function(done) {
15180
request.delete(`/accessKeys/${encodeURI(newFriendlyName)}`)

‎test/api/account/account.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('api/account/account.test.js', function() {
3535
res.status.should.equal(200);
3636
var rs = JSON.parse(res.text);
3737
rs.should.have.properties('account');
38-
rs.account.should.have.properties(['email', 'id', 'linkedProviders', 'name']);
38+
rs.account.should.have.properties(['email', 'linkedProviders', 'name']);
3939
done();
4040
});
4141
});

‎test/api/apps/apps.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ describe('api/apps/apps.test.js', function() {
3838
it('should create accessKeys successful', function(done) {
3939
request.post(`/accessKeys`)
4040
.set('Authorization', `Basic ${authToken}`)
41-
.send({createdBy: machineName, friendlyName: friendlyName, isSession: true, ttl: 30*24*60*60})
41+
.send({createdBy: machineName, friendlyName: friendlyName, ttl: 30*24*60*60})
4242
.end(function(err, res) {
4343
should.not.exist(err);
4444
res.status.should.equal(200);
4545
var rs = JSON.parse(res.text);
4646
rs.should.have.properties('accessKey');
4747
rs.accessKey.should.have.properties(['name', 'createdTime', 'createdBy',
48-
'expires', 'isSession', 'description', 'friendlyName']);
48+
'expires', 'description', 'friendlyName']);
4949
bearerToken = _.get(rs, 'accessKey.name');
5050
done();
5151
});

‎test/api/apps/release.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ describe('api/apps/release.test.js', function() {
3535
it('should create accessKeys successful', function(done) {
3636
request.post(`/accessKeys`)
3737
.set('Authorization', `Basic ${authToken}`)
38-
.send({createdBy: machineName, friendlyName: friendlyName, isSession: true, ttl: 30*24*60*60})
38+
.send({createdBy: machineName, friendlyName: friendlyName, ttl: 30*24*60*60})
3939
.end(function(err, res) {
4040
should.not.exist(err);
4141
res.status.should.equal(200);
4242
var rs = JSON.parse(res.text);
4343
rs.should.have.properties('accessKey');
4444
rs.accessKey.should.have.properties(['name', 'createdTime', 'createdBy',
45-
'expires', 'isSession', 'description', 'friendlyName']);
45+
'expires', 'description', 'friendlyName']);
4646
bearerToken = _.get(rs, 'accessKey.name');
4747
done();
4848
});

‎test/api/sessions/sessions.test.js‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)