|
|
@@ -59,9 +59,9 @@ module.exports = {
|
|
59
|
59
|
redis.hget("user:" + admin_name, "societies", function (err, result) {
|
|
60
|
60
|
if (result) {
|
|
61
|
61
|
result = JSON.parse(result);
|
|
62
|
|
- redis.hset("user:" + admin_name, "societies", JSON.stringify(result.concat(society_name)));
|
|
|
62
|
+ redis.hset("user:" + admin_name, "societies", JSON.stringify(result.concat(society_name.toLowerCase())));
|
|
63
|
63
|
} else {
|
|
64
|
|
- redis.hset("user:" + admin_name, "societies", JSON.stringify([society_name]));
|
|
|
64
|
+ redis.hset("user:" + admin_name, "societies", JSON.stringify([society_name.toLowerCase()]));
|
|
65
|
65
|
}
|
|
66
|
66
|
});
|
|
67
|
67
|
});
|
|
|
@@ -178,6 +178,38 @@ module.exports = {
|
|
178
|
178
|
});
|
|
179
|
179
|
},
|
|
180
|
180
|
|
|
|
181
|
+ kick_user: function (user, soc_name, auth, complete) {
|
|
|
182
|
+ var self = this;
|
|
|
183
|
+ permissions_controller.user_can_manage_society(auth, soc_name, function (isadmin) {
|
|
|
184
|
+ if (isadmin) {
|
|
|
185
|
+ user_controller.get_raw_user(user.toLowerCase(), function (result) {
|
|
|
186
|
+ if (result["auth-key"]) {
|
|
|
187
|
+ permissions_controller.user_can_manage_society(result["auth-key"], soc_name, function (admin) {
|
|
|
188
|
+ if (admin) {
|
|
|
189
|
+ complete({
|
|
|
190
|
+ "success": 0,
|
|
|
191
|
+ "error": 3
|
|
|
192
|
+ });
|
|
|
193
|
+ } else {
|
|
|
194
|
+ self.leave_society(soc_name, result["auth-key"], complete);
|
|
|
195
|
+ }
|
|
|
196
|
+ });
|
|
|
197
|
+ } else {
|
|
|
198
|
+ complete({
|
|
|
199
|
+ "success": 0,
|
|
|
200
|
+ "error": 2
|
|
|
201
|
+ });
|
|
|
202
|
+ }
|
|
|
203
|
+ });
|
|
|
204
|
+ } else {
|
|
|
205
|
+ complete({
|
|
|
206
|
+ "success": 0,
|
|
|
207
|
+ "error": 1
|
|
|
208
|
+ });
|
|
|
209
|
+ }
|
|
|
210
|
+ });
|
|
|
211
|
+ },
|
|
|
212
|
+
|
|
181
|
213
|
leave_society: function (soc_name, auth, complete) {
|
|
182
|
214
|
permissions_controller.user_is_in_society(auth, soc_name, function(user_in_soc) {
|
|
183
|
215
|
if (user_in_soc) {
|
|
|
@@ -254,12 +286,12 @@ module.exports = {
|
|
254
|
286
|
"error": 3
|
|
255
|
287
|
});
|
|
256
|
288
|
} else {
|
|
257
|
|
- redis.hset("society:" + soc_name.toLowerCase(), "admins", JSON.stringify(result.concat(promotee)));
|
|
258
|
|
- complete({
|
|
259
|
|
- "success": 1,
|
|
260
|
|
- "error": 0
|
|
261
|
|
- });
|
|
262
|
|
- }
|
|
|
289
|
+ redis.hset("society:" + soc_name.toLowerCase(), "admins", JSON.stringify(result.concat(promotee)));
|
|
|
290
|
+ complete({
|
|
|
291
|
+ "success": 1,
|
|
|
292
|
+ "error": 0
|
|
|
293
|
+ });
|
|
|
294
|
+ }
|
|
263
|
295
|
}else {
|
|
264
|
296
|
console.error("Error could not find admin list in society.");
|
|
265
|
297
|
}
|