Skip to content

disabled the boot script for Catalyst routes. Instead modified the ro… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s-tintin wants to merge 1 commit into
base: topic-settings
Choose a base branch
from
Open

disabled the boot script for Catalyst routes. Instead modified the ro… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,163 changes: 2,163 additions & 0 deletions client/cat3/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions server/app/loopback/boot/authentication
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
'use strict';

module.exports = function enableAuthentication(server) {
// enable authentication
//server.enableAuth();
};
28 changes: 28 additions & 0 deletions server/app/loopback/boot/boot_routes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
var logger = require('_pr/logger')(module);


module.exports = function(app) {

// logger.debug('Setting up application routes');
/*var routes = require('../../routes/v1.0/routes.js');
//console.log(routes);
console.log("**********************************************************");

var routerV1 = app.loopback.Router();
routes.setRoutes(routerV1);
app.use(routerV1);

app.use('/api/v1.0', routerV1);*/


var routerV2 = require('../../routes/v2.0');

//console.log(routerV2);
logger.debug('Setting up version 2 routes');

app.use('/api/v2.0', routerV2);
logger.debug("done");



}
5 changes: 1 addition & 4 deletions server/app/loopback/boot/routes.js → server/app/loopback/boot/routes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function(app) {

// logger.debug('Setting up application routes');
var routes = require('../../routes/v1.0/routes.js');
//console.log(routes);
//console.log(routes);
console.log("**********************************************************");

var routerV1 = app.loopback.Router();
Expand All @@ -22,7 +22,4 @@ module.exports = function(app) {

app.use('/api/v2.0', routerV2);
logger.debug("done");



}
4 changes: 4 additions & 0 deletions server/app/loopback/middleware.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@
"session": {},
"auth": {},
"parse": {},

"routes": {
"../routes/v1.0/routes.js": {
"paths": ["./api"]
},
"loopback#rest": {
"paths": [
"${restApiRoot}"
Expand Down
23 changes: 23 additions & 0 deletions server/app/loopback/redirect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
'use strict'

var logger = require('_pr/logger')(module);

module.exports = function () {
return function redirect-catalyst(req,res,next){

/*var routes = require('../routes/v1.0/routes.js');
var routerV1 = app.loopback.Router();
var routerV2 = require('../routes/v2.0');*/

logger.debug('Setting up application Catalyst routes in url not found phase');
//routes.setRoutes(routerV1);

app.use(routerV1);
app.use('/api/v1.0', routerV1);

app.use('/api/v2.0', routerV2);

res.end();

}
}
23 changes: 23 additions & 0 deletions server/app/loopback/url-not-found-redirect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
'use strict'

var logger = require('_pr/logger')(module);

module.exports = function () {
return function redirect-catalyst(req,res,next){

/*var routes = require('../routes/v1.0/routes.js');
var routerV1 = app.loopback.Router();
var routerV2 = require('../routes/v2.0');*/

logger.debug('Setting up application Catalyst routes in url not found phase');
//routes.setRoutes(routerV1);

app.use(routerV1);
app.use('/api/v1.0', routerV1);

app.use('/api/v2.0', routerV2);

//res.end();

};
}
9 changes: 8 additions & 1 deletion server/app/routes/v1.0/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,12 @@ var routesResourceMap = require('./routes_resourceMap');
* Change app to router in internal routes files
*/

module.exports.setRoutes = function(app) {
module.exports = setRoutes;

function setRoutes() {
logger.debug("IN setRoutes");
return function redirect_routes(req,res,next) {
var app = app.loopback.Router();

app.use(cors());

Expand Down Expand Up @@ -293,4 +298,6 @@ module.exports.setRoutes = function(app) {
return res.status(err.status).send(errorResponse);
}
}
next()
}
}
31 changes: 16 additions & 15 deletions server/app/routes/v1.0/routes_authentication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ module.exports.setRoutes = function(app) {
res.send(err);
} else {

res.send(200);
res.sendStatus(200);
return;
}
});
} else {
res.send(200);
res.sendStatus(200);
return;
}

Expand Down Expand Up @@ -107,7 +107,7 @@ module.exports.setRoutes = function(app) {
return next(err);
}

res.send(200, {
res.sendStatus(200, {
token: authToken.token
});
return;
Expand Down Expand Up @@ -172,7 +172,7 @@ module.exports.setRoutes = function(app) {
if (err) {
return next(err);
}
res.send(200, {
res.sendStatus(200, {
token: authToken.token
});
return;
Expand Down Expand Up @@ -243,7 +243,7 @@ module.exports.setRoutes = function(app) {
return next(err);
}

res.send(200, {
res.sendStatus(200, {
token: authToken.token
});
return;
Expand Down Expand Up @@ -306,7 +306,7 @@ module.exports.setRoutes = function(app) {
return;
}
logger.debug('token removed', JSON.stringify(removeCount));
res.send(200, {
res.sendStatus(200, {
message: 'token removed'
});
});
Expand Down Expand Up @@ -341,10 +341,10 @@ module.exports.setRoutes = function(app) {
});

ldapClient.compare(req.params.username, function(err, status) {
res.send(status)
res.sendStatus(status);
});
} else {
res.send(200);
res.sendStatus(200);
}

} else {
Expand All @@ -371,7 +371,7 @@ module.exports.setRoutes = function(app) {
AuthToken.findByToken(token, function(err, authToken) {
if (err) {
logger.error('Unable to fetch token from db', err);
res.send(403);
res.sendStatus(403);
return;
}
if (authToken) {
Expand All @@ -380,14 +380,14 @@ module.exports.setRoutes = function(app) {
// req.session.destroy();
} else {
logger.debug("No Valid Session for User - 403");
res.send(403);
res.sendStatus(403);
}
});
} else if (tempToken) { //checking for temp token
tempAuthToken.findByToken(tempToken, function(err, tempTokenData) {
if (err) {
logger.error('Unable to fetch token from db', err);
res.send(403);
res.sendStatus(403);
return;
}
if (tempTokenData) {
Expand All @@ -396,13 +396,14 @@ module.exports.setRoutes = function(app) {
//req.session.destroy();
} else {
logger.debug("No Valid Session for User - 403");
res.send(403);
logger.debug(req.session.views);
res.sendStatus(403);
// req.session.destroy();
}
});
} else {
logger.debug("No Valid Session for User - 403");
res.send(403);
res.sendStatus(403);
}
}
};
Expand All @@ -414,11 +415,11 @@ module.exports.setRoutes = function(app) {
next();
} else {
logger.debug("Has Session && Session Has User But User is not Admin");
res.send(403);
res.sendStatus(403);
}
} else {
logger.debug("No Valid Session for User - 403");
res.send(403);
res.sendStatus(403);
}
}

Expand Down
5 changes: 1 addition & 4 deletions server/app/routes/v2.0/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ var logger = require('_pr/logger')(module);

var router = express.Router();




router.use(Authentication.pattern, Authentication.router);

if (Authentication.sessionVerifier) {
Expand Down Expand Up @@ -47,4 +44,4 @@ function errorHandler(err, req, res, next) {
}
}

module.exports = router;
module.exports = router;
Loading