forked from apache/dolphinscheduler
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Improvement-14387][UI] Support to reset user's password. (apache#14498)
- Loading branch information
1 parent
fbf41ef
commit 6162655
Showing
9 changed files
with
341 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
146 changes: 146 additions & 0 deletions
146
dolphinscheduler-ui/src/views/security/user-manage/components/password-modal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import { | ||
| defineComponent, | ||
| getCurrentInstance, | ||
| PropType, | ||
| toRefs, | ||
| watch | ||
| } from 'vue' | ||
| import { useI18n } from 'vue-i18n' | ||
| import { NInput, NForm, NFormItem } from 'naive-ui' | ||
| import { usePassword } from './use-password' | ||
| import Modal from '@/components/modal' | ||
| import type { IRecord } from '../types' | ||
|
|
||
| const props = { | ||
| show: { | ||
| type: Boolean as PropType<boolean>, | ||
| default: false | ||
| }, | ||
| currentRecord: { | ||
| type: Object as PropType<IRecord | null>, | ||
| default: {} | ||
| } | ||
| } | ||
|
|
||
| export const PasswordModal = defineComponent({ | ||
| name: 'password-modal', | ||
| props, | ||
| emits: ['cancel', 'update'], | ||
| setup(props, ctx) { | ||
| const { t } = useI18n() | ||
| const { state, IS_ADMIN, formRules, onReset, onSave, onSetValues } = | ||
| usePassword() | ||
|
|
||
| const onCancel = () => { | ||
| onReset() | ||
| ctx.emit('cancel') | ||
| } | ||
| const onConfirm = async () => { | ||
| if (props.currentRecord?.id) { | ||
| const result = await onSave(props.currentRecord) | ||
| if (!result) return | ||
| } | ||
| onCancel() | ||
| ctx.emit('update') | ||
| } | ||
|
|
||
| const trim = getCurrentInstance()?.appContext.config.globalProperties.trim | ||
|
|
||
| watch( | ||
| () => props.show, | ||
| () => { | ||
| if (props.show && props.currentRecord?.id) { | ||
| onSetValues(props.currentRecord) | ||
| } | ||
| } | ||
| ) | ||
|
|
||
| return { | ||
| t, | ||
| ...toRefs(state), | ||
| IS_ADMIN, | ||
| formRules, | ||
| onCancel, | ||
| onConfirm, | ||
| trim | ||
| } | ||
| }, | ||
| render() { | ||
| const { t } = this | ||
|
|
||
| return ( | ||
| <Modal | ||
| show={this.show} | ||
| title={t('security.user.reset_password')} | ||
| onCancel={this.onCancel} | ||
| confirmLoading={this.loading} | ||
| onConfirm={this.onConfirm} | ||
| confirmClassName='btn-submit' | ||
| cancelClassName='btn-cancel' | ||
| > | ||
| <NForm | ||
| ref='formRef' | ||
| model={this.formData} | ||
| rules={this.formRules} | ||
| labelPlacement='left' | ||
| labelAlign='left' | ||
| labelWidth={150} | ||
| > | ||
| <NFormItem label={t('security.user.username')} path='userName'> | ||
| <NInput | ||
| allowInput={this.trim} | ||
| class='input-username' | ||
| v-model:value={this.formData.userName} | ||
| minlength={3} | ||
| maxlength={39} | ||
| disabled={true} | ||
| placeholder={t('security.user.username_tips')} | ||
| /> | ||
| </NFormItem> | ||
| <NFormItem | ||
| label={t('security.user.user_password')} | ||
| path='userPassword' | ||
| > | ||
| <NInput | ||
| allowInput={this.trim} | ||
| class='input-password' | ||
| type='password' | ||
| v-model:value={this.formData.userPassword} | ||
| placeholder={t('security.user.user_password_tips')} | ||
| /> | ||
| </NFormItem> | ||
| <NFormItem | ||
| label={t('password.confirm_password')} | ||
| path='confirmPassword' | ||
| > | ||
| <NInput | ||
| allowInput={this.trim} | ||
| type='password' | ||
| v-model:value={this.formData.confirmPassword} | ||
| placeholder={t('password.confirm_password_tips')} | ||
| /> | ||
| </NFormItem> | ||
| </NForm> | ||
| </Modal> | ||
| ) | ||
| } | ||
| }) | ||
|
|
||
| export default PasswordModal |
134 changes: 134 additions & 0 deletions
134
dolphinscheduler-ui/src/views/security/user-manage/components/use-password.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import { reactive, ref } from 'vue' | ||
| import { useI18n } from 'vue-i18n' | ||
| import { pick } from 'lodash' | ||
| import { useUserStore } from '@/store/user/user' | ||
| import { updateUser } from '@/service/modules/users' | ||
| import type { IRecord, UserInfoRes } from '../types' | ||
| import { FormItemRule } from 'naive-ui' | ||
| import { UserReq } from '../types' | ||
| import { IdReq } from '@/service/modules/users/types' | ||
|
|
||
| export function usePassword() { | ||
| const { t } = useI18n() | ||
| const userStore = useUserStore() | ||
| const userInfo = userStore.getUserInfo as UserInfoRes | ||
| const IS_ADMIN = userInfo.userType === 'ADMIN_USER' | ||
|
|
||
| const initialValues = { | ||
| userName: '', | ||
| userPassword: '', | ||
| confirmPassword: '' | ||
| } | ||
|
|
||
| const state = reactive({ | ||
| formRef: ref(), | ||
| formData: { ...initialValues }, | ||
| saving: false, | ||
| loading: false | ||
| }) | ||
|
|
||
| function validatePasswordStartWith( | ||
| rule: FormItemRule, | ||
| value: string | ||
| ): boolean { | ||
| return ( | ||
| !!state.formRef.model.userPassword && | ||
| state.formRef.model.userPassword.startsWith(value) && | ||
| state.formRef.model.userPassword.length >= value.length | ||
| ) | ||
| } | ||
|
|
||
| function validatePasswordSame(rule: FormItemRule, value: string): boolean { | ||
| return value === state.formRef.model.userPassword | ||
| } | ||
|
|
||
| const formRules = { | ||
| userPassword: { | ||
| trigger: ['input', 'blur'], | ||
| required: true, | ||
| validator(validator: any, value: string) { | ||
| if ( | ||
| !value || | ||
| !/^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、0-9A-Za-z]{6,22}$/.test( | ||
| value | ||
| ) | ||
| ) { | ||
| return new Error(t('security.user.user_password_tips')) | ||
| } | ||
| } | ||
| }, | ||
| confirmPassword: [ | ||
| { | ||
| trigger: ['input', 'blur'], | ||
| required: true | ||
| }, | ||
| { | ||
| validator: validatePasswordStartWith, | ||
| message: t('security.user.confirm_password_tips'), | ||
| trigger: ['input'] | ||
| }, | ||
| { | ||
| validator: validatePasswordSame, | ||
| message: t('security.user.confirm_password_tips'), | ||
| trigger: ['blur', 'password-input'] | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| const onReset = () => { | ||
| state.formData = { ...initialValues } | ||
| } | ||
| const onSave = async (record: IRecord): Promise<boolean> => { | ||
| try { | ||
| await state.formRef.validate() | ||
| if (state.saving) return false | ||
| state.saving = true | ||
|
|
||
| const resetPasswordReq = { | ||
| ...pick(record, [ | ||
| 'id', | ||
| 'userName', | ||
| 'tenantId', | ||
| 'email', | ||
| 'queue', | ||
| 'phone', | ||
| 'state' | ||
| ]), | ||
| userPassword: state.formData.userPassword | ||
| } as IdReq & UserReq | ||
|
|
||
| await updateUser(resetPasswordReq) | ||
|
|
||
| state.saving = false | ||
| return true | ||
| } catch (err) { | ||
| state.saving = false | ||
| return false | ||
| } | ||
| } | ||
| const onSetValues = (record: IRecord) => { | ||
| state.formData = { | ||
| ...pick(record, ['userName']), | ||
| userPassword: '', | ||
| confirmPassword: '' | ||
| } | ||
| } | ||
|
|
||
| return { state, formRules, IS_ADMIN, onReset, onSave, onSetValues } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.