sant0ro / chocolatey

app/Http/Controllers/AccountController.php

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 
         DB::table('users')->where('mail', $mailRequest->mail)->update(['mail_verified' => 1]);
 
-        if($request->user() !== null)
+        if ($request->user() !== null)
             $request->user()->mailVerified = true;
 
         return response()->json(['email' => $mailRequest->mail, 'emailVerified' => true, 'identityVerified' => true]);

Braces +21 added lines, -14 removed lines

@@ -27,8 +27,9 @@ 
      */
     public function checkName(Request $request): JsonResponse
     {
-        if (User::where('username', $request->json()->get('name'))->count() > 0)
-            return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]);
+        if (User::where('username', $request->json()->get('name'))->count() > 0) {
+                    return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]);
+        }
 
         return response()->json(['code' => 'OK', 'validationResult' => null, 'suggestions' => []]);
     }
@@ -76,8 +77,9 @@ 
      */
     public function selectRoom(Request $request): JsonResponse
     {
-        if (!in_array($request->json()->get('roomIndex'), [1, 2, 3]))
-            return response('', 400);
+        if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) {
+                    return response('', 400);
+        }
 
         $request->user()->traits = ["USER"];
 
@@ -107,8 +109,9 @@ 
     {
         $userPreferences = UserPreferences::find($request->user()->uniqueId);
 
-        foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue)
-            $userPreferences->{$attributeName} = $attributeValue == 1;
+        foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) {
+                    $userPreferences->{$attributeName} = $attributeValue == 1;
+        }
 
         return response()->json($userPreferences);
     }
@@ -154,8 +157,9 @@ 
      */
     public function checkNewName(Request $request): JsonResponse
     {
-        if (User::where('username', $request->input('name'))->count() > 0)
-            return response()->json(['isAvailable' => false]);
+        if (User::where('username', $request->input('name'))->count() > 0) {
+                    return response()->json(['isAvailable' => false]);
+        }
 
         return response()->json(['isAvailable' => true]);
     }
@@ -168,8 +172,9 @@ 
      */
     public function createAvatar(Request $request): JsonResponse
     {
-        if (User::where('username', $request->json()->get('name'))->count() > 0)
-            return response()->json(['isAvailable' => false]);
+        if (User::where('username', $request->json()->get('name'))->count() > 0) {
+                    return response()->json(['isAvailable' => false]);
+        }
 
         $request->user()->name = $request->json()->get('name');
 
@@ -222,15 +227,17 @@ 
     {
         $mailRequest = Mail::where('token', $request->json()->get('token'))->where('used', '0')->first();
 
-        if ($mailRequest == null)
-            return response()->json(['error' => 'activation.invalid_token'], 400);
+        if ($mailRequest == null) {
+                    return response()->json(['error' => 'activation.invalid_token'], 400);
+        }
 
         $mailRequest->update(['used' => '1']);
 
         DB::table('users')->where('mail', $mailRequest->mail)->update(['mail_verified' => 1]);
 
-        if($request->user() !== null)
-            $request->user()->mailVerified = true;
+        if($request->user() !== null) {
+                    $request->user()->mailVerified = true;
+        }
 
         return response()->json(['email' => $mailRequest->mail, 'emailVerified' => true, 'identityVerified' => true]);
     }

app/Http/Controllers/AccountSecurityController.php

Braces +33 added lines, -22 removed lines

@@ -29,8 +29,9 @@ 
      */
     public function featureStatus(Request $request): Response
     {
-        if ($request->user()->emailVerified == false)
-            return response('identity_verification_required', 200);
+        if ($request->user()->emailVerified == false) {
+                    return response('identity_verification_required', 200);
+        }
 
         $featureEnabled = UserSecurity::find($request->user()->uniqueId);
 
@@ -45,8 +46,9 @@ 
      */
     public function saveQuestions(Request $request): JsonResponse
     {
-        if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0)
-            return response()->json(['error' => 'invalid_password'], 400);
+        if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0) {
+                    return response()->json(['error' => 'invalid_password'], 400);
+        }
 
         UserSecurity::updateOrCreate([
             'user_id' => $request->user()->uniqueId,
@@ -94,12 +96,14 @@ 
      */
     public function changePassword(Request $request): JsonResponse
     {
-        if (strlen($request->json()->get('password')) < 6)
-            return response()->json(['error' => 'password.current_password.invalid'], 409);
+        if (strlen($request->json()->get('password')) < 6) {
+                    return response()->json(['error' => 'password.current_password.invalid'], 409);
+        }
 
         //@TODO: This search the whole base. If anyone has the same password.. This will give error. Is this good?
-        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() >= 1)
-            return response()->json(['error' => 'password.used_earlier'], 409);
+        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() >= 1) {
+                    return response()->json(['error' => 'password.used_earlier'], 409);
+        }
 
         User::find($request->user()->uniqueId)->update(['password' => hash('sha256', $request->json()->get('password'))]);
 
@@ -117,14 +121,17 @@ 
      */
     public function changeMail(Request $request): JsonResponse
     {
-        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0)
-            return response()->json(['error' => 'changeEmail.invalid_password'], 400);
+        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) {
+                    return response()->json(['error' => 'changeEmail.invalid_password'], 400);
+        }
 
-        if (strpos($request->json()->get('newEmail'), '@') == false)
-            return response()->json(['error' => 'registration_email'], 400);
+        if (strpos($request->json()->get('newEmail'), '@') == false) {
+                    return response()->json(['error' => 'registration_email'], 400);
+        }
 
-        if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0)
-            return response()->json(['error' => 'changeEmail.email_already_in_use'], 400);
+        if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) {
+                    return response()->json(['error' => 'changeEmail.email_already_in_use'], 400);
+        }
 
         // @TODO: In the future the e-mail only will be changed after e-mail confirmation
         $request->user()->update(['mail' => $request->json()->get('newEmail')]);
@@ -142,8 +149,9 @@ 
      */
     public function getQuestions(Request $request): JsonResponse
     {
-        if (UserSecurity::find($request->user()->uniqueId) == null)
-            return response()->json('');
+        if (UserSecurity::find($request->user()->uniqueId) == null) {
+                    return response()->json('');
+        }
 
         $userSecurity = UserSecurity::find($request->user()->uniqueId);
 
@@ -170,8 +178,9 @@ 
                 ->where('firstAnswer', $request->json()->get('answer1'))
                 ->where('secondAnswer', $request->json()->get('answer2'))->count() > 0
         ):
-            if ($request->json()->get('trust') == true)
-                (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save();
+            if ($request->json()->get('trust') == true) {
+                            (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save();
+            }
 
             return response()->json('', 204);
         endif;
@@ -189,13 +198,15 @@ 
     {
         $mailRequest = Mail::where('token', $request->json()->get('token'))->where('used', '0')->first();
 
-        if ($mailRequest == null)
-            return response()->json('', 404);
+        if ($mailRequest == null) {
+                    return response()->json('', 404);
+        }
 
         if (User::where('mail', $mailRequest->mail)
                 ->where('password', hash('sha256', $request->json()->get('password')))->count() >= 1
-        )
-            return response()->json(['error' => 'password.used_earlier'], 400);
+        ) {
+                    return response()->json(['error' => 'password.used_earlier'], 400);
+        }
 
         $mailRequest->update(['used' => '1']);