7 | 
8 |
9 | 
10 | 
11 |
12 | 
13 | 
14 |
15 | 
16 | 
17 |
--------------------------------------------------------------------------------
/app/AuthenticatableForUser.php:
--------------------------------------------------------------------------------
1 | command('inspire')
28 | // ->hourly();
29 | }
30 |
31 | /**
32 | * Register the commands for the application.
33 | *
34 | * @return void
35 | */
36 | protected function commands()
37 | {
38 | $this->load(__DIR__.'/Commands');
39 |
40 | require base_path('routes/console.php');
41 | }
42 | }
43 |
--------------------------------------------------------------------------------
/app/Contracts/Socialite/Avatar.php:
--------------------------------------------------------------------------------
1 | userSocialite = $userSocialite;
14 | }
15 |
16 | public function get()
17 | {
18 | $data = $this->request();
19 |
20 | return $this->getAvatarFromData($data);
21 | }
22 |
23 | /**
24 | * Возвращает результат запроса к API с указаными параметрами
25 | */
26 | protected function request()
27 | {
28 | $responseContents = (new Client())
29 | ->get($this->getUrl(), $this->getConfig())
30 | ->getBody()
31 | ->getContents();
32 | $data = json_decode($responseContents);
33 |
34 | return $data;
35 | }
36 |
37 | /**
38 | * Параметры запроса
39 | */
40 | protected function getConfig() {
41 | return [];
42 | }
43 |
44 | /**
45 | * Адрес API
46 | */
47 | abstract protected function getUrl();
48 |
49 | /**
50 | * Дает ссылку на аватар из данных запроса
51 | */
52 | abstract protected function getAvatarFromData($data);
53 |
54 | }
55 |
--------------------------------------------------------------------------------
/app/Email.php:
--------------------------------------------------------------------------------
1 | where('email', $email);
22 | }
23 |
24 |
25 | public function user() {
26 | return $this->belongsTo(User::class);
27 | }
28 | }
29 |
--------------------------------------------------------------------------------
/app/Exceptions/Handler.php:
--------------------------------------------------------------------------------
1 | true
20 | // ];
21 |
22 | $response = $data;
23 |
24 | // if ($data) {
25 | // $response['data'] = $data;
26 | // }
27 | if ($message) {
28 | $response['message'] = $message;
29 | }
30 |
31 | return response()->json($response, $code);
32 | }
33 |
34 |
35 | /**
36 | * return error response.
37 | *
38 | * @return \Illuminate\Http\Response
39 | */
40 | public function sendError($error, $code = 404) // , $errorMessages = []
41 | {
42 | $response = [
43 | // 'success' => false,
44 | 'message' => $error
45 | ];
46 |
47 | // if(!empty($errorMessages)){
48 | // $response['data'] = $errorMessages;
49 | // }
50 | // $response = Json::response($data, $message)
51 |
52 | return response()->json($response, $code);
53 | }
54 | }
55 |
--------------------------------------------------------------------------------
/app/Http/Controllers/API/Profile/OtherProfileController.php:
--------------------------------------------------------------------------------
1 | nickname;
17 | $user = User::ofNickname($nickname)->first();
18 |
19 | if (!$user) {
20 | return $this->sendError('Не удалось найти пользователя.', 404);
21 | }
22 |
23 | return new UserResource($user);
24 | }
25 | }
26 |
--------------------------------------------------------------------------------
/app/Http/Controllers/Controller.php:
--------------------------------------------------------------------------------
1 | check()) {
21 | return redirect('/home');
22 | }
23 |
24 | return $next($request);
25 | }
26 | }
27 |
--------------------------------------------------------------------------------
/app/Http/Middleware/TrimStrings.php:
--------------------------------------------------------------------------------
1 | email) {
28 | $rules['email'] = 'required|' . config('validation.email');
29 | }
30 | if (request()->nickname) {
31 | $rules['nickname'] = 'required|' . config('validation.nickname');;
32 | }
33 |
34 | return $rules;
35 | }
36 | }
37 |
--------------------------------------------------------------------------------
/app/Http/Requests/Auth/ForgotPasswordResetRequest.php:
--------------------------------------------------------------------------------
1 | config('validation.reset_password_token'),
28 | 'email' => 'required|' . config('validation.email'),
29 | 'password' => config('validation.password')
30 | // 'password_confirmation' => 'required|string|min:6|same:password'
31 | ];
32 | }
33 | }
34 |
--------------------------------------------------------------------------------
/app/Http/Requests/Auth/LoginRequest.php:
--------------------------------------------------------------------------------
1 | config('validation.password')
28 | ];
29 |
30 | if (request()->email) {
31 | $rules = array_merge($rules, [
32 | 'email' => 'required|' . config('validation.email'),
33 | // 'password' => 'required|string|min:5'
34 | ]);
35 | }
36 | if (request()->nickname) {
37 | $rules = array_merge($rules, [
38 | 'nickname' => 'required|' . config('validation.nickname')
39 | ]);
40 | }
41 |
42 | return $rules;
43 | }
44 | }
45 |
--------------------------------------------------------------------------------
/app/Http/Requests/Auth/SignupRequest.php:
--------------------------------------------------------------------------------
1 | 'required|unique:users,nickname|' . config('validation.nickname'),
29 | ];
30 |
31 | if (!request()->userSoc) {
32 | $rules = array_merge($rules, [
33 | 'form.email' => 'required|unique:emails,email|' . config('validation.email'),
34 | 'form.password' => config('validation.password')
35 | ]);
36 | }
37 |
38 | return $rules;
39 | }
40 | }
41 |
--------------------------------------------------------------------------------
/app/Http/Requests/Profile/Current/SaveAvatarRequest.php:
--------------------------------------------------------------------------------
1 | 'image',
28 | 'cropInfo' => 'json'
29 | ];
30 | }
31 | }
32 |
--------------------------------------------------------------------------------
/app/Http/Requests/Profile/Current/SaveEmailRequest.php:
--------------------------------------------------------------------------------
1 | 'required|' . config('validation.email'),
28 | 'public' => 'required|boolean',
29 | 'label' => 'nullable|' . config('validation.emailLabel'),
30 | 'main' => 'required|boolean'
31 | ];
32 | }
33 |
34 |
35 | /**
36 | * Configure the validator instance.
37 | *
38 | * @param \Illuminate\Validation\Validator $validator
39 | * @return void
40 | */
41 | public function withValidator($validator)
42 | {
43 | // $validator->after(function ($validator) {
44 | // if (request()->label) {
45 | // $validator->addRules([ 'label' => config('validation.emailLabel') ]);
46 | // }
47 | // if ($this->somethingElseIsInvalid()) {
48 | // $validator->errors()->add('field', 'Something is wrong with this field!');
49 | // }
50 | // });
51 | }
52 | }
53 |
--------------------------------------------------------------------------------
/app/Http/Requests/Profile/Current/SavePhoneRequest.php:
--------------------------------------------------------------------------------
1 | 'required|phone:country2|unique:phones,number',
28 | 'country2' => 'required_with:number',
29 | // еще передается просто country
30 | // 'number' => 'required|unique:phones,number', // TODO . config('validation.phone'),
31 | 'label' => 'nullable|' . config('validation.phoneLabel'),
32 | 'public' => 'required|boolean',
33 | 'prefix' => 'required'
34 | ];;
35 | }
36 | }
37 |
--------------------------------------------------------------------------------
/app/Http/Requests/Profile/Current/SetPasswordRequest.php:
--------------------------------------------------------------------------------
1 | password) {
27 | $rules = [
28 | 'password' => config('validation.password')
29 | ];
30 | } else {
31 | $rules = [
32 | 'currentPassword' => config('validation.password'),
33 | 'newPassword' => config('validation.password')
34 | ];
35 | }
36 |
37 | return $rules;
38 | }
39 | }
40 |
--------------------------------------------------------------------------------
/app/Http/Requests/Profile/Current/SetUserDataRequest.php:
--------------------------------------------------------------------------------
1 | 'nullable|date',
28 | 'timezone' => 'nullable|timezone'
29 | ];
30 |
31 | // TODO!!!!!!!!!!!!!!!!!!!
32 | // требовать ввода обоих полей если одно из них введено
33 | if (request()->firstName || request()->lastName) {
34 | $rules['firstName'] = 'required|' . config('validation.first_name');
35 | $rules['lastName'] = 'required|' . config('validation.last_name');
36 | }
37 |
38 | // if (request()->email) {
39 | // $rules['email'] = config('validation.email');
40 | // }
41 |
42 |
43 |
44 | return $rules;
45 | }
46 | }
47 |
--------------------------------------------------------------------------------
/app/Http/Requests/Profile/Other/GetUserRequest.php:
--------------------------------------------------------------------------------
1 | 'required|' . config('validation.nickname')
28 | ];
29 | }
30 | }
31 |
--------------------------------------------------------------------------------
/app/Http/Resources/EmailResource.php:
--------------------------------------------------------------------------------
1 | $this->id,
19 | 'email' => $this->email,
20 | 'label' => $this->label,
21 | 'verified' => $this->verified,
22 | 'public' => $this->public,
23 | 'verificationToken' => $this->verification_token,
24 | 'createdAt' => (string) $this->created_at,
25 | 'updatedAt' => (string) $this->updated_at,
26 | ];
27 | }
28 | }
29 |
--------------------------------------------------------------------------------
/app/Http/Resources/PhoneResource.php:
--------------------------------------------------------------------------------
1 | parse($this->number, $this->country2);
20 | $numberFormated = $phoneUtil->format($numberParsed, \libphonenumber\PhoneNumberFormat::INTERNATIONAL);
21 | // } catch (\libphonenumber\NumberParseException $e) {
22 | //
23 | // }
24 |
25 | return [
26 | 'id' => $this->id,
27 | 'country' => $this->country,
28 | 'country2' => $this->country2,
29 | 'prefix' => $this->prefix,
30 | 'number' => $this->number,
31 | 'numberFormated' => $numberFormated,
32 | 'label' => $this->label,
33 | 'verified' => $this->verified,
34 | 'public' => $this->public,
35 | 'smsVerificationCode' => $this->sms_verification_code,
36 | 'createdAt' => (string) $this->created_at,
37 | 'updatedAt' => (string) $this->updated_at,
38 | ];
39 | }
40 | }
41 |
--------------------------------------------------------------------------------
/app/Mail/EmailVerify.php:
--------------------------------------------------------------------------------
1 | emailVerifyUrl = $emailVerifyUrl;
25 | $this->afterSignup = $afterSignup;
26 | }
27 |
28 | /**
29 | * Build the message.
30 | *
31 | * @return $this
32 | */
33 | public function build()
34 | {
35 | return $this->markdown($this->afterSignup ? 'emails.auth.emailVerify' : 'emails.profile.emailVerify');
36 | }
37 | }
38 |
--------------------------------------------------------------------------------
/app/Mail/ForgotPassword.php:
--------------------------------------------------------------------------------
1 | resetUrlWithToken = $resetUrlWithToken;
26 | }
27 |
28 | /**
29 | * Build the message.
30 | *
31 | * @return $this
32 | */
33 | public function build()
34 | {
35 | return $this->markdown('emails.auth.forgotPassword');
36 | }
37 | }
38 |
--------------------------------------------------------------------------------
/app/Phone.php:
--------------------------------------------------------------------------------
1 | where('phone', $phone);
17 | }
18 |
19 |
20 | public function user() {
21 | return $this->belongsTo(User::class);
22 | }
23 | }
24 |
--------------------------------------------------------------------------------
/app/Providers/AppServiceProvider.php:
--------------------------------------------------------------------------------
1 | 'App\Policies\ModelPolicy',
18 | ];
19 |
20 | /**
21 | * Register any authentication / authorization services.
22 | *
23 | * @return void
24 | */
25 | public function boot()
26 | {
27 | $this->registerPolicies();
28 |
29 | Passport::routes();
30 |
31 | // Passport::tokensExpireIn(now()->addDays(15));
32 | //
33 | // Passport::refreshTokensExpireIn(now()->addDays(30));
34 | }
35 | }
36 |
--------------------------------------------------------------------------------
/app/Providers/BroadcastServiceProvider.php:
--------------------------------------------------------------------------------
1 | [
17 | 'App\Listeners\EventListener',
18 | ],
19 | \SocialiteProviders\Manager\SocialiteWasCalled::class => [
20 | // add your listeners (aka providers) here
21 | 'SocialiteProviders\\VKontakte\\VKontakteExtendSocialite@handle',
22 | 'SocialiteProviders\\Twitter\\TwitterExtendSocialite@handle',
23 | 'SocialiteProviders\\Instagram\\InstagramExtendSocialite@handle',
24 | 'SocialiteProviders\\Reddit\\RedditExtendSocialite@handle',
25 | ],
26 | ];
27 |
28 | /**
29 | * Register any events for your application.
30 | *
31 | * @return void
32 | */
33 | public function boot()
34 | {
35 | parent::boot();
36 |
37 | //
38 | }
39 | }
40 |
--------------------------------------------------------------------------------
/app/Services/Socialite/Avatars/Google.php:
--------------------------------------------------------------------------------
1 | image->url.'0' ?? null;
16 | }
17 |
18 | /**
19 | * Параметры запроса
20 | */
21 | protected function getConfig() {
22 | return [
23 | 'headers' => [
24 | 'Authorization' => 'Bearer ' . $this->userSocialite->token,
25 | ]
26 | ];
27 | }
28 |
29 | /**
30 | * Адрес API
31 | */
32 | protected function getUrl() {
33 | return 'https://www.googleapis.com/plus/v1/people/me';
34 | }
35 | }
36 |
--------------------------------------------------------------------------------
/app/Services/Socialite/Avatars/Vkontakte.php:
--------------------------------------------------------------------------------
1 | photo_400_orig ?? null;
16 | }
17 |
18 | /**
19 | * Адрес API
20 | */
21 | protected function getUrl() {
22 | $fields = ['photo_400_orig'];
23 |
24 | return "https://api.vk.com/method/users.get?user_ids={$this->userSocialite->getId()}&fields=" . implode(',', $fields) . "&access_token={$this->userSocialite->token}&https=1";
25 | }
26 | }
27 |
--------------------------------------------------------------------------------
/app/SocialiteProvider.php:
--------------------------------------------------------------------------------
1 | belongsToMany(User::class);
13 | // }
14 | }
15 |
--------------------------------------------------------------------------------
/app/Traits/BaseModelTimezones.php:
--------------------------------------------------------------------------------
1 | user()) {
16 | return (parent::asDateTime($value))->timezone($user->timezone);
17 | }
18 |
19 | if ($guestTimezone = request()->cookie('guest-timezone')) {
20 | return (parent::asDateTime($value))->timezone($guestTimezone);
21 | }
22 |
23 | return parent::asDateTime($value);
24 | }
25 |
26 | /**
27 | * Convert a DateTime to a storable string.
28 | *
29 | * @param \DateTime|int $value
30 | * @return string
31 | */
32 | public function fromDateTime($value)
33 | {
34 | // ensure that if the datetime or carbon object we were given contained a timezone, we convert to the app timezone (instead of stripping it) before outputting a storable string
35 | if ($value) {
36 | return $this->asDateTime($value)->setTimeZone(config('app.timezone'))->format($this->getDateFormat());
37 | }
38 | return $value;
39 | }
40 | }
41 |
--------------------------------------------------------------------------------
/app/Traits/EmailVerification.php:
--------------------------------------------------------------------------------
1 | verification_token) ?
16 | $email->verification_token
17 | :
18 | hash_hmac('sha256', str_random(40), config('app.key'));
19 |
20 | // возвращает токен
21 | return tap(
22 | $token,
23 | function ($token) use ($email) {
24 | $resetUrlWithToken = config('app.client_url') . '/auth/verify-email?token=' . $token;
25 | $afterSignup = auth()->guest();
26 |
27 | Mail::to([
28 | 'email' => $email->email
29 | ])->send(new EmailVerify($resetUrlWithToken, $afterSignup));
30 | });
31 | }
32 | }
33 |
--------------------------------------------------------------------------------
/app/UserPasswordHistroy.php:
--------------------------------------------------------------------------------
1 | belongsTo(User::class);
21 | }
22 | }
23 |
--------------------------------------------------------------------------------
/bootstrap/cache/.gitignore:
--------------------------------------------------------------------------------
1 | *
2 | !.gitignore
3 |
--------------------------------------------------------------------------------
/config/countries.php:
--------------------------------------------------------------------------------
1 | [
6 | 'enabled' => true,
7 | 'service' => PragmaRX\Countries\Package\Services\Cache::class,
8 | 'duration' => 180,
9 | 'directory' => sys_get_temp_dir().'/__PRAGMARX_COUNTRIES__/cache',
10 | ],
11 |
12 | 'hydrate' => [
13 | 'before' => true,
14 | 'after' => true,
15 | 'elements' => [
16 | 'borders' => false,
17 | 'cities' => false,
18 | 'currencies' => false,
19 | 'flag' => true,
20 | 'geometry' => false,
21 | 'states' => false,
22 | 'taxes' => false,
23 | 'timezones' => true,
24 | 'timezones_times' => false,
25 | 'topology' => false,
26 | ],
27 | ],
28 |
29 | 'maps' => [
30 | 'lca3' => 'cca3',
31 | 'currencies' => 'currency',
32 | ],
33 |
34 | 'validation' => [
35 | 'enabled' => true,
36 | 'rules' => [
37 | 'country' => 'name.common',
38 | 'name' => 'name.common',
39 | 'nameCommon' => 'name.common',
40 | 'cca2',
41 | 'cca2',
42 | 'cca3',
43 | 'ccn3',
44 | 'cioc',
45 | 'currencies' => 'ISO4217',
46 | 'language_short' => 'ISO639_3',
47 | ],
48 | ],
49 |
50 | ];
51 |
--------------------------------------------------------------------------------
/config/validation.php:
--------------------------------------------------------------------------------
1 | 'string|min:3|max:32|regex:/^[а-яА-Яa-zA-ZЁё][а-яА-Яa-zA-Z0-9Ёё]*?([-_.][а-яА-Яa-zA-Z0-9Ёё]+){0,3}$/u',
14 | 'email' => 'email',
15 | 'emailLabel' => 'string|min:3|max:20',
16 | 'phoneLabel' => 'string|min:3|max:20',
17 | 'password' => 'required|string|min:5',
18 | 'reset_password_token' => 'required',
19 | 'first_name' => 'alpha|min:3|max:10',
20 | 'last_name' => 'alpha|min:3|max:15'
21 | ];
22 |
--------------------------------------------------------------------------------
/config/view.php:
--------------------------------------------------------------------------------
1 | [
17 | resource_path('views'),
18 | ],
19 |
20 | /*
21 | |--------------------------------------------------------------------------
22 | | Compiled View Path
23 | |--------------------------------------------------------------------------
24 | |
25 | | This option determines where all the compiled Blade templates will be
26 | | stored for your application. Typically, this is within the storage
27 | | directory. However, as usual, you are free to change this value.
28 | |
29 | */
30 |
31 | 'compiled' => realpath(storage_path('framework/views')),
32 |
33 | ];
34 |
--------------------------------------------------------------------------------
/database/.gitignore:
--------------------------------------------------------------------------------
1 | *.sqlite
2 |
--------------------------------------------------------------------------------
/database/migrations/2014_10_12_000000_create_users_table.php:
--------------------------------------------------------------------------------
1 | increments('id');
18 | $table->string('nickname')->unique();
19 | $table->string('password')->nullable(); // если через соц сеть то может не быть пароля
20 | $table->string('first_name')->nullable();
21 | $table->string('last_name')->nullable();
22 | $table->string('country')->nullable(); // ISO 3166-1
23 | $table->string('timezone')->default(config('app.timezone'));
24 | $table->boolean('gender')->nullable();
25 | $table->date('birthday')->nullable();
26 | $table->json('avatar')->nullable();
27 | $table->timestamps();
28 | });
29 | }
30 |
31 | /**
32 | * Reverse the migrations.
33 | *
34 | * @return void
35 | */
36 | public function down()
37 | {
38 | Schema::dropIfExists('users');
39 | }
40 | }
41 |
--------------------------------------------------------------------------------
/database/migrations/2014_10_12_100000_create_password_resets_table.php:
--------------------------------------------------------------------------------
1 | string('email')->index();
18 | $table->string('token');
19 | $table->timestamp('created_at')->nullable();
20 | });
21 | }
22 |
23 | /**
24 | * Reverse the migrations.
25 | *
26 | * @return void
27 | */
28 | public function down()
29 | {
30 | Schema::dropIfExists('password_resets');
31 | }
32 | }
33 |
--------------------------------------------------------------------------------
/database/migrations/2018_07_10_081531_create_users_passwords_history_table.php:
--------------------------------------------------------------------------------
1 | increments('id');
18 | $table->string('password');
19 | $table->unsignedInteger('user_id');
20 | $table->timestamps();
21 |
22 | $table->foreign('user_id')
23 | ->references('id')
24 | ->on('users')
25 | ->onDelete('CASCADE');
26 | });
27 | }
28 |
29 | /**
30 | * Reverse the migrations.
31 | *
32 | * @return void
33 | */
34 | public function down()
35 | {
36 | Schema::dropIfExists('users_passwords_history');
37 | }
38 | }
39 |
--------------------------------------------------------------------------------
/database/seeds/DatabaseSeeder.php:
--------------------------------------------------------------------------------
1 | call(SocialiteProvidersTableSeeder::class);
15 | $this->call(UsersTableSeeder::class);
16 | }
17 | }
18 |
--------------------------------------------------------------------------------
/phpunit.xml:
--------------------------------------------------------------------------------
1 |
2 |