diff --git a/console/routes/authentication_routes.js b/console/routes/authentication_routes.js index 8178b3b..d1965d9 100644 --- a/console/routes/authentication_routes.js +++ b/console/routes/authentication_routes.js @@ -7,5 +7,4 @@ let app = require('../irext_console.js'); let authenticationService = require('../services/authentication_service.js'); app.post('/irext/certificate/admin_login', authenticationService.adminLogin); -app.post('/irext/certificate/token_verify', authenticationService.verifyToken); -app.post('/irext/certificate/change_pw', authenticationService.changePassword); \ No newline at end of file +app.post('/irext/certificate/token_verify', authenticationService.verifyToken); \ No newline at end of file diff --git a/console/services/authentication_service.js b/console/services/authentication_service.js index 164dc3a..496e648 100644 --- a/console/services/authentication_service.js +++ b/console/services/authentication_service.js @@ -54,23 +54,4 @@ exports.verifyToken = function (req, res) { res.send(serviceResponse); res.end(); }); -}; - -/* - * function : Change password - * parameter : id parameter of token KV - * token parameter of token KV - * return : ServiceResponse - */ -exports.changePassword = function (req, res) { - let bodyParam = req.body; - let userName = bodyParam.user_name; - let callbackURL = bodyParam.callback_url; - - let serviceResponse = new ServiceResponse(); - authenticationLogic.sendChangePwMailWorkUnit(userName, callbackURL, function (changePWErr) { - serviceResponse.status = changePWErr; - res.send(serviceResponse); - res.end(); - }); }; \ No newline at end of file diff --git a/console/web/error/auth_error.html b/console/web/error/auth_error.html index 5af0741..fab7dd2 100644 --- a/console/web/error/auth_error.html +++ b/console/web/error/auth_error.html @@ -27,7 +27,7 @@
-

irext.net

+

irext.net

diff --git a/console/web/error/confirm_pw.html b/console/web/error/confirm_pw.html index 753f759..f3e4805 100644 --- a/console/web/error/confirm_pw.html +++ b/console/web/error/confirm_pw.html @@ -31,7 +31,7 @@
-

irext.net

+

irext.net

diff --git a/console/web/index.html b/console/web/index.html index fbe0eba..5320253 100644 --- a/console/web/index.html +++ b/console/web/index.html @@ -15,7 +15,7 @@
@@ -27,12 +27,9 @@
-
+
-
- -
diff --git a/console/web/locales/dev/translation.json b/console/web/locales/dev/translation.json index 982c304..d8aeb24 100644 --- a/console/web/locales/dev/translation.json +++ b/console/web/locales/dev/translation.json @@ -3,7 +3,7 @@ "name": "IRext" }, "page_index": { - "title": "IRext 本地控制台 - 0.2.5", + "title": "IRext 本地控制台 - 0.2.6", "d_signin_title": "登入", "d_signin_email": "邮箱地址", "d_signin_password": "密码", diff --git a/console/web/locales/en-US/translation.json b/console/web/locales/en-US/translation.json index 8715209..01c7f10 100644 --- a/console/web/locales/en-US/translation.json +++ b/console/web/locales/en-US/translation.json @@ -3,7 +3,7 @@ "name": "IRext" }, "page_index": { - "title": "IRext Local Console - 0.2.5", + "title": "IRext Local Console - 0.2.6", "d_signin_title": "Sign in", "d_signin_email": "Email", "d_signin_password": "Password", diff --git a/console/web/locales/en/translation.json b/console/web/locales/en/translation.json index 8715209..01c7f10 100644 --- a/console/web/locales/en/translation.json +++ b/console/web/locales/en/translation.json @@ -3,7 +3,7 @@ "name": "IRext" }, "page_index": { - "title": "IRext Local Console - 0.2.5", + "title": "IRext Local Console - 0.2.6", "d_signin_title": "Sign in", "d_signin_email": "Email", "d_signin_password": "Password", diff --git a/console/web/locales/zh-CN/translation.json b/console/web/locales/zh-CN/translation.json index 982c304..d8aeb24 100644 --- a/console/web/locales/zh-CN/translation.json +++ b/console/web/locales/zh-CN/translation.json @@ -3,7 +3,7 @@ "name": "IRext" }, "page_index": { - "title": "IRext 本地控制台 - 0.2.5", + "title": "IRext 本地控制台 - 0.2.6", "d_signin_title": "登入", "d_signin_email": "邮箱地址", "d_signin_password": "密码", diff --git a/console/web/locales/zh/translation.json b/console/web/locales/zh/translation.json index 982c304..d8aeb24 100644 --- a/console/web/locales/zh/translation.json +++ b/console/web/locales/zh/translation.json @@ -3,7 +3,7 @@ "name": "IRext" }, "page_index": { - "title": "IRext 本地控制台 - 0.2.5", + "title": "IRext 本地控制台 - 0.2.6", "d_signin_title": "登入", "d_signin_email": "邮箱地址", "d_signin_password": "密码", diff --git a/console/work_unit/authentication_logic.js b/console/work_unit/authentication_logic.js index 08f2235..b997431 100644 --- a/console/work_unit/authentication_logic.js +++ b/console/work_unit/authentication_logic.js @@ -15,8 +15,7 @@ let errorCode = new ErrorCode(); let adminAuth = new AdminAuth(REDIS_HOST, REDIS_PORT, null, REDIS_PASSWORD); -let SIGN_IN_SERVICE = "/irext/certificate/admin_login"; -let CHANGE_PASSWORD_SERVICE = "/irext/certificate/change_pw"; +let SIGN_IN_SERVICE = "/irext-server/app/admin_login"; exports.adminLoginWorkUnit = function (userName, password, callback) { let queryParams = new Map(); @@ -28,7 +27,7 @@ exports.adminLoginWorkUnit = function (userName, password, callback) { queryParams); let signinInfo = { - user_name : userName, + userName : userName, password : password }; requestSender.sendPostRequest(signinInfo, @@ -95,32 +94,4 @@ exports.verifyTokenWithPermissionWorkUnit = function (id, token, permissions, ca callback(validateAdminAuthErr); } }); -}; - -exports.sendChangePwMailWorkUnit = function (userName, callbackURL, callback) { - let queryParams = new Map(); - - let requestSender = - new RequestSender(EXTERNAL_SERVER_ADDRESS, - EXTERNAL_SERVER_PORT, - CHANGE_PASSWORD_SERVICE, - queryParams); - - let userInfo = { - user_name : userName, - callback_url :callbackURL - }; - requestSender.sendPostRequest(userInfo, - function(changePwRequestErr, changePwResponse) { - if (changePwRequestErr === errorCode.SUCCESS.code && null != changePwResponse) { - let resp = JSON.parse(changePwResponse); - if (undefined !== resp.status && errorCode.SUCCESS === resp.status) { - callback(errorCode.SUCCESS); - } else { - callback(errorCode.FAILED); - } - } else { - callback(errorCode.FAILED); - } - }); }; \ No newline at end of file