Skip to content

Commit f7c2338

Browse files
nawazdhandalanawazdhandala
authored
Merge pull request #127 from ritishgumber/master
updated delete and deleteReason
2 parents 551143b + b5a2cc4 commit f7c2338

File tree

2 files changed

+114
-85
lines changed

2 files changed

+114
-85
lines changed

‎api/app/App.js

+77-79
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
# CloudBoost - Core Engine that powers Bakend as a Service
43
# (c) 2014 HackerBay, Inc.
@@ -8,32 +7,32 @@
87
module.exports = function() {
98

109
//create a new app.
11-
global.app.post('/app/:appId', function (req, res) {
10+
global.app.post('/app/:appId', function(req, res) {
1211

1312
console.log("++++ Create App API ++++++");
1413

15-
try{
16-
console.log("SecureKey to create app:"+req.body.secureKey);
14+
try {
15+
console.log("SecureKey to create app:" + req.body.secureKey);
1716

1817
var appId = req.params.appId;
19-
console.log("App ID : "+appId);
18+
console.log("App ID : " + appId);
2019

2120
var sdk = req.body.sdk || "REST";
2221

2322
if (global.keys.secureKey === req.body.secureKey) {
2423
console.log("Secure Key Valid. Creating app...");
25-
global.appService.createApp(appId).then(function (app){
24+
global.appService.createApp(appId).then(function(app) {
2625

27-
global.appService.createDefaultTables(appId).then(function(){
26+
global.appService.createDefaultTables(appId).then(function() {
2827
console.log("Success : App Successfully Created.");
2928
res.status(200).send(app);
30-
},function(err){
29+
}, function(err) {
3130
console.log("Error : Cannot create an app.");
3231
console.log(err);
3332
res.status(500).send(err);
3433
})
3534

36-
}, function (err){
35+
}, function(err) {
3736
console.log("Error : Cannot create an app.");
3837
console.log(err);
3938
res.status(500).send(err);
@@ -43,45 +42,45 @@ module.exports = function() {
4342
res.status(401).send("Unauthorized");
4443
}
4544

46-
global.apiTracker.log(appId,"App / Create", req.url,sdk);
45+
global.apiTracker.log(appId, "App / Create", req.url, sdk);
4746

48-
}catch(e){
47+
} catch (e) {
4948
console.log(e);
5049
}
5150
});
5251

5352
//delete app.
54-
global.app.delete('/app/:appId', _deleteApp);
53+
global.app.delete('/app/:appId', _deleteApp);
5554
global.app.put('/app/:appId', _deleteApp);
5655

57-
function _deleteApp(req, res){ //delete the app and all of its data.
56+
function _deleteApp(req, res) { //delete the app and all of its data.
5857
console.log('+++++++++++++ APP DELETE HANDLER +++++++++++');
5958
var appId = req.params.appId;
6059
var sdk = req.body.sdk || "REST";
6160

6261
var body = req.body || {};
63-
64-
if(global.keys.secureKey === body.secureKey){
62+
var deleteReason = body.deleteReason;
63+
if (global.keys.secureKey === body.secureKey) {
6564
console.log("Authorized");
6665
//delete all code here.
67-
global.appService.deleteApp(appId).then(function(){
66+
global.appService.deleteApp(appId, deleteReason).then(function() {
6867
console.log("App deleted");
69-
return res.status(200).send({status : 'Success'});
70-
}, function(){
68+
return res.status(200).send({status: 'Success'});
69+
}, function() {
7170
console.log("Internal Server Error");
72-
return res.status(500).send({status : 'Error'});
71+
return res.status(500).send({status: 'Error'});
7372
});
74-
} else{
73+
} else {
7574
console.log("Unauthorized");
76-
return res.status(401).send({status : 'Unauthorized'});
75+
return res.status(401).send({status: 'Unauthorized'});
7776
}
7877

7978
global.apiTracker.log(appId,"App / Delete", req.url,sdk);
8079

8180
}
8281

8382
//delete a table.
84-
global.app.delete('/app/:appId/:tableName', _deleteTable);
83+
global.app.delete('/app/:appId/:tableName', _deleteTable);
8584

8685
function _deleteTable(req, res) { //delete the app and all of its data.
8786

@@ -96,23 +95,23 @@ module.exports = function() {
9695

9796
var appKey = req.body.key || req.params.key;
9897

99-
global.appService.isMasterKey(appId, appKey).then(function (isMasterKey) {
98+
global.appService.isMasterKey(appId, appKey).then(function(isMasterKey) {
10099
if (isMasterKey) {
101100
//delete all code here.
102-
global.appService.deleteTable(appId, tableName).then(function (table) {
101+
global.appService.deleteTable(appId, tableName).then(function(table) {
103102
res.status(200).send(table);
104-
}, function (error) {
103+
}, function(error) {
105104
console.log("Table Delete Error");
106105
console.log(error);
107106
res.status(500).send('Cannot delete table at this point in time. Please try again later.');
108107
});
109108
} else {
110-
res.status(401).send({status : 'Unauthorized'});
109+
res.status(401).send({status: 'Unauthorized'});
111110
}
112-
}, function (error) {
111+
}, function(error) {
113112
return res.status(500).send('Cannot retrieve security keys.');
114113
});
115-
}catch(e){
114+
} catch (e) {
116115
console.log("Delete Table Error");
117116
console.log(e);
118117
return res.status(500).send('Cannot delete table.');
@@ -122,15 +121,15 @@ module.exports = function() {
122121
}
123122

124123
//create a table.
125-
global.app.put('/app/:appId/:tableName',function(req,res){
124+
global.app.put('/app/:appId/:tableName', function(req, res) {
126125

127126
console.log("Create or Delete table Api...");
128127

129-
if(req.body && req.body.method=="DELETE"){
128+
if (req.body && req.body.method == "DELETE") {
130129
/***************************DELETE******************************/
131-
_deleteTable(req,res);
130+
_deleteTable(req, res);
132131
/***************************DELETE******************************/
133-
}else{
132+
} else {
134133

135134
/***************************UPDATE******************************/
136135
console.log('++++++++ UPDATE TABLE API +++++++++');
@@ -141,37 +140,37 @@ module.exports = function() {
141140
var sdk = req.body.sdk || "REST";
142141
var appKey = req.body.key || req.params.key;
143142

144-
global.appService.isMasterKey(appId, appKey).then(function (isMasterKey) {
145-
if(isMasterKey){
143+
global.appService.isMasterKey(appId, appKey).then(function(isMasterKey) {
144+
if (isMasterKey) {
146145
//delete all code here.
147146

148-
if(global.mongoDisconnected){
147+
if (global.mongoDisconnected) {
149148
return res.status(500).send('Storage / Cache Backend are temporarily down.');
150149
}
151150

152-
global.appService.upsertTable(appId,tableName,body.data.columns).then(function(table){
151+
global.appService.upsertTable(appId, tableName, body.data.columns).then(function(table) {
153152
return res.status(200).send(table);
153+
154154
},function(err){
155155
return res.status(500).send(err);
156156
});
157-
}else{
158-
return res.status(401).send({status : 'Unauthorized'});
157+
} else {
158+
return res.status(401).send({status: 'Unauthorized'});
159159
}
160-
}, function(error){
160+
}, function(error) {
161161
return res.status(500).send('Cannot retrieve security keys.');
162162
});
163-
164163
global.apiTracker.log(appId,"App / Table / Create", req.url,sdk);
165164

166165
}
167166

168167
});
169168

170169
//get a table.
171-
global.app.post('/app/:appId/:tableName',_getTable);
172-
global.app.get('/app/:appId/:tableName',_getTable);
170+
global.app.post('/app/:appId/:tableName', _getTable);
171+
global.app.get('/app/:appId/:tableName', _getTable);
173172

174-
function _getTable(req,res){
173+
function _getTable(req, res) {
175174
console.log('++++++++ GET TABLE API +++++++++');
176175

177176
var appId = req.params.appId;
@@ -180,98 +179,97 @@ module.exports = function() {
180179
var sdk = req.body.sdk || "REST";
181180
var appKey = req.body.key || req.params.key;
182181

183-
global.appService.isMasterKey(appId, appKey).then(function (isMasterKey) {
184-
if(isMasterKey){
182+
global.appService.isMasterKey(appId, appKey).then(function(isMasterKey) {
183+
if (isMasterKey) {
185184
//delete all code here.
186-
if(tableName === "_getAll"){
187-
global.appService.getAllTables(appId).then(function(tables){
185+
if (tableName === "_getAll") {
186+
global.appService.getAllTables(appId).then(function(tables) {
188187
return res.status(200).send(tables);
189-
},function(err){
188+
}, function(err) {
190189
return res.status(500).send('Error');
191190
});
192-
}else{
193-
global.appService.getTable(appId,tableName).then(function(table){
191+
} else {
192+
global.appService.getTable(appId, tableName).then(function(table) {
194193
return res.status(200).send(table);
195-
},function(err){
194+
}, function(err) {
196195
return res.status(500).send('Error');
197196
});
198197
}
199198

200-
}else{
201-
return res.status(401).send({status : 'Unauthorized'});
199+
} else {
200+
return res.status(401).send({status: 'Unauthorized'});
202201
}
203-
}, function(error){
202+
}, function(error) {
204203
return res.status(500).send('Cannot retrieve security keys.');
205204
});
206205

207-
global.apiTracker.log(appId,"App / Table / Get", req.url,sdk);
206+
global.apiTracker.log(appId, "App / Table / Get", req.url, sdk);
208207
}
209208

210-
211209
//Export Database for :appID
212-
global.app.post('/backup/:appId/exportdb',function(req, res) {
210+
global.app.post('/backup/:appId/exportdb', function(req, res) {
213211
console.log("++++ Export Database ++++++");
214-
try{
212+
try {
215213
var appKey = req.body.key;
216214
var appId = req.params.appId;
217215

218-
global.appService.isMasterKey(appId,appKey).then(function (isMasterKey) {
216+
global.appService.isMasterKey(appId, appKey).then(function(isMasterKey) {
219217

220218
if (isMasterKey) {
221-
global.appService.exportDatabase(appId).then(function(data){
219+
global.appService.exportDatabase(appId).then(function(data) {
222220
res.writeHead(200, {
223-
"Content-Type": "application/octet-stream",
224-
"Content-Disposition" : "attachment; filename=dump"+(new Date())+".json"
221+
"Content-Type": "application/octet-stream",
222+
"Content-Disposition": "attachment; filename=dump" + (new Date()) + ".json"
225223
});
226224
res.end(JSON.stringify(data))
227-
},function (err){
225+
}, function(err) {
228226
console.log("Error : Exporting Database.");
229227
console.log(err);
230228
res.status(500).send("Error");
231229
})
232230
} else {
233-
res.status(401).send({status : 'Unauthorized'});
231+
res.status(401).send({status: 'Unauthorized'});
234232
}
235-
}, function (error) {
233+
}, function(error) {
236234
return res.status(500).send('Cannot retrieve security keys.');
237235
});
238-
} catch(e) {
236+
} catch (e) {
239237
console.log(e);
240238
}
241239
});
242240

243241
//Import Database for :appID
244-
global.app.post('/backup/:appId/importdb',function(req, res) {
242+
global.app.post('/backup/:appId/importdb', function(req, res) {
245243
console.log("++++ Import Database ++++++");
246244
try{
247245
var appKey = req.body.key
248246
var appId = req.params.appId;
249-
global.appService.isMasterKey(appId,appKey).then(function (isMasterKey) {
247+
global.appService.isMasterKey(appId, appKey).then(function(isMasterKey) {
250248
if (isMasterKey) {
251249
var file;
252-
if(req.files && req.files.file){
253-
file = req.files.file.data
250+
if(req.files && req.files.file){
251+
file = req.files.file.data
254252
}
255-
if(file){
256-
global.appService.importDatabase(appId,file).then(function(data){
257-
if(data){
258-
res.status(200).json({Success:true})
253+
if (file) {
254+
global.appService.importDatabase(appId, file).then(function(data) {
255+
if (data) {
256+
res.status(200).json({Success: true})
259257
} else {
260-
res.status(500).json({success:false})
258+
res.status(500).json({success: false})
261259
}
262-
},function (err){
260+
}, function(err) {
263261
console.log("Error : Exporting Database.");
264262
console.log(err);
265263
res.status(500).send("Error");
266264
})
267265
}
268266
} else {
269-
res.status(401).send({status : 'Unauthorized'});
267+
res.status(401).send({status: 'Unauthorized'});
270268
}
271-
}, function (error) {
269+
}, function(error) {
272270
return res.status(500).send('Cannot retrieve security keys.');
273271
});
274-
} catch(e) {
272+
} catch (e) {
275273
console.log(e);
276274
}
277275
});

0 commit comments

Comments
 (0)