Skip to content

fix: ログインID(username)変更時にログインIDのバリデーションが動作しない不具合を修正 #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyujiAMANO merged 1 commit into from
Jan 22, 2023
Merged

fix: ログインID(username)変更時にログインIDのバリデーションが動作しない不具合を修正 #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion Model/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public function beforeValidate($options = array()) {
*/
protected function _setUsernameValidate() {
//ログインID
if (! Hash::get($this->data, 'User.id')) {
if ($this->__isValidateUsernameRequired()) {
$this->validate = ValidateMerge::merge($this->validate, array(
'username' => array(
'notBlank' => array(
Expand Down Expand Up @@ -334,6 +334,34 @@ protected function _setUsernameValidate() {
}
}

/**
* ログインID(username)のバリデーションを行うかどうか
*
* @return bool
*/
private function __isValidateUsernameRequired() {
if (!Hash::get($this->data, 'User.id')) {
// 新規登録ならば、必ずバリデーションを行う
return true;
}
// 更新時
if (!isset($this->data['User']['username'])) {
// ログインID(username)がPOSTされてなければバリデーション不要
return false;
}
$beforeUser = $this->find('first',
[
'conditions' => [
'id' => $this->data['User']['id']
],
'recursive' => -1,
'fields' => ['username']
]
);
// ログインID(username)が変更されてなければバリデーション不要。変更されてたらバリデーション必要
return $beforeUser['User']['username'] !== $this->data['User']['username'];
}

/**
* バリデーションのセット(パスワード)
*
Expand Down