diff --git a/app/Http/Controllers/Passport/CommController.php b/app/Http/Controllers/Passport/CommController.php index 516623a3..b026b4a0 100644 --- a/app/Http/Controllers/Passport/CommController.php +++ b/app/Http/Controllers/Passport/CommController.php @@ -21,7 +21,9 @@ class CommController extends Controller 'data' => [ 'isEmailVerify' => (int)config('v2board.email_verify', 0) ? 1 : 0, 'isInviteForce' => (int)config('v2board.invite_force', 0) ? 1 : 0, - 'isEmailSuffix' => (int)config('v2board.email_suffix_enable', 0) ? 1 : 0 + 'emailSuffixWhiteList' => (int)config('v2board.email_suffix_enable', 0) + ? config('v2board.email_suffix_whitelist', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT) + : 0 ] ]); } @@ -60,13 +62,6 @@ class CommController extends Controller ]); } - public function getEmailSuffix() - { - return response([ - 'data' => config('v2board.email_suffix_whitelist', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT) - ]); - } - public function pv(Request $request) { $inviteCode = InviteCode::where('code', $request->input('invite_code'))->first(); diff --git a/app/Http/Routes/PassportRoute.php b/app/Http/Routes/PassportRoute.php index 0d6588d4..63ac4b43 100644 --- a/app/Http/Routes/PassportRoute.php +++ b/app/Http/Routes/PassportRoute.php @@ -19,7 +19,6 @@ class PassportRoute // Comm $router->get ('/comm/config', 'Passport\\CommController@config'); $router->post('/comm/sendEmailVerify', 'Passport\\CommController@sendEmailVerify'); - $router->get ('/comm/getEmailSuffix', 'Passport\\CommController@getEmailSuffix'); }); } }