Migrate enrollment API to provider enrollment. (#198)

pull/3759/head
EdwinBetanc0urt 2019-12-10 09:40:35 -04:00 committed by Yamel Senih
parent 992908ad72
commit 206539251b
2 changed files with 46 additions and 22 deletions

View File

@ -16,8 +16,12 @@ function Instance() {
* @param {string} userData.userName * @param {string} userData.userName
* @param {string} userData.password * @param {string} userData.password
*/ */
export function enrollmentUser(userData) { export function enrollmentUser({ name, userName, password }) {
return Instance.call(this).enrollUser(userData) return Instance.call(this).enrollUser({
name: name,
userName: userName,
password: password
})
} }
/** /**
@ -33,6 +37,6 @@ export function forgotPassword(eMailOrUserName) {
* @param {string} token * @param {string} token
* @param {string} password * @param {string} password
*/ */
export function resetPasswordFromToken(token, password) { export function resetPasswordFromToken({ token, password }) {
return Instance.call(this).resetPasswordFromToken(token, password) return Instance.call(this).resetPasswordFromToken({ token, password })
} }

View File

@ -1,5 +1,5 @@
import { enrollmentUser, forgotPassword, resetPasswordFromToken } from '@/api/ADempiere/enrollment' import { enrollmentUser, forgotPassword, resetPasswordFromToken } from '@/api/ADempiere/enrollment'
import { showMessage } from '@/utils/ADempiere' import { showMessage } from '@/utils/ADempiere/notification'
import language from '@/lang' import language from '@/lang'
import router from '@/router' import router from '@/router'
@ -12,8 +12,12 @@ const enrollment = {
* @param {string} userData.password * @param {string} userData.password
*/ */
enrollmentUser({ commit }, userData) { enrollmentUser({ commit }, userData) {
return enrollmentUser(userData) return enrollmentUser({
.then(response => { name: userData.name,
userName: userData.userName,
password: userData.password
})
.then(() => {
showMessage({ showMessage({
message: language.t('login.userEnrollmentSuccessful'), message: language.t('login.userEnrollmentSuccessful'),
type: 'success' type: 'success'
@ -27,7 +31,7 @@ const enrollment = {
message: language.t('login.unexpectedError'), message: language.t('login.unexpectedError'),
type: 'error' type: 'error'
}) })
console.warn('Enrollment User - Error ' + error.code + ': ' + error.message) console.warn(`Enrollment User - Error ${error.code}: ${error.message}`)
}) })
}, },
/** /**
@ -35,8 +39,8 @@ const enrollment = {
*/ */
forgotPassword({ commit }, eMailOrUserName) { forgotPassword({ commit }, eMailOrUserName) {
return forgotPassword(eMailOrUserName) return forgotPassword(eMailOrUserName)
.then(response => { .then(forgotPasswordResponse => {
if (response.getResponsetype() === 0) { if (forgotPasswordResponse.responseTypeStatus === 'OK') {
showMessage({ showMessage({
message: language.t('login.passwordResetSendLink') + eMailOrUserName, message: language.t('login.passwordResetSendLink') + eMailOrUserName,
type: 'success' type: 'success'
@ -50,14 +54,14 @@ const enrollment = {
type: 'error' type: 'error'
}) })
} }
return response return forgotPasswordResponse
}) })
.catch(error => { .catch(error => {
showMessage({ showMessage({
message: language.t('login.unexpectedError'), message: language.t('login.unexpectedError'),
type: 'error' type: 'error'
}) })
console.warn('Forgot Password - Error ' + error.code + ': ' + error.message) console.warn(`Forgot Password - Error ${error.code}: ${error.message}`)
}) })
}, },
/** /**
@ -66,10 +70,16 @@ const enrollment = {
* @param {string} parameters.token * @param {string} parameters.token
* @param {string} parameters.password * @param {string} parameters.password
*/ */
createPasswordFromToken({ commit }, parameters) { createPasswordFromToken({ commit }, {
return resetPasswordFromToken(parameters.token, parameters.password) token,
.then(response => { password
if (response.getResponsetype() === 0) { }) {
return resetPasswordFromToken({
token: token,
password: password
})
.then(createPasswordResponse => {
if (createPasswordResponse.responseTypeStatus === 'OK') {
showMessage({ showMessage({
message: language.t('login.createPasswordSuccessful'), message: language.t('login.createPasswordSuccessful'),
type: 'success' type: 'success'
@ -83,23 +93,31 @@ const enrollment = {
router.push({ router.push({
path: 'login' path: 'login'
}) })
return createPasswordResponse
}) })
.catch(error => { .catch(error => {
showMessage({ showMessage({
message: language.t('login.unexpectedError'), message: language.t('login.unexpectedError'),
type: 'error' type: 'error'
}) })
console.warn('Create Password - Error ' + error.code + ': ' + error.message) console.warn(`Create Password - Error ${error.code}: ${error.message}`)
}) })
}, },
/** /**
* @param {string} parameters.token * @param {string} parameters.token
* @param {string} parameters.password * @param {string} parameters.password
*/ */
resetPasswordFromToken({ commit }, parameters) { resetPasswordFromToken({ commit }, {
return resetPasswordFromToken(parameters.token, parameters.password) token,
.then(response => { password
if (response.getResponsetype() === 0) { }) {
return resetPasswordFromToken({
token: token,
password: password
})
.then(resetPasswordResponse => {
if (resetPasswordResponse.responseTypeStatus === 'OK') {
showMessage({ showMessage({
message: language.t('login.passwordResetSuccessful'), message: language.t('login.passwordResetSuccessful'),
type: 'success' type: 'success'
@ -113,13 +131,15 @@ const enrollment = {
router.push({ router.push({
path: 'login' path: 'login'
}) })
return resetPasswordResponse
}) })
.catch(error => { .catch(error => {
showMessage({ showMessage({
message: language.t('login.unexpectedError'), message: language.t('login.unexpectedError'),
type: 'error' type: 'error'
}) })
console.warn('Reset Password - Error ' + error.code + ': ' + error.message) console.warn(`Reset Password - Error ${error.code}: ${error.message}`)
}) })
} }
} }