k2hr3-api 1.0.25 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k2hr3-api",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "dependencies": {
     "@kubernetes/client-node": "^0.18.1",
     "body-parser": "^1.20.2",
@@ -12,7 +12,7 @@
     "jose": "^4.14.4",
     "k2hdkc": "^1.0.5",
     "morgan": "~1.10.0",
-    "rotating-file-stream": "^3.1.0"
+    "rotating-file-stream": "^3.1.1"
   },
   "bin": {
     "k2hr3-api": "./bin/www",
@@ -30,12 +30,12 @@
   "devDependencies": {
     "chai": "^4.3.7",
     "chai-http": "^4.4.0",
-    "eslint": "^8.44.0",
+    "eslint": "^8.45.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0"
   },
   "scripts": {
-    "help": "echo 'command list:\n    npm run start\n    npm run start:prod\n    npm run start:production\n    npm run start:prod:dbg\n    npm run start:prod:debug\n    npm run start:prod:debug:break\n    npm run start:prod:debug:nobreak\n    npm run start:dev\n    npm run start:develop\n    npm run start:dev:dbg\n    npm run start:dev:debug\n    npm run start:dev:debug:break\n    npm run start:dev:debug:nobreak\n    npm run start:watcher:prod\n    npm run start:watcher:production\n    npm run start:watcher:dev\n    npm run start:watcher:develop\n    npm run start:watcher:dbg\n    npm run start:watcher:debug\n    npm run start:watcher:debug:break\n    npm run start:watcher:debug:nobreak\n    npm run start:watcher:oneshot:prod\n    npm run start:watcher:oneshot:production\n    npm run start:watcher:oneshot:dev\n    npm run start:watcher:oneshot:develop\n    npm run start:watcher:oneshot:dbg\n    npm run start:watcher:oneshot:debug\n    npm run start:watcher:oneshot:debug:break\n    npm run start:watcher:oneshot:debug:nobreak\n    npm run stop\n    npm run stop:watcher\n    npm run test\n    npm run test:lint\n    npm run test:cover\n    npm run test:auto:all{:dbg}\n    npm run test:auto:version{:dbg}\n    npm run test:auto:usertokens{:dbg}\n    npm run test:auto:list{:dbg}\n    npm run test:auto:resource{:dbg}\n    npm run test:auto:policy{:dbg}\n    npm run test:auto:role{:dbg}\n    npm run test:auto:service{:dbg}\n    npm run test:auto:acr{:dbg}\n    npm run test:auto:userdata{:dbg}\n    npm run test:auto:extdata{:dbg}\n    npm run test:auto:watcher{:dbg}\n    npm run test:auto:templengine\n    npm run test:auto:templengine:async\n    npm run test:manual:apis:version_get\n    npm run test:manual:apis:usertoken_postput\n    npm run test:manual:apis:usertoken_gethead\n    npm run test:manual:apis:policy_postput\n    npm run test:manual:apis:policy_gethead\n    npm run test:manual:apis:policy_delete\n    npm run test:manual:apis:resource_postput\n    npm run test:manual:apis:resource_gethead\n    npm run test:manual:apis:resource_delete\n    npm run test:manual:apis:role_postput\n    npm run test:manual:apis:role_gethead\n    npm run test:manual:apis:role_delete\n    npm run test:manual:apis:tenant_postput\n    npm run test:manual:apis:tenant_gethead\n    npm run test:manual:apis:tenant_delete\n    npm run test:manual:apis:service_postput\n    npm run test:manual:apis:service_gethead\n    npm run test:manual:apis:service_delete\n    npm run test:manual:apis:acr_postput\n    npm run test:manual:apis:acr_get\n    npm run test:manual:apis:acr_delete\n    npm run test:manual:apis:list_gethead\n    npm run test:manual:apis:userdata_get\n    npm run test:manual:apis:extdata_get\n    npm run test:manual:apis:allusertenant_get\n    npm run test:manual:apis:k2hr3keys_get\n    npm run test:manual:load:k2hdkcdata:auto\n    npm run test:manual:load:k2hdkcdata:local\n    npm run test:manual:templengine\n    npm run test:manual:templengine:async\n'",
+    "help": "echo 'command list:\n    npm run start\n    npm run start:prod\n    npm run start:production\n    npm run start:prod:dbg\n    npm run start:prod:debug\n    npm run start:prod:debug:break\n    npm run start:prod:debug:nobreak\n    npm run start:dev\n    npm run start:develop\n    npm run start:dev:dbg\n    npm run start:dev:debug\n    npm run start:dev:debug:break\n    npm run start:dev:debug:nobreak\n    npm run start:watcher:prod\n    npm run start:watcher:production\n    npm run start:watcher:dev\n    npm run start:watcher:develop\n    npm run start:watcher:dbg\n    npm run start:watcher:debug\n    npm run start:watcher:debug:break\n    npm run start:watcher:debug:nobreak\n    npm run start:watcher:oneshot:prod\n    npm run start:watcher:oneshot:production\n    npm run start:watcher:oneshot:dev\n    npm run start:watcher:oneshot:develop\n    npm run start:watcher:oneshot:dbg\n    npm run start:watcher:oneshot:debug\n    npm run start:watcher:oneshot:debug:break\n    npm run start:watcher:oneshot:debug:nobreak\n    npm run stop\n    npm run stop:watcher\n    npm run test\n    npm run test:lint\n    npm run test:cover\n    npm run test:auto:all{:dbg}\n    npm run test:auto:version{:dbg}\n    npm run test:auto:usertokens{:dbg}\n    npm run test:auto:list{:dbg}\n    npm run test:auto:resource{:dbg}\n    npm run test:auto:policy{:dbg}\n    npm run test:auto:role{:dbg}\n    npm run test:auto:tenant{:dbg}\n    npm run test:auto:service{:dbg}\n    npm run test:auto:acr{:dbg}\n    npm run test:auto:userdata{:dbg}\n    npm run test:auto:extdata{:dbg}\n    npm run test:auto:watcher{:dbg}\n    npm run test:auto:templengine\n    npm run test:auto:templengine:async\n    npm run test:manual:apis:version_get\n    npm run test:manual:apis:usertoken_postput\n    npm run test:manual:apis:usertoken_gethead\n    npm run test:manual:apis:policy_postput\n    npm run test:manual:apis:policy_gethead\n    npm run test:manual:apis:policy_delete\n    npm run test:manual:apis:resource_postput\n    npm run test:manual:apis:resource_gethead\n    npm run test:manual:apis:resource_delete\n    npm run test:manual:apis:role_postput\n    npm run test:manual:apis:role_gethead\n    npm run test:manual:apis:role_delete\n    npm run test:manual:apis:tenant_postput\n    npm run test:manual:apis:tenant_gethead\n    npm run test:manual:apis:tenant_delete\n    npm run test:manual:apis:service_postput\n    npm run test:manual:apis:service_gethead\n    npm run test:manual:apis:service_delete\n    npm run test:manual:apis:acr_postput\n    npm run test:manual:apis:acr_get\n    npm run test:manual:apis:acr_delete\n    npm run test:manual:apis:list_gethead\n    npm run test:manual:apis:userdata_get\n    npm run test:manual:apis:extdata_get\n    npm run test:manual:apis:allusertenant_get\n    npm run test:manual:apis:k2hr3keys_get\n    npm run test:manual:load:k2hdkcdata:auto\n    npm run test:manual:load:k2hdkcdata:local\n    npm run test:manual:templengine\n    npm run test:manual:templengine:async\n'",
     "start": "npm run start:production",
     "start:prod": "npm run start:production",
     "start:production": "bin/run.sh -bg --production && echo '' && echo 'Start on production - Success' && echo ''",
@@ -70,7 +70,7 @@
     "test": "npm run test:cover",
     "test:lint": "eslint lib/*.js app.js bin/www bin/watcher routes/*.js tests/*.js",
     "test:cover": "echo 'Test with coverage' && nyc --reporter=lcov --reporter=text npm run test:auto:all",
-    "test:auto": "echo 'Auto test : npm run test:auto:*\n      test:auto:all{:dbg}\n      test:auto:version{:dbg}\n      test:auto:usertokens{:dbg}\n      test:auto:list{:dbg}\n      test:auto:resource{:dbg}\n      test:auto:policy{:dbg}\n      test:auto:role{:dbg}\n      test:auto:tenant{:dbg}\n      test:auto:service{:dbg}\n      test:auto:acr{:dbg}\n      test:auto:userdata{:dbg}\n      test:auto:extdata{:dbg}\n      test:auto:watcher{:dbg}\n      test:auto:templengine\n      test:auto:templengine:async\n'",
+    "test:auto": "echo 'Auto test : npm run test:auto:*\n      test:auto:all{:dbg}\n      test:auto:version{:dbg}\n      test:auto:usertokens{:dbg}\n      test:auto:list{:dbg}\n      test:auto:resource{:dbg}\n      test:auto:policy{:dbg}\n      test:auto:role{:dbg}\n      test:auto:tenant{:dbg}\n      test:auto:tenant{:dbg}\n      test:auto:service{:dbg}\n      test:auto:acr{:dbg}\n      test:auto:userdata{:dbg}\n      test:auto:extdata{:dbg}\n      test:auto:watcher{:dbg}\n      test:auto:templengine\n      test:auto:templengine:async\n'",
     "test:auto:all": "echo 'All test' && npm run test:lint && tests/test.sh -t 8000 all && npm run test:auto:templengine && npm run test:auto:templengine:async && echo 'Succeed test' && echo ''",
     "test:auto:all:dbg": "echo 'All test with debugging' && npm run test:lint && tests/test.sh -t 8000 -d dbg all && echo 'Succeed test' && echo ''",
     "test:auto:version": "echo 'Test Version' && tests/test.sh -t 8000 version && echo 'Succeed test' && echo ''",

package/routes/tenant.js

@@ -393,7 +393,23 @@ router.post('/', function(req, res, next)					// eslint-disable-line no-unused-v
 		// add own user
 		apiutil.tryAddStringToArray(tenant_users, comparam.user_name);
 	}else{
-		if(!apiutil.findStringInArray(tenant_users, comparam.user_name)){
+		if(apiutil.isEmptyArray(tenant_users)){
+			result.result	= false;
+			result.message	= 'POST request tenant(' + tenant_name + ') does not have any user list.';
+			r3logger.elog(result.message);
+			resutil.errResponse(req, res, 400, result);		// 400: Bad Request
+			return;
+		}
+
+		var	findobj = k2hr3.findTenant(tenant_name, comparam.user_name, tenant_id);
+		if(	!apiutil.isSafeEntity(findobj)											||
+			!apiutil.isSafeEntity(findobj.result)									||
+			false === findobj.result												||
+			!apiutil.isSafeEntity(findobj.tenant)									||
+			!apiutil.isSafeEntity(findobj.tenant.name)								||
+			!apiutil.getSafeArray(findobj.tenant.users)								||
+			!apiutil.findStringInArray(findobj.tenant.users, comparam.user_name)	)
+		{
 			result.result	= false;
 			result.message	= 'POST request tenant(' + tenant_name + ') does not allow user(' + comparam.user_name + ').';
 			r3logger.elog(result.message);
@@ -604,21 +620,37 @@ router.put('/', function(req, res, next)					// eslint-disable-line no-unused-va
 		tenant_users = apiutil.parseJSON(req.query.users);
 		if(!apiutil.isArray(tenant_users) && apiutil.isSafeString(tenant_users)){
 			tenant_users = [tenant_users];
-		}else if(!apiutil.isArray(tenant_users)){
-			tenant_users = [];
+		}else{
+			tenant_users = apiutil.getSafeArray(tenant_users);
 		}
-	}else if(apiutil.isArray(req.query.users)){
-		tenant_users = req.query.users;
-	}else if(apiutil.isSafeString(req.query.users)){
+	}else if(!apiutil.isArray(req.query.users) && apiutil.isSafeString(req.query.users)){
 		tenant_users = [req.query.users];
 	}else{
-		tenant_users = [];
+		tenant_users = apiutil.getSafeArray(req.query.users);
 	}
+
 	if(is_create){
 		// add own user
 		apiutil.tryAddStringToArray(tenant_users, comparam.user_name);
 	}else{
-		if(!apiutil.findStringInArray(tenant_users, comparam.user_name)){
+		// check user in current tenant users
+		if(apiutil.isEmptyArray(tenant_users)){
+			result.result	= false;
+			result.message	= 'PUT request tenant(' + tenant_name + ') does not have any user list.';
+			r3logger.elog(result.message);
+			resutil.errResponse(req, res, 400, result);		// 400: Bad Request
+			return;
+		}
+
+		var	findobj = k2hr3.findTenant(tenant_name, comparam.user_name, tenant_id);
+		if(	!apiutil.isSafeEntity(findobj)											||
+			!apiutil.isSafeEntity(findobj.result)									||
+			false === findobj.result												||
+			!apiutil.isSafeEntity(findobj.tenant)									||
+			!apiutil.isSafeEntity(findobj.tenant.name)								||
+			!apiutil.getSafeArray(findobj.tenant.users)								||
+			!apiutil.findStringInArray(findobj.tenant.users, comparam.user_name)	)
+		{
 			result.result	= false;
 			result.message	= 'PUT request tenant(' + tenant_name + ') does not allow user(' + comparam.user_name + ').';
 			r3logger.elog(result.message);
@@ -917,11 +949,26 @@ router.head('/', function(req, res, next)
 // Router DELETE
 //=========================================================
 //
-// Mountpath					: '/v1/tenant/<tenant>'
+// Mountpath				: '/v1/tenant'
 //
-// DELETE '/v1/tenant/<tenant>'	: delete tenant on version 1
+//---------------------------------------------------------
+// [DELETE] No tenant path
+//---------------------------------------------------------
+// DELETE '/v1/tenant'			: delete tenant version 1
 // HEADER						: X-Auth-Token	= <User token>
-// url argument					: "id":	 <id>			=>	key is "yrn:yahoo:::<tenant>:id"
+// url argument					: "tenant"		= <tenant name>
+// url argument					: "id"			= <id>			=>	key is "yrn:yahoo:::<tenant>:id"
+// response status code			: 204 or 4xx/5xx
+// response body				: nothing
+//
+// This mount point deletes the specified <K2HR3 cluster LOCAL> tenant.
+//
+//---------------------------------------------------------
+// [DELETE] With tenant path
+//---------------------------------------------------------
+// DELETE '/v1/tenant/tenant'	: delete tenant version 1
+// HEADER						: X-Auth-Token	= <User token>
+// url argument					: "id"			=  <id>			=>	key is "yrn:yahoo:::<tenant>:id"
 // response status code			: 204 or 4xx/5xx
 // response body				: nothing
 //
@@ -930,7 +977,7 @@ router.head('/', function(req, res, next)
 // [NOTE]
 // Only users registered in the tenant to be deleted can delete this tenant.
 //
-router.delete('/', function(req, res, next)								// eslint-disable-line no-unused-vars
+router.delete('/', function(req, res, next)					// eslint-disable-line no-unused-vars
 {
 	r3logger.dlog('CALL:', req.method, req.url);
 
@@ -940,7 +987,7 @@ router.delete('/', function(req, res, next)								// eslint-disable-line no-unu
 		!apiutil.isSafeEntity(req.baseUrl)	)
 	{
 		r3logger.elog('DELETE request or url or query is wrong');
-		resutil.errResponse(req, res, 400);								// 400: Bad Request
+		resutil.errResponse(req, res, 400);					// 400: Bad Request
 		return;
 	}
 
@@ -965,39 +1012,73 @@ router.delete('/', function(req, res, next)								// eslint-disable-line no-unu
 	}
 
 	//------------------------------
-	// Check uri paths(tenant name)
+	// Check uri paths
 	//------------------------------
+	var	tenant_name;
+	var	tenant_id;
 	if(!apiutil.isSafeString(comparam.tenant_name)){
-		r3logger.elog('DELETE request tenant must specify <tenant> path');
-		resutil.errResponse(req, res, 400);				// 400: Bad Request
-		return;
-	}
+		//------------------------------
+		// Check argments(tenant)
+		//------------------------------
+		tenant_name = apiutil.getSafeString(req.query.tenant);
+		if(!apiutil.isSafeString(tenant_name)){
+			r3logger.elog('DELETE request tenant must specify in argument');
+			resutil.errResponse(req, res, 400);			// 400: Bad Request
+			return;
+		}
 
-	//------------------------------
-	// Check argments(id)
-	//------------------------------
-	var	tenant_id = apiutil.getSafeString(req.query.id);
-	if(!apiutil.isSafeString(tenant_id)){
-		r3logger.elog('DELETE request id must specify in argument');
-		resutil.errResponse(req, res, 400);				// 400: Bad Request
-		return;
-	}
+		//------------------------------
+		// Check argments(id)
+		//------------------------------
+		tenant_id = apiutil.getSafeString(req.query.id);
+		if(!apiutil.isSafeString(tenant_id)){
+			r3logger.elog('DELETE request id must specify in argument');
+			resutil.errResponse(req, res, 400);			// 400: Bad Request
+			return;
+		}
 
-	//------------------------------
-	// Processing
-	//------------------------------
-	resobj = k2hr3.removeUserFromLocalTenant(comparam.tenant_name, comparam.user_name, tenant_id);
-	if(!apiutil.isSafeEntity(resobj) || !apiutil.isSafeEntity(resobj.result) || false === resobj.result){
-		if(apiutil.isSafeEntity(resobj) && apiutil.isSafeString(resobj.message)){
-			r3logger.elog('DELETE request failed to remove user from tenant by ' + resobj.message);
-		}else{
-			r3logger.elog('DELETE request failed to remove user from tenant by unknown reason');
+		//------------------------------
+		// Processing
+		//------------------------------
+		resobj = k2hr3.removeLocalTenant(tenant_name, comparam.user_name, tenant_id);
+		if(!apiutil.isSafeEntity(resobj) || !apiutil.isSafeEntity(resobj.result) || false === resobj.result){
+			if(apiutil.isSafeEntity(resobj) && apiutil.isSafeString(resobj.message)){
+				r3logger.elog('DELETE request failed to remove user from tenant by ' + resobj.message);
+			}else{
+				r3logger.elog('DELETE request failed to remove user from tenant by unknown reason');
+			}
+			resutil.errResponse(req, res, 400);			// 400: Bad Request
+			return;
 		}
-		resutil.errResponse(req, res, 400);				// 400: Bad Request
-		return;
+		r3logger.dlog('DELETE request succeed - remove tenant');
+
+	}else{
+		//------------------------------
+		// Check argments(id)
+		//------------------------------
+		tenant_id = apiutil.getSafeString(req.query.id);
+		if(!apiutil.isSafeString(tenant_id)){
+			r3logger.elog('DELETE request id must specify in argument');
+			resutil.errResponse(req, res, 400);			// 400: Bad Request
+			return;
+		}
+
+		//------------------------------
+		// Processing
+		//------------------------------
+		resobj = k2hr3.removeUserFromLocalTenant(comparam.tenant_name, comparam.user_name, tenant_id);
+		if(!apiutil.isSafeEntity(resobj) || !apiutil.isSafeEntity(resobj.result) || false === resobj.result){
+			if(apiutil.isSafeEntity(resobj) && apiutil.isSafeString(resobj.message)){
+				r3logger.elog('DELETE request failed to remove user from tenant by ' + resobj.message);
+			}else{
+				r3logger.elog('DELETE request failed to remove user from tenant by unknown reason');
+			}
+			resutil.errResponse(req, res, 400);			// 400: Bad Request
+			return;
+		}
+		r3logger.dlog('DELETE request succeed - remove user from tenant');
 	}
 
-	r3logger.dlog('DELETE request succeed - remove user from tenant');
 	res.status(204);									// 204: No Content
 	res.send();
 });

package/routes/userTokens.js

@@ -50,13 +50,10 @@ function rawCommonGetUserToken(req, res, unscopedToken, otherToken, username, pa
 		// Get token from User Credentials
 		//
 		if(!apiutil.isSafeString(username)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			error = {
-						result: 	false,
-						message:	'Some parameter(user name or unscoped token) is wrong.'
-					};
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+				result: 	false,
+				message:	'Some parameter(user name or unscoped token) is wrong.'
+			};
 			r3logger.elog(error.message);
 			resutil.errResponse(req, res, 400, error);				// 400: Bad Request
 			return;
@@ -65,27 +62,21 @@ function rawCommonGetUserToken(req, res, unscopedToken, otherToken, username, pa
 		r3token.getUserToken(_username, _passwd, _tenant, function(err, token)
 		{
 			if(null !== err){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				var	error = {
-								result: 	false,
-								message:	'could not get scoped user token for user=' + _username + ', tenant=' + _tenant + ' by ' + err.message
-							};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	'could not get scoped user token for user=' + _username + ', tenant=' + _tenant + ' by ' + err.message
+				};
 				r3logger.elog(error.message);
 				resutil.errResponse(_req, _res, 404, error);		// 404: Not Found
 				return;
 			}
 			r3logger.dlog('get user token jsonres = ' + JSON.stringify(token));
 
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			var	result = {	result:		true,
-							message:	'succeed',
-							scoped:		apiutil.isSafeString(_tenant),
-							token:		token
-						 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+				message:	'succeed',
+				scoped:		apiutil.isSafeString(_tenant),
+				token:		token
+			};
 			_res.status(201);										// 201: Created
 			_res.send(JSON.stringify(result));
 		});
@@ -95,13 +86,10 @@ function rawCommonGetUserToken(req, res, unscopedToken, otherToken, username, pa
 		// Get Scoped token from Unscoped token
 		//
 		if(!apiutil.isSafeString(username)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			error = {
-						result: 	false,
-						message:	'Some parameter(user name or unscoped token) is wrong.'
-					};
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+				result: 	false,
+				message:	'Some parameter(user name or unscoped token) is wrong.'
+			};
 			r3logger.elog(error.message);
 			resutil.errResponse(req, res, 400, error);				// 400: Bad Request
 			return;
@@ -110,27 +98,22 @@ function rawCommonGetUserToken(req, res, unscopedToken, otherToken, username, pa
 		r3token.getScopedUserToken(_unscopedToken, _username, _tenant, function(err, token)
 		{
 			if(null !== err){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				var	error = {
-								result: 	false,
-								message:	'could not get scoped user token for user=' + _username + ', tenant=' + _tenant + ' by ' + err.message
-							};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	'could not get scoped user token for user=' + _username + ', tenant=' + _tenant + ' by ' + err.message
+				};
 				r3logger.elog(error.message);
 				resutil.errResponse(_req, _res, 404, error);		// 404: Not Found
 				return;
 			}
 			r3logger.dlog('get user token jsonres = ' + JSON.stringify(token));
 
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			var	result = {
-							result:		true,
-							message:	'succeed',
-							scoped:		apiutil.isSafeString(_tenant),
-							token:		token
-						 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result:		true,
+				message:	'succeed',
+				scoped:		apiutil.isSafeString(_tenant),
+				token:		token
+			};
 
 			_res.status(201);										// 201: Created
 			_res.send(JSON.stringify(result));
@@ -143,28 +126,22 @@ function rawCommonGetUserToken(req, res, unscopedToken, otherToken, username, pa
 		r3token.getUserTokenByToken(_otherToken, _tenant, function(err, token)
 		{
 			if(null !== err){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				var	error = {
-								result: 	false,
-								message:	'could not get scoped user token for other token, tenant=' + _tenant + ' by ' + err.message
-							};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	'could not get scoped user token for other token, tenant=' + _tenant + ' by ' + err.message
+				};
 				r3logger.elog(error.message);
 				resutil.errResponse(_req, _res, 404, error);		// 404: Not Found
 				return;
 			}
 			r3logger.dlog('get user token jsonres = ' + JSON.stringify(token));
 
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			var	result = {
-							result:		true,
-							message:	'succeed',
-							scoped:		apiutil.isSafeString(_tenant),
-							token:		token
-						 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+				result:		true,
+				message:	'succeed',
+				scoped:		apiutil.isSafeString(_tenant),
+				token:		token
+			};
 			_res.status(201);										// 201: Created
 			_res.send(JSON.stringify(result));
 		});
@@ -188,13 +165,11 @@ function rawGetUnscopedUserToken(req)
 		!apiutil.isSafeString(resobj.token_info.user)			||
 		false !== resobj.token_info.scoped						)
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		return {
 			result: 	false,
 			status:		400,						// 400: Bad Request
 			message:	'could not get unscoped user token in request.'
 		};
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
 	}
 
 	return {
@@ -223,13 +198,10 @@ router.post('/', function(req, res, next)						// eslint-disable-line no-unused-
 	if(	!apiutil.isSafeEntity(req) ||
 		!apiutil.isSafeEntity(req.body) )
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		error = {
-					result: 	false,
-					message:	'POST body does not have auth key'
-				};
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+			result: 	false,
+			message:	'POST body does not have auth key'
+		};
 		r3logger.elog(error.message);
 		resutil.errResponse(req, res, 400, error);				// 400: Bad Request
 		return;
@@ -260,13 +232,10 @@ router.post('/', function(req, res, next)						// eslint-disable-line no-unused-
 			// (1) case of unscoped token registered in k2hr3
 			//
 			if(!apiutil.isSafeEntity(req.body.auth) || !apiutil.isSafeString(req.body.auth.tenantName)){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				error = {
-							result: 	false,
-							message:	'POST body does not have tenant name(or user credentials)'
-						};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	'POST body does not have tenant name(or user credentials)'
+				};
 				r3logger.elog(error.message);
 				resutil.errResponse(req, res, 400, error);				// 400: Bad Request
 				return;
@@ -280,13 +249,10 @@ router.post('/', function(req, res, next)						// eslint-disable-line no-unused-
 			//
 			otherToken = r3token.getAuthTokenHeader(req, false);
 			if(!apiutil.isSafeString(otherToken)){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				error = {
-							result: 	false,
-							message:	resobj.message
-						};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	resobj.message
+				};
 				r3logger.elog(resobj.message);
 				resutil.errResponse(req, res, resobj.status, error);	// 40X
 				return;
@@ -320,13 +286,10 @@ router.put('/', function(req, res, next)						// eslint-disable-line no-unused-v
 	if(	!apiutil.isSafeEntity(req) ||
 		!apiutil.isSafeEntity(req.query) )
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		error = {
-					result: 	false,
-					message:	'PUT argument does not have any data'
-			 	};
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+			result: 	false,
+			message:	'PUT argument does not have any data'
+		};
 		r3logger.elog(error.message);
 		resutil.errResponse(req, res, 400, error);				// 400: Bad Request
 		return;
@@ -357,13 +320,10 @@ router.put('/', function(req, res, next)						// eslint-disable-line no-unused-v
 			// (1) case of unscoped token registered in k2hr3
 			//
 			if(!apiutil.isSafeString(req.query.tenantname)){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				error = {
-							result: 	false,
-							message:	'POST body does not have tenant name(or user credentials)'
-						};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	'POST body does not have tenant name(or user credentials)'
+				};
 				r3logger.elog(error.message);
 				resutil.errResponse(req, res, 400, error);			// 400: Bad Request
 				return;
@@ -378,13 +338,10 @@ router.put('/', function(req, res, next)						// eslint-disable-line no-unused-v
 			//
 			otherToken = r3token.getAuthTokenHeader(req, false);
 			if(!apiutil.isSafeString(otherToken)){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				error = {
-							result: 	false,
-							message:	resobj.message
-						};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	resobj.message
+				};
 				r3logger.elog(resobj.message);
 				resutil.errResponse(req, res, resobj.status, error);	// 40X
 				return;
@@ -411,8 +368,10 @@ router.put('/', function(req, res, next)						// eslint-disable-line no-unused-v
 //							  user		=> user name
 //							  tenants	=>	[
 //												{
-//													name:		"tenant name"
-//													display:	"display name"
+//													name:			"tenant name"
+//													display:		"display name"
+//													id:				"tenant id"
+//													description:	"tenant description"
 //												},
 //												...
 //											]
@@ -453,21 +412,20 @@ router.get('/', function(req, res, next)						// eslint-disable-line no-unused-v
 	// build response body
 	if(token_info.scoped){
 		// scoped token
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result:				true,
-					message:			'succeed',
-					scoped:				true,
-					user:				token_info.user,
-					tenants: [
-						{
-							name:		token_info.tenant,
-							display:	token_info.tenant			// [NOTE] this is not real display name.
-						}
-					]
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+			result:				true,
+			message:			'succeed',
+			scoped:				true,
+			user:				token_info.user,
+			tenants: [
+				{
+					name:			token_info.tenant,
+					display:		token_info.display,
+					id:				token_info.id,
+					description:	token_info.description
+				}
+			]
+		};
 		_res.status(200);										// 200: OK
 		_res.send(JSON.stringify(result));
 
@@ -476,13 +434,10 @@ router.get('/', function(req, res, next)						// eslint-disable-line no-unused-v
 		r3token.initializeTenantList(token_result.token, token_info.user, function(error, tenant_list)
 		{
 			if(null !== error){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				var	result = {
-								result: 	false,
-								message:	'failed to get tenant list for user (' + token_info.user + ') by unscoped token(' + token_result.token + ')'
-						  	};
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	'failed to get tenant list for user (' + token_info.user + ') by unscoped token(' + token_result.token + ')'
+				};
 				r3logger.elog(result.message);
 				resutil.errResponse(_req, _res, 404, result);	// 404: Not Found
 				return;
@@ -491,26 +446,22 @@ router.get('/', function(req, res, next)						// eslint-disable-line no-unused-v
 			// reget tenant list
 			tenant_list = r3token.getTenantList(token_info.user);
 			if(null === tenant_list || apiutil.isEmptyArray(tenant_list)){
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				result = {
-							result: 	false,
-							message:	'token(' + token_result.token + ') for user (' + token_info.user + ') does not have any tenant.'
-						  };
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+					result: 	false,
+					message:	'token(' + token_result.token + ') for user (' + token_info.user + ') does not have any tenant.'
+				};
 				r3logger.elog(result.message);
 				resutil.errResponse(_req, _res, 404, result);	// 404: Not Found
 				return;
 			}
 
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
-			result = {	result:		true,
-						message:	'succeed',
-						scoped:		false,
-						user:		token_info.user,
-						tenants:	tenant_list	};
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
-
+			result = {
+				result:		true,
+				message:	'succeed',
+				scoped:		false,
+				user:		token_info.user,
+				tenants:	tenant_list
+			};
 			_res.status(200);									// 200: OK
 			_res.send(JSON.stringify(result));
 		});