Browse Source

add email whitelist config

Tokumeikoi 5 years ago
parent
commit
078e1e7bd6

+ 3 - 8
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();

+ 0 - 1
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');
         });
     }
 }