hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#722 Using cell phone

Browse Source
This commit is contained in:
vedatakd 2020-01-20 15:54:17 +03:00
parent 95099d377a
commit 7fb6730fd9
16 changed files with 301 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/default/visiosoft/base-theme/resources/lang/en/field.php
View File

@ -20,4 +20,5 @@ return [
'not_a_member_yet' => 'Not a Member Yet',
'not_a_member_yet_message' => 'Sign up for our members to benefit from our special service',
'forgot_password' => 'I Forgot My Password',
'email_or_phone_number' => 'Email Address or Phone Number'
];

1
addons/default/visiosoft/base-theme/resources/lang/tr/field.php
View File

@ -20,4 +20,5 @@ return [
'not_a_member_yet' => 'Henüz Üye Değil Misiniz',
'not_a_member_yet_message' => 'Üyelerimize özel hizmetlerimizden faydalanabilmek için üye olun',
'forgot_password' => 'Şifremi Unuttum',
'email_or_phone_number' => 'E-Posta Adresiniz veya Telefon Numaranız'
];

4
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
View File

@ -5,7 +5,7 @@
<div class="col-12 text-left p-3 m-0 row justify-content-center">
<div class="col-12 col-lg-5 m-3 login-section">
{% set form = form('login')
{% set form = form('signIn')
.redirect(app.request.get('redirect'))
.get() %}
{{ form_open({
@ -18,7 +18,7 @@
</h5>
<div class="form-group email-field email-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.email') }}
{{ trans('visiosoft.theme.base::field.email_or_phone_number') }}
<span class="required">*</span>
</label>

2
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
View File

@ -38,7 +38,7 @@
<div class="col-12">
<div class="form-group email-field email-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.email') }}
{{ trans('visiosoft.theme.base::field.email_or_phone_number') }}
<span class="required">*</span>
</label>

2
addons/default/visiosoft/profile-module/resources/lang/en/message.php
View File

@ -22,4 +22,6 @@ return [
'please_confirm_transaction' => 'Please Confirm Transaction',
'password_do_not_match' => 'Passwords do not match',
'your_password_changed' => 'Your password was successfully updated',
'error_valid_email_or_phone' => 'Phone number or E-mail address format is not correct.',
'registered_phone' => 'This phone number has already been registered.',
];

14
addons/default/visiosoft/profile-module/resources/lang/tr/message.php
View File

@ -1,11 +1,11 @@
<?php
return [
"email" => "Eposta alanı zorunludur!",
"username" => "Kullanıcı Adı alanı zorunludur!",
"success_update" => "Profil Başarıyla Güncellendi!",
"adress_success_update" => "Adres Başarıyla Güncellendi!",
"adress_success_create" => "Adres Başarıyla Oluşturuldu!",
"email" => "Eposta alanı zorunludur!",
"username" => "Kullanıcı Adı alanı zorunludur!",
"success_update" => "Profil Başarıyla Güncellendi!",
"adress_success_update" => "Adres Başarıyla Güncellendi!",
"adress_success_create" => "Adres Başarıyla Oluşturuldu!",
"login_error" => "Giriş Bilgileri Hatalıdır.",
"login_noMail_old_user" => "Girdiğiniz e-posta adresi bulunamadı.",
"login_noMail_old_user2" => "Lütfen e-posta adresini kontrol edip tekrar deneyin.",
@ -16,10 +16,12 @@ return [
"notified_about_ads" => "Allow notifications about my ads",
"receive_messages_email" => "I want to receive messages as email",
"no_packages_module" => "Paket Modülü Bulunamadı!",
"required_add"=> "Lütfen gerekli tüm satırları doldurun.",
"required_add" => "Lütfen gerekli tüm satırları doldurun.",
"no_extend_package" => "İlan Yayınlama Süresi paketiniz bulunamadı.",
"saved" => "Kayıt Edildi!",
'please_confirm_transaction' => 'Lütfen işlemi onaylayın',
'password_do_not_match' => 'Şifreler eşleşmiyor',
'your_password_changed' => 'Şifreniz başarıyla güncellendi',
'error_valid_email_or_phone' => 'E-Posta Adresi veya Telefon numarası formatı geçersiz.',
'registered_phone' => 'Bu telefon numarası ile daha önceden sisteme kayıt olunmuştur.',
];

2
addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileRepositoryInterface.php
View File

@ -19,4 +19,6 @@ interface ProfileRepositoryInterface extends EntryRepositoryInterface
public function findByUserID($id);
public function CheckPhoneNumber($phoneNumber);
public function findPhoneNumber($phone_number);
}

6
addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php
View File

@ -138,5 +138,11 @@ class ProfileRepository extends EntryRepository implements ProfileRepositoryInte
->first();
}
public function findPhoneNumber($phone_number)
{
return $this->model->where('gsm_phone', $phone_number)
->first();
}
}

12
addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
View File

@ -3,8 +3,8 @@
use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
use Visiosoft\ProfileModule\Profile\Register2\Command\AssociateActivationRoles;
use Visiosoft\ProfileModule\Profile\Register2\Command\SetOptions;
use Anomaly\UsersModule\User\Validation\ValidatePassword;
use Anomaly\UsersModule\User\UserModel;
use Visiosoft\ProfileModule\Profile\Validation\ValidateRegister;
/**
* Class RegisterFormBuilder
@ -47,7 +47,17 @@ class Register2FormBuilder extends FormBuilder
'required' => true,
],
'email' => [
'type' => 'anomaly.field_type.text',
'instructions' => false,
'rules' => [
'valid_register',
],
'validators' => [
'valid_register' => [
'message' => false,
'handler' => ValidateRegister::class,
],
],
],
'password' => [
'instructions' => false,

14
addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
View File

@ -38,16 +38,24 @@ class Register2FormHandler
UserActivator $activator
)
{
if (!$builder->canSave()) {
return;
}
$profile_parameters = array();
/* Create Profile in Register */
if (!filter_var($builder->getPostValue('email'), FILTER_VALIDATE_EMAIL)) {
$profile_parameters['gsm_phone'] = $builder->getPostValue('email');
$builder->setFormValue('email', $builder->getPostValue('email') . "@" . setting_value('streams::domain'));
}
$builder->saveForm(); // Save the new user.
/* @var UserInterface $user */
$user = $builder->getFormEntry();
/* Create Profile in Register */
ProfileModel::query()->create(['user_no_id' => $user->getId()]);
$profile_parameters['user_no_id'] = $user->getId();
ProfileModel::query()->create($profile_parameters);
$activator->start($user);

50
addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormBuilder.php Normal file
View File

@ -0,0 +1,50 @@
<?php namespace Visiosoft\ProfileModule\Profile\SignIn;
use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
use Anomaly\UsersModule\User\Contract\UserInterface;
use Anomaly\UsersModule\User\UserSecurity;
use Symfony\Component\HttpFoundation\Response;
class SignInFormBuilder extends FormBuilder
{
protected $model = false;
protected $user = null;
protected $actions = [
'blue' => [
'text' => 'anomaly.module.users::button.login',
],
];
protected $options = [
'redirect' => '/',
'breadcrumb' => false,
'success_message' => false,
];
public function onPost(UserSecurity $security)
{
$response = $security->attempt();
if ($response instanceof Response) {
$this->setFormResponse($response);
$this->setSave(false);
}
}
public function getUser()
{
return $this->user;
}
public function setUser(UserInterface $user)
{
$this->user = $user;
return $this;
}
}

62
addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormFields.php Normal file
View File

@ -0,0 +1,62 @@
<?php namespace Visiosoft\ProfileModule\Profile\SignIn;
use Illuminate\Contracts\Config\Repository;
class SignInFormFields
{
public function handle(SignInFormBuilder $builder, Repository $config)
{
$method = $config->get('anomaly.module.users::config.login');
if ($method == 'username') {
$login = [
'username' => [
'label' => 'anomaly.module.users::field.username.name',
'type' => 'anomaly.field_type.text',
'required' => true,
],
];
} else {
$login = [
'email' => [
'label' => 'anomaly.module.users::field.email.name',
'type' => 'anomaly.field_type.text',
'required' => true,
],
];
}
$builder->setFields(
array_merge(
$login,
[
'password' => [
'label' => 'anomaly.module.users::field.password.name',
'type' => 'anomaly.field_type.text',
'required' => true,
'config' => [
'type' => 'password',
],
'rules' => [
'valid_credentials',
],
'validators' => [
'valid_credentials' => [
'handler' => 'Visiosoft\ProfileModule\Profile\Validation\ValidateCredentials@handle',
'message' => 'anomaly.module.users::message.invalid_login',
],
],
],
'remember_me' => [
'label' => false,
'type' => 'anomaly.field_type.boolean',
'config' => [
'mode' => 'checkbox',
'label' => 'anomaly.module.users::field.remember_me.name',
],
],
]
)
);
}
}

38
addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php Normal file
View File

@ -0,0 +1,38 @@
<?php namespace Visiosoft\ProfileModule\Profile\SignIn;
use Anomaly\UsersModule\User\UserAuthenticator;
use Anomaly\UsersModule\User\UserSecurity;
use Illuminate\Routing\Redirector;
use Symfony\Component\HttpFoundation\Response;
class SignInFormHandler
{
public function handle(
SignInFormBuilder $builder,
UserAuthenticator $authenticator,
UserSecurity $security,
Redirector $redirect
)
{
if (!$user = $builder->getUser()) {
return;
}
$response = $security->check($user);
if ($response instanceof Response) {
$authenticator->logout($user);
$builder->setFormResponse($response);
return;
}
$authenticator->login($user, $builder->getFormValue('remember_me'));
$builder->setFormResponse($redirect->intended($builder->getFormOption('redirect', '/')));
}
}

83
addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php Normal file
View File

@ -0,0 +1,83 @@
<?php namespace Visiosoft\ProfileModule\Profile\Validation;
use Anomaly\Streams\Platform\Addon\Extension\ExtensionCollection;
use Anomaly\UsersModule\User\Authenticator\Contract\AuthenticatorExtensionInterface;
use Anomaly\UsersModule\User\Contract\UserInterface;
use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
use Illuminate\Http\RedirectResponse;
use Symfony\Component\HttpFoundation\Response;
use Visiosoft\ProfileModule\Profile\Contract\ProfileRepositoryInterface;
use Visiosoft\ProfileModule\Profile\SignIn\SignInFormBuilder;
class ValidateCredentials
{
public function __construct(
ExtensionCollection $extensions,
UserRepositoryInterface $userRepository,
ProfileRepositoryInterface $profileRepository
)
{
$this->extensions = $extensions;
$this->repository = $userRepository;
$this->profile = $profileRepository;
}
public function authenticate(array $credentials)
{
$authenticators = $this->extensions
->search('anomaly.module.users::authenticator.*')
->enabled();
/* @var AuthenticatorExtensionInterface $authenticator */
foreach ($authenticators as $authenticator) {
if ($authenticator->slug == "default_authenticator") {
if (!isset($credentials['password']) && !isset($credentials['email'])) {
$response = null;
}
//Is email or phone number
if (!filter_var($credentials['email'], FILTER_VALIDATE_EMAIL)) {
if ($profile = $this->profile->findPhoneNumber($credentials['email'])) {
if ($user = $this->repository->find($profile->user_no_id)) {
$credentials['email'] = $user->email;
}
}
}
$response = $this->repository->findByCredentials($credentials);
} else {
$response = $authenticator->authenticate($credentials);
}
if ($response instanceof UserInterface) {
return $response;
}
if ($response instanceof RedirectResponse) {
return $response;
}
}
return false;
}
public function handle(SignInFormBuilder $builder)
{
if (!$response = $this->authenticate($builder->getPostData())) {
return false;
}
if ($response instanceof UserInterface) {
$builder->setUser($response);
}
if ($response instanceof Response) {
$builder->setFormResponse($response);
}
return true;
}
}

21
addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php Normal file
View File

@ -0,0 +1,21 @@
<?php namespace Visiosoft\ProfileModule\Profile\Validation;
use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
use Visiosoft\ProfileModule\Profile\Contract\ProfileRepositoryInterface;
class ValidateRegister
{
public function handle(FormBuilder $builder, ProfileRepositoryInterface $profileRepository, $attribute, $value)
{
if (!filter_var($builder->getPostValue('email'), FILTER_VALIDATE_EMAIL)) {
if (!is_numeric($builder->getPostValue('email'))) {
$builder->addFormError('email', trans('visiosoft.module.profile::message.error_valid_email_or_phone'));
return false;
} elseif (!is_null($profileRepository->findPhoneNumber($builder->getPostValue('email')))) {
$builder->addFormError('email', trans('visiosoft.module.profile::message.registered_phone'));
return false;
}
}
return true;
}
}

2
addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
View File

@ -14,6 +14,7 @@ use Anomaly\Streams\Platform\Model\Profile\ProfileProfileEntryModel;
use Visiosoft\ProfileModule\Profile\ProfileModel;
use Illuminate\Routing\Router;
use Visiosoft\ProfileModule\Profile\Register2\Register2FormBuilder;
use Visiosoft\ProfileModule\Profile\SignIn\SignInFormBuilder;
use Visiosoft\ProfileModule\Profile\sites\SitesFormBuilder;
use Visiosoft\ProfileModule\Profile\User\UserFormBuilder;
@ -175,6 +176,7 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
'updatePassword' => PasswordFormBuilder::class,
'userProfile' => UserFormBuilder::class,
'profile' => ProfileFormBuilder::class,
'signIn' => SignInFormBuilder::class,
ProfileAdressEntryModel::class => AdressModel::class,
ProfileProfileEntryModel::class => ProfileModel::class,
];