Skip to content
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

Correção Login Mine e ADM #2333

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Correção Login Mine e ADM #2333

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions application/controllers/Login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ public function verificarLogin()
$json = ['result' => true];
echo json_encode($json);
} else {
$json = ['result' => false, 'message' => 'Os dados de acesso estão incorretos.'];
$json = ['result' => false, 'message' => 'Os dados de acesso estão incorretos.', 'MAPOS_TOKEN' => $this->security->get_csrf_hash()];
echo json_encode($json);
}
} else {
$json = ['result' => false, 'message' => 'Usuário não encontrado, verifique se suas credenciais estão corretass.'];
$json = ['result' => false, 'message' => 'Usuário não encontrado, verifique se suas credenciais estão corretass.', 'MAPOS_TOKEN' => $this->security->get_csrf_hash()];
echo json_encode($json);
}
}
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/Mine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ public function login()
log_info($_SERVER['REMOTE_ADDR'] . ' Efetuou login no sistema');
echo json_encode(['result' => true]);
} else {
echo json_encode(['result' => false, 'message' => 'Os dados de acesso estão incorretos.']);
echo json_encode(['result' => false, 'message' => 'Os dados de acesso estão incorretos.', 'MAPOS_TOKEN' => $this->security->get_csrf_hash()]);
}
} else {
echo json_encode(['result' => false, 'message' => 'Usuário não encontrado, verifique se suas credenciais estão corretass.']);
echo json_encode(['result' => false, 'message' => 'Usuário não encontrado, verifique se suas credenciais estão corretass.', 'MAPOS_TOKEN' => $this->security->get_csrf_hash()]);
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions application/views/conecte/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ function formatar(mascara, documento) {
showConfirmButton: false,
timer: 4000
})

var newCsrfToken = data.MAPOS_TOKEN;
$("input[name='<?= $this->security->get_csrf_token_name(); ?>']").val(newCsrfToken);
}
}
});
Expand Down
22 changes: 12 additions & 10 deletions application/views/mapos/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,19 @@ function saudacao($nome = '')
data: dados,
dataType: 'json',
success: function(data) {
if (data.result == true) {
window.location.href = "<?= site_url('mapos'); ?>";
} else {
if (data.result == true) {
window.location.href = "<?= site_url('mapos'); ?>";
} else {
$('#btn-acessar').removeClass('disabled');
$('#progress-acessar').addClass('hide');
$('#message').text(data.message || 'Os dados de acesso estão incorretos, por favor tente novamente!');
$('#call-modal').trigger('click');


$('#btn-acessar').removeClass('disabled');
$('#progress-acessar').addClass('hide');

$('#message').text(data.message || 'Os dados de acesso estão incorretos, por favor tente novamente!');
$('#call-modal').trigger('click');
}
// Atualiza o token a cada requisição
var newCsrfToken = data.MAPOS_TOKEN;
$("input[name='<?= $this->security->get_csrf_token_name(); ?>']").val(newCsrfToken);

}
}
});

Expand Down
Loading