fix authentication and logout

Author: janishar

keys/private.pem.example

@@ -1,15 +1,9 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC0l9II745oaw+6EF+cZdBsvF4AAcKC+7AxUbcgUIH8hahApLwQ
-maeglUmnErumDu4aVEvHaWYvBBS2/Bc+mCGiadUegwahrUOX3g3FNQiNCWAdSBDM
-gwEctmlNQUh6OenceaBpQayIYIiOXgZRF28koy2dkiNp/gfqnClkBcArqwIDAQAB
-AoGAIW2U2EiXgKaIo7VSLV3/RZFciP3KZnp2M7rffeDJHtgSu9yCX0RB7gyUNJPY
-HjXXRxJhcIkG/B7yQqjJGLIKT3jdfFZh5TcJxbJI4+dPfcJCx4i+nXej25qYLalC
-ebgQs+xf3Qv5MAAGoLPqqee/MrBPyh31N85MqT0TqUnxcuECQQDvd39FIM6NiYEH
-u39S/wGnpQKU9qYlugNDId738nsC+53NtPeVIiM/87uctIvCFRiHblZ7ynyNhj7g
-uGtXX0QRAkEAwQ+/cpuoAxHBqhkqFgw5G0cgcx1lLre96s+Pg67HDFYCICNhDF08
-OajVp+daNMQ/0iwTU7qTbKfrTMIlk1R/+wJAKBkcaJjrvWuO/Zp54Y3t2wKYghUj
-ESIqta0QRviFfKRhcjahVomW2XiYq87XsDIUH2lsdeIcJR6bnMmEv+al4QJBAJd8
-o9xqBwthg3TVChECxkyBIxUwm5Rs2LjG5PWOzuD/G+vb1uq8veUAdaWqAz4kP2/K
-5d9tJwC7QgaY0KMqSsECQA+fDl+XOABmQFLITnjN31Zc6rArhgS/wFeO1MU/5oVL
-H0aH8xIM+eHPNnQrqct0aTmO2CnbbqoZlXoE4G6glVo=
+MIIBOgIBAAJBAJ6P+APtBxacEuI6n3PbdIDsLR2/uj/FVincMBYKBtpc3jBL/JNp
+qX10mmdkOpOv6Jh0vE314q9Zg88jSNjus9kCAwEAAQJAZ3W09IrSVzRbNfXeWPBW
+olB4V7LkSfvu7r1XOuor8ooi7cHyHAmaYu7LmcG41wE37BKkUG5+PTW3Q6qyIOqq
+IQIhANERd9yfuV57Tvv4eNHeIBPzpa2PUYCkOqYng9cfPR4dAiEAwigUJYUCeY6i
+SwlLcV+eFdGDd9n10iy3v9hXmyGUr+0CIDO8mObV9+9zoFYmZO+6gkGtt8A9iTPG
+cGURvkSMDHnZAiBy65QZLSRs3M8VCPhdr9H7ahqd6yYEdDGC3UPlb7f5dQIhAM6Q
+HzyFgXw46pPHHfiTH5bNt6Ms97plq1waZcwMtwfT
 -----END RSA PRIVATE KEY-----

keys/public.pem.example

@@ -1,4 +1,4 @@
------BEGIN PUBLIC KEY-----
-MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIyPdrgt0HmEwGblU18SddVY1JHky3wS
-/kCrsTT6wr6jOFMR6QTw1puBzposESpMXLj4thbM2Rhl0XVRiYUJONkCAwEAAQ==
------END PUBLIC KEY-----
+-----BEGIN RSA PUBLIC KEY-----
+MEgCQQCej/gD7QcWnBLiOp9z23SA7C0dv7o/xVYp3DAWCgbaXN4wS/yTaal9dJpn
+ZDqTr+iYdLxN9eKvWYPPI0jY7rPZAgMBAAE=
+-----END RSA PUBLIC KEY-----

src/auth/schema.ts

@@ -7,6 +7,6 @@ export default {
 	}).unknown(true),
 	auth: Joi.object().keys({
 		'x-access-token': Joi.string().required().min(1),
-		'x-user-id': JoiObjectId,
+		'x-user-id': JoiObjectId(),
 	}).unknown(true)
 };

src/helpers/validator.ts

@@ -11,7 +11,7 @@ export enum ValidationSource {
 	PARAM = 'params'
 }
 
-export const JoiObjectId = () => Joi.string().custom((value: string, helpers) => {
+export const JoiObjectId = () => Joi.string().required().custom((value: string, helpers) => {
 	if (!Types.ObjectId.isValid(value))
 		return helpers.error('any.invalid');
 	return value;

src/routes/v1/access/login.ts

@@ -29,7 +29,7 @@ router.post('/basic', validator(schema.userCredential),
 		const tokens = await createTokens(user, accessTokenKey, refreshTokenKey);
 
 		new SuccessResponse('Login Success', {
-			user: _.pick(user, ['name', 'email']),
+			user: _.pick(user, ['_id', 'name', 'roles', 'profilePicUrl']),
 			tokens: tokens
 		}).send(res);
 	}));

src/routes/v1/access/logout.ts

@@ -8,7 +8,7 @@ const router = express.Router();
 
 /*-------------------------------------------------------------------------*/
 // Below all APIs are private APIs protected for Access Token
-router.use('/', require('../../../auth/Authentication'));
+router.use('/', require('../../../auth/authentication'));
 /*-------------------------------------------------------------------------*/
 
 router.delete('/',

src/routes/v1/access/schema.ts

@@ -11,7 +11,7 @@ export default {
 	}),
 	auth: Joi.object().keys({
 		'x-access-token': Joi.string().required().min(1),
-		'x-user-id': JoiObjectId,
+		'x-user-id': JoiObjectId(),
 	}).unknown(true),
 	signup: Joi.object().keys({
 		name: Joi.string().required().min(3),

src/routes/v1/access/signup.ts

@@ -33,7 +33,7 @@ router.post('/basic', validator(schema.signup),
 
 		const tokens = await createTokens(createdUser, keystore.primaryKey, keystore.secondaryKey);
 		new SuccessResponse('Signup Successful', {
-			user: _.pick(createdUser, ['name', 'email', 'roles', 'profilePicUrl']),
+			user: _.pick(createdUser, ['_id', 'name', 'email', 'roles', 'profilePicUrl']),
 			tokens: tokens,
 		}).send(res);
 	}));

src/routes/v1/blog/editor.ts

@@ -15,9 +15,9 @@ const router = express.Router();
 /*-------------------------------------------------------------------------*/
 // Below all APIs are private APIs protected for Access Token and Editor's Role
 router.use('/',
-	require('../../../auth/Authentication'),
+	require('../../../auth/authentication'),
 	(req: RoleRequest, res, next) => { req.currentRoleCode = RoleCode.EDITOR; next(); },
-	require('../../../auth/Authorization'));
+	require('../../../auth/authorization'));
 /*-------------------------------------------------------------------------*/
 
 router.put('/publish/:id', validator(schema.blogId, ValidationSource.PARAM),

src/routes/v1/blog/schema.ts

@@ -6,7 +6,7 @@ export default {
 		url: Joi.string().required().uri()
 	}),
 	blogId: Joi.object().keys({
-		id: JoiObjectId
+		id: JoiObjectId()
 	}),
 	blogTag: Joi.object().keys({
 		tag: Joi.string().required().min(1)
@@ -16,7 +16,7 @@ export default {
 		pageItemCount: Joi.number().required().integer().min(1),
 	}),
 	authorId: Joi.object().keys({
-		id: JoiObjectId
+		id: JoiObjectId()
 	}),
 	blogCreate: Joi.object().keys({
 		title: Joi.string().required().min(3).max(500),