diff --git a/resources/js/components/Auth/SocialiteAuthenticationButtons.vue b/resources/js/components/Auth/SocialiteAuthenticationButtons.vue
index f4f228b8..ff7629d3 100644
--- a/resources/js/components/Auth/SocialiteAuthenticationButtons.vue
+++ b/resources/js/components/Auth/SocialiteAuthenticationButtons.vue
@@ -1,14 +1,14 @@
-
-
+
+
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
index e753f766..15235674 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
@@ -1,30 +1,71 @@
+
+
- {{ $t('admin_settings.others.section_user') }}
+ {{ $t('Storage & Upload') }}
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/routes/admin.php b/routes/admin.php
index 84c9d47a..f7fd8f54 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -9,6 +9,7 @@ use Domain\Admin\Controllers\Users\DeleteUserController;
use Domain\Settings\Controllers\GetSettingsValueController;
use Domain\Admin\Controllers\Dashboard\GetNewbiesController;
use Domain\Admin\Controllers\Users\ChangeUserRoleController;
+use Domain\Settings\Controllers\StoreSocialServiceCredentialsController;
use Domain\Settings\Controllers\UpdateSettingValueController;
use Domain\Admin\Controllers\Users\ResetUserPasswordController;
use Domain\Admin\Controllers\Dashboard\GetWidgetsValuesController;
@@ -46,6 +47,7 @@ Route::group(['prefix' => 'settings'], function () {
Route::post('/email', SetEmailController::class);
Route::post('/payment-service', StorePaymentServiceCredentialsController::class);
+ Route::post('/social-service', StoreSocialServiceCredentialsController::class);
});
// Language
diff --git a/src/App/Socialite/Controllers/SocialiteCallbackController.php b/src/App/Socialite/Controllers/SocialiteCallbackController.php
index 0e207816..203f2c65 100644
--- a/src/App/Socialite/Controllers/SocialiteCallbackController.php
+++ b/src/App/Socialite/Controllers/SocialiteCallbackController.php
@@ -18,28 +18,40 @@ class SocialiteCallbackController extends Controller
public function __invoke($provider)
{
+ $isAllowedRegistration = intval(get_settings('registration'));
+
// Get socialite user
if (app()->runningUnitTests()) {
- $provider_user = Socialite::driver($provider)->user();
+ $socialite = Socialite::driver($provider)->user();
} else {
- $provider_user = Socialite::driver($provider)->stateless()->user();
+ $socialite = Socialite::driver($provider)->stateless()->user();
}
- // Check if user exist already
- $user = User::where('email', $provider_user->email)->first();
+ // Get user by email
+ $user = User::where('email', $socialite->email);
- // Login User
- if ($user) {
- $this->guard->login($user);
+ // Login user when exists
+ if ($user->exists()) {
+ $this->guard->login(
+ $user->first()
+ );
return response('User logged in', 201);
}
+ // Check if account registration is enabled
+ if (! $isAllowedRegistration) {
+ return response([
+ 'type' => 'error',
+ 'message' => 'User registration is not allowed',
+ ], 401);
+ }
+
// Create data user data object
$data = CreateUserData::fromArray([
- 'name' => $provider_user->getName(),
- 'email' => $provider_user->getEmail(),
- 'avatar' => store_socialite_avatar($provider_user->getAvatar()),
+ 'name' => $socialite->getName(),
+ 'email' => $socialite->getEmail(),
+ 'avatar' => store_socialite_avatar($socialite->getAvatar()),
'oauth_provider' => $provider,
]);
diff --git a/src/App/Users/Actions/CreateNewUserAction.php b/src/App/Users/Actions/CreateNewUserAction.php
index 325b4a5c..e92ead14 100644
--- a/src/App/Users/Actions/CreateNewUserAction.php
+++ b/src/App/Users/Actions/CreateNewUserAction.php
@@ -1,6 +1,7 @@
$data->password ? bcrypt($data->password) : null,
diff --git a/src/App/Users/Controllers/Authentication/RegisterUserController.php b/src/App/Users/Controllers/Authentication/RegisterUserController.php
index b471892d..f4f31761 100644
--- a/src/App/Users/Controllers/Authentication/RegisterUserController.php
+++ b/src/App/Users/Controllers/Authentication/RegisterUserController.php
@@ -10,11 +10,18 @@ class RegisterUserController extends Controller
{
public function __construct(
public CreateNewUserAction $createNewUser,
- ) {
- }
+ ) {}
public function __invoke(RegisterUserRequest $request)
{
+ // Check if account registration is enabled
+ if (! intval(get_settings('registration'))) {
+ return response([
+ 'type' => 'error',
+ 'message' => 'User registration is not allowed',
+ ], 401);
+ }
+
// Map registration data
$data = CreateUserData::fromRequest($request);
diff --git a/src/Domain/Settings/Controllers/StoreSocialServiceCredentialsController.php b/src/Domain/Settings/Controllers/StoreSocialServiceCredentialsController.php
new file mode 100644
index 00000000..45c414e3
--- /dev/null
+++ b/src/Domain/Settings/Controllers/StoreSocialServiceCredentialsController.php
@@ -0,0 +1,56 @@
+ "allowed_{$request->input('service')}_login",
+ ], [
+ 'value' => 1,
+ ]);
+
+ // Get and store credentials
+ if (! app()->runningUnitTests()) {
+ $credentials = [
+ 'facebook' => [
+ 'FACEBOOK_CLIENT_ID' => $request->input('client_id'),
+ 'FACEBOOK_CLIENT_SECRET' => $request->input('client_secret'),
+ ],
+ 'google' => [
+ 'GOOGLE_CLIENT_ID' => $request->input('client_id'),
+ 'GOOGLE_CLIENT_SECRET' => $request->input('client_secret'),
+ ],
+ 'github' => [
+ 'GITHUB_CLIENT_ID' => $request->input('client_id'),
+ 'GITHUB_CLIENT_SECRET' => $request->input('client_secret'),
+ ],
+ ];
+
+ // Store credentials into the .env file
+ setEnvironmentValue($credentials[$request->input('service')]);
+
+ // Clear cache
+ if (! is_dev()) {
+ Artisan::call('cache:clear');
+ Artisan::call('config:clear');
+ Artisan::call('config:cache');
+ }
+ }
+
+ return response('Done', 204);
+ }
+}
diff --git a/src/Domain/Settings/Requests/StoreSocialServiceCredentialsRequest.php b/src/Domain/Settings/Requests/StoreSocialServiceCredentialsRequest.php
new file mode 100644
index 00000000..370c8821
--- /dev/null
+++ b/src/Domain/Settings/Requests/StoreSocialServiceCredentialsRequest.php
@@ -0,0 +1,32 @@
+ 'required|string',
+ 'client_secret' => 'required|string',
+ 'service' => 'required|string',
+ ];
+ }
+}
diff --git a/tests/Domain/Settings/SettingsTest.php b/tests/Domain/Settings/SettingsTest.php
index fe0ef1b5..d82e41d5 100644
--- a/tests/Domain/Settings/SettingsTest.php
+++ b/tests/Domain/Settings/SettingsTest.php
@@ -1,4 +1,5 @@
actingAs($admin)
->post('/api/admin/settings/payment-service', [
- 'service' => 'stripe',
- 'key' => '123456789',
- 'secret' => '123456789',
+ 'service' => 'stripe',
+ 'key' => '123456789',
+ 'secret' => '123456789',
])->assertStatus(204);
$this->assertDatabaseHas('settings', [
@@ -157,6 +158,28 @@ class SettingsTest extends TestCase
]);
}
+ /**
+ * @test
+ */
+ public function it_store_social_service_credentials()
+ {
+ $admin = User::factory()
+ ->create(['role' => 'admin']);
+
+ $this
+ ->actingAs($admin)
+ ->post('/api/admin/settings/social-service', [
+ 'client_id' => '123456789',
+ 'client_secret' => '123456789',
+ 'service' => 'facebook',
+ ])->assertStatus(204);
+
+ $this->assertDatabaseHas('settings', [
+ 'name' => 'allowed_facebook_login',
+ 'value' => 1,
+ ]);
+ }
+
/**
* @test
*/
+
+
+
+
-
+
-
-
-
-
+
@@ -16,6 +16,7 @@
-
-
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 289f8762..458f2f61 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -352,6 +352,14 @@ const FunctionHelpers = {
}[driver] || this.$getImage(store.getters.config.app_logo_horizontal)
}
+ Vue.prototype.$getSocialLogo = function (driver) {
+ return {
+ 'google': '/assets/socials/google.svg',
+ 'facebook': '/assets/socials/facebook.svg',
+ 'github': store.getters.isDarkMode ? '/assets/socials/github-dark.svg' : '/assets/socials/github.svg',
+ }[driver]
+ }
+
Vue.prototype.$getSubscriptionStatusColor = function (status) {
return {
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index 292238d8..b6a72ef7 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -105,6 +105,22 @@ const mutations = {
STORE_REQUESTED_PLAN(state, plan) {
state.requestedPlan = plan
},
+ SET_SOCIAL_LOGIN_CONFIGURED(state, service) {
+ if (service === 'facebook') {
+ state.config.allowedFacebookLogin = true
+ state.config.isFacebookLoginConfigured = true
+ }
+
+ if (service === 'google') {
+ state.config.allowedGoogleLogin = true
+ state.config.isGoogleLoginConfigured = true
+ }
+
+ if (service === 'github') {
+ state.config.allowedGithubLogin = true
+ state.config.isGithubLoginConfigured = true
+ }
+ },
SET_STRIPE_CREDENTIALS(state, data) {
state.config.stripe_public_key = data.key
state.config.isStripe = true
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index 0a0ee2c7..e6b0f420 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -1,6 +1,8 @@
import axios from 'axios'
import router from '/resources/js/router'
import Vue from 'vue'
+import {events} from "../../bus";
+import i18n from "../../i18n";
const defaultState = {
permission: 'master', // master | editor | visitor
@@ -49,13 +51,12 @@ const actions = {
})
},
socialiteRedirect: ({commit}, provider) => {
-
axios
.get(`/api/socialite/${provider}/redirect`)
- .then((response) => {
- if(response.data.url) {
+ .then(response => {
+ if (response.data.url) {
window.location.href = response.data.url
- }
+ }
})
.catch(() => this.$isSomethingWrong())
},
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
index 1326e7c1..11f9937c 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
@@ -5,17 +5,17 @@
{{ $t('admin_settings.appearance.section_general') }}
+
G
+
+
-
-
+
+
+
+
+
+
+
+ {{ $t('Application') }}
+
+
+
+
+ {{ $t('admin_settings.others.cache_clear') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('User Login/Registration') }}
+
+
-
+
+
+
-
- {{ $t('admin_settings.others.section_others') }}
-
+ ![Facebook]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('Cache') }}
-
-
-
-
- {{ $t('admin_settings.others.cache_clear') }}
-
+
+
+
+
+
+ {{ $t('Configure Credentials') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Store Credentials') }}
+
+
+
+
+
+
+
+
+
+
+
+ ![Google]()
+
+
+
+
+
+
+ {{ $t('Configure Credentials') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Store Credentials') }}
+
+
+
+
+
+
+
+
+
+
+
+ ![Github]()
+
+
+
+
+
+
+ {{ $t('Configure Credentials') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Store Credentials') }}
+
+
+
+
+
+
+