Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit a8dbf94

Browse files
rcreaseyrcreasey
committed
Replacing armadaKey/armadaPassword with fleetKey/fleetPassword.
1 parent 05bda68 commit a8dbf94

24 files changed

Lines changed: 131 additions & 131 deletions

‎app/js/Main.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ function initialize() {
6464
}
6565

6666
function createFleetButtonClick(button) {
67-
var armadaPassword = $('#create-fleet-password').val();
68-
createArmada(armadaPassword);
67+
var fleetPassword = $('#create-fleet-password').val();
68+
createArmada(fleetPassword);
6969
}
7070

71-
function createArmada(armadaPassword) {
71+
function createArmada(fleetPassword) {
7272
UIPanels.showLoadingPanel('Creating new armada...', function () {
73-
Server.createArmada(armadaPassword, function(error, data) {
73+
Server.createArmada(fleetPassword, function(error, data) {
7474
if (error) {
7575
UIPanels.showCreatePanel(error);
7676
return;
@@ -82,14 +82,14 @@ function createArmada(armadaPassword) {
8282
}
8383

8484
function joinFleetButtonClick(button) {
85-
var armadaKey = $('#join-fleet-key').val();
86-
joinArmada(armadaKey);
85+
var fleetKey = $('#join-fleet-key').val();
86+
joinArmada(fleetKey);
8787
}
8888

89-
function joinArmada(armadaKey) {
89+
function joinArmada(fleetKey) {
9090
UIPanels.showLoadingPanel('Searching for fleet...', function () {
91-
Server.joinArmada(armadaKey, function(error, data) {
92-
Data.state.armada.key = armadaKey;
91+
Server.joinArmada(fleetKey, function(error, data) {
92+
Data.state.armada.key = fleetKey;
9393
if (error) {
9494
if (error.type === 'password') UIPanels.showPasswordPanel();
9595
else UIPanels.showJoinPanel(error);
@@ -102,16 +102,16 @@ function joinArmada(armadaKey) {
102102
}
103103

104104
function submitPasswordButtonClick(button) {
105-
var armadaPassword = $('#join-fleet-password').val();
106-
submitPassword(armadaPassword);
105+
var fleetPassword = $('#join-fleet-password').val();
106+
submitPassword(fleetPassword);
107107
}
108108

109-
function submitPassword(armadaPassword) {
110-
var armadaKey = Util.getUrlKey();
111-
if (!armadaKey) armadaKey = Data.state.armada.key;
109+
function submitPassword(fleetPassword) {
110+
var fleetKey = Util.getUrlKey();
111+
if (!fleetKey) fleetKey = Data.state.armada.key;
112112

113113
UIPanels.showLoadingPanel('Authenticating...', function () {
114-
Server.joinArmadaWithPassword(armadaKey, armadaPassword, function (error, data) {
114+
Server.joinArmadaWithPassword(fleetKey, fleetPassword, function (error, data) {
115115
if (error) {
116116
if (error.type === 'password') UIPanels.showPasswordPanel(error);
117117
else UIPanels.showJoinPanel(error);

‎app/js/Server.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ var Server = {
5454
Data.state.lastPollTs = Date.now();
5555
},
5656

57-
joinArmada: function (armadaKey, callback) {
58-
Server.ajaxGet('/join/' + armadaKey, callback);
57+
joinArmada: function (fleetKey, callback) {
58+
Server.ajaxGet('/join/' + fleetKey, callback);
5959
},
6060

61-
joinArmadaWithPassword: function (armadaKey, armadaPassword, callback) {
62-
Server.ajaxGet('/join/' + armadaKey + '/' + armadaPassword, callback);
61+
joinArmadaWithPassword: function (fleetKey, fleetPassword, callback) {
62+
Server.ajaxGet('/join/' + fleetKey + '/' + fleetPassword, callback);
6363
},
6464

6565
eventResponse: function (eventKey, response, callback) {
6666
Server.ajaxGet('/respond/' + eventKey + '/' + response, callback);
6767
},
6868

69-
createArmada: function (armadaPassword, callback) {
70-
Server.ajaxGet('/create/' + armadaPassword, callback);
69+
createArmada: function (fleetPassword, callback) {
70+
Server.ajaxGet('/create/' + fleetPassword, callback);
7171
},
7272

7373
poll: function (callback) {

‎app/js/Util.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ var Util = {
4444
return match ? match[0] : false;
4545
},
4646

47-
redirectToKeyUrl: function (armadaKey) {
47+
redirectToKeyUrl: function (fleetKey) {
4848
window.location = location.protocol
4949
+ '//' + location.hostname
5050
+ (location.port ? ':' + location.port : '')
51-
+ '/' + armadaKey + '/';
51+
+ '/' + fleetKey + '/';
5252
},
5353

5454
redirectToBasePath: function () {
@@ -65,10 +65,10 @@ var Util = {
6565
+ '/login/';
6666
},
6767

68-
redirectIfNecessary: function (armadaKey, callback) {
69-
if (!!armadaKey !== !!Util.getUrlKey() || armadaKey !== Util.getUrlKey()) {
68+
redirectIfNecessary: function (fleetKey, callback) {
69+
if (!!fleetKey !== !!Util.getUrlKey() || fleetKey !== Util.getUrlKey()) {
7070
UIPanels.showLoadingPanel('Redirecting to Standing Fleet URL...', function () {
71-
setTimeout($.proxy(Util.redirectToKeyUrl, null, armadaKey),
71+
setTimeout($.proxy(Util.redirectToKeyUrl, null, fleetKey),
7272
Data.config.pollInterval);
7373
});
7474
} else {

‎config/settings.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ module.exports = function () {
4141

4242
requestSizeLimit: '80kb',
4343

44-
armadaPasswordMinLength: 3,
45-
armadaPasswordMaxLength: 32,
44+
fleetPasswordMinLength: 3,
45+
fleetPasswordMaxLength: 32,
4646

4747
scanMaxShips: 100,
4848
scanMinShips: 1,

‎lib/actions/createAction.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ module.exports = function (armadaService, memberService, sessionService, eventSe
1111
'Please <a href="#" onclick="leaveArmada()">leave your current Standing Fleet</a> before creating a new one.');
1212
}
1313

14-
var armadaPassword = req.params.armadaPassword || false;
14+
var fleetPassword = req.params.fleetPassword || false;
1515

16-
if (armadaPassword &&
17-
(armadaPassword.length > settings.armadaPasswordMaxLength
18-
|| armadaPassword.length < settings.armadaPasswordMinLength)) {
16+
if (fleetPassword &&
17+
(fleetPassword.length > settings.fleetPasswordMaxLength
18+
|| fleetPassword.length < settings.fleetPasswordMinLength)) {
1919

2020
return errorResponse.respond(req, res, 'input',
21-
'Invalid password. Must consist of ' + settings.armadaPasswordMinLength
22-
+ ' to ' + settings.armadaPasswordMaxLength + ' characters.');
21+
'Invalid password. Must consist of ' + settings.fleetPasswordMinLength
22+
+ ' to ' + settings.fleetPasswordMaxLength + ' characters.');
2323
}
2424

25-
armadaService.addAndGet(armadaPassword, function (error, armada) {
25+
armadaService.addAndGet(fleetPassword, function (error, armada) {
2626
if (error) return errorResponse.respond(req, res, 'state',
2727
'Error creating armada.');
2828

‎lib/actions/joinAction.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function (errorResponse, successResponse, headerParser, memberS
55
pub.run = function (req, res) {
66
logger.processing(req);
77

8-
if (req.params.armadaPassword ) {
8+
if (req.params.fleetPassword ) {
99
logger.log('Processing \'join\' request with password', 0)
1010
} else {
1111
logger.log('Processing \'join\' request', 0);
@@ -17,15 +17,15 @@ module.exports = function (errorResponse, successResponse, headerParser, memberS
1717
'Please leave your current armada before joining a new one.');
1818
}
1919

20-
armadaService.getByKey(req.params.armadaKey, function (error, armada) {
20+
armadaService.getByKey(req.params.fleetKey, function (error, armada) {
2121
if (error) return errorResponse.respond(req, res, 'init', 'Error finding armada.');
2222

2323
if (!armada) {
2424
return errorResponse.respond(req, res, 'input',
2525
'Invalid Fleet key.');
2626
}
2727

28-
if (armada.password && (req.params.armadaPassword !== armada.password)) {
28+
if (armada.password && (req.params.fleetPassword !== armada.password)) {
2929
return errorResponse.respond(req, res, 'password', 'Invalid password.');
3030
}
3131

‎lib/actions/leaveAction.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = function (successResponse, errorResponse, memberService, eventS
2121
name: member.name,
2222
id: member.id,
2323
key: member.key
24-
}, req.session.armadaKey, function (error) {
24+
}, req.session.fleetKey, function (error) {
2525
if (error) return errorResponse.respond(req, res, 'event', 'Error creating leave event');
2626

2727
req.session = null;

‎lib/actions/pollAction.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = function (successResponse, errorResponse, headerParser, session
3535
if (error) return callback(error);
3636

3737
if (updated) {
38-
eventService.addAndGet('memberUpdated', member, req.session.armadaKey, callback);
38+
eventService.addAndGet('memberUpdated', member, req.session.fleetKey, callback);
3939
} else {
4040
callback(null, true);
4141
}
@@ -45,7 +45,7 @@ module.exports = function (successResponse, errorResponse, headerParser, session
4545
});
4646
};
4747

48-
var checkForTriggers = function(armadaKey, oldState, newState, callback) {
48+
var checkForTriggers = function(fleetKey, oldState, newState, callback) {
4949

5050
var tasks = [];
5151

@@ -57,7 +57,7 @@ module.exports = function (successResponse, errorResponse, headerParser, session
5757
id: newState.id,
5858
shipTypeName: oldState.shipType,
5959
shipTypeId: oldState.shipTypeId
60-
}, armadaKey, callback);
60+
}, fleetKey, callback);
6161
});
6262
}
6363
}
@@ -70,7 +70,7 @@ module.exports = function (successResponse, errorResponse, headerParser, session
7070
name: newState.name,
7171
systemName: newState.systemName,
7272
systemId: newState.systemId,
73-
}, armadaKey, callback);
73+
}, fleetKey, callback);
7474
})
7575
}
7676
}
@@ -88,7 +88,7 @@ module.exports = function (successResponse, errorResponse, headerParser, session
8888
var getNewEvents = function (req, next) {
8989
var lastPollTs = +req.params.lastPollTs;
9090

91-
eventService.getByArmadaKey(req.session.armadaKey, function (error, events) {
91+
eventService.getByfleetKey(req.session.fleetKey, function (error, events) {
9292
if (error) next(error);
9393
var newEvents = [];
9494

@@ -112,7 +112,7 @@ module.exports = function (successResponse, errorResponse, headerParser, session
112112
if (error) return errorResponse.respond(req, res, 'selfupdate', error);
113113

114114
var headers = req.session.linked || headerParser.parse(req);
115-
checkForTriggers(req.session.armadaKey, oldState, headers, function (error, data) {
115+
checkForTriggers(req.session.fleetKey, oldState, headers, function (error, data) {
116116
if (error) return errorResponse.respond(req, res, 'triggers', error);
117117

118118
getNewEvents(req, function (error, newEvents) {

‎lib/actions/postDetailsAction.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ module.exports = function (hostileService, eventService, headerParser, errorResp
3939
});
4040
},
4141
function(pilot, headerData, callback){
42-
hostileService.updateAndGet(headerData, pilot, req.session.armadaKey, function(hostile) {
42+
hostileService.updateAndGet(headerData, pilot, req.session.fleetKey, function(hostile) {
4343
callback(null, hostile);
4444
});
4545
}
4646
], function (error, hostile) {
4747
if (error) return errorResponse.respond(req, res, 'status', 'Unable to parse status.');
48-
eventService.addAndGet('updateHostile', hostile, req.session.armadaKey, function(error, event) {
48+
eventService.addAndGet('updateHostile', hostile, req.session.fleetKey, function(error, event) {
4949
successResponse.respond(res);
5050
});
5151
});

‎lib/actions/postScanAction.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ module.exports = function (scanService, eventService, memberService, headerParse
3838
return errorResponse.respond(req, res, 'scan', 'Invalid scan data.');
3939
}
4040

41-
scanService.addAndGet(headerParser.parse(req), scanData, req.session.armadaKey, function (error, scan) {
41+
scanService.addAndGet(headerParser.parse(req), scanData, req.session.fleetKey, function (error, scan) {
4242
if (error) return errorResponse.respond(req, res, 'scan', 'Unable to add scan');
4343

4444
memberService.getByKey(req.session.memberKey, function (error, member) {
4545
if (error) return errorResponse.respond(req, res, 'member', 'Error fetching member');
4646

47-
eventService.addAndGet('scanPosted', scan, req.session.armadaKey, function (error, event) {
47+
eventService.addAndGet('scanPosted', scan, req.session.fleetKey, function (error, event) {
4848
successResponse.respond(res);
4949
});
5050
});

0 commit comments

Comments
 (0)