Hotfix: app google sign in fixes + deploy fixes

deploy.php

@@ -113,7 +113,7 @@
   run('sudo /usr/sbin/service nginx restart');
 });
 task('restart:php-fpm', function () {
-  run('sudo /usr/sbin/service php7.3-fpm restart');
+  run('sudo /usr/sbin/service php7.4-fpm restart');
 });
 task('install:npm', function () {
   cd('{{release_path}}');
@@ -124,6 +124,11 @@
   run('grunt');
 });
 
+task('deploy:jwt', function () {
+  cd('{{release_path}}');
+  run('sh docker/app/init-jwt-config.sh');
+});
+
 /**
  * Main task
  */
@@ -147,6 +152,7 @@
   'database:migrate',
   'install:npm',
   'deploy:grunt',
+  'deploy:jwt',
   'restart:nginx',
   'restart:php-fpm',
   'deploy:unlock',

src/Catrobat/Services/OAuthService.php

@@ -245,15 +245,15 @@ public function loginWithGoogleAction(Request $request): JsonResponse
       'gplusUid' => $google_id,
     ]);
 
-    if (null !== $google_user)
+    if (null !== $google_user && null !== $google_id && '' !== $google_id)
     {
       $google_user->setUploadToken($this->token_generator->generateToken());
       $this->user_manager->updateUser($google_user);
       $retArray['token'] = $google_user->getUploadToken();
       $retArray['username'] = $google_user->getUsername();
-      $this->setLoginOAuthUserStatusCode($retArray);
+      $retArray['statusCode'] = Response::HTTP_OK;
     }
-    else
+    elseif (null !== $google_mail && '' !== $google_mail && null !== $google_username && '' !== $google_username)
     {
       /** @var User|null $user */
       $user = $this->user_manager->findUserByEmail($google_mail);
@@ -265,6 +265,7 @@ public function loginWithGoogleAction(Request $request): JsonResponse
         $this->user_manager->updateUser($user);
         $retArray['token'] = $user->getUploadToken();
         $retArray['username'] = $user->getUsername();
+        $retArray['statusCode'] = Response::HTTP_OK;
       }
     }
 
@@ -486,11 +487,6 @@ private function getAuthenticatedGoogleClientForGPlusUser(?User $user)
     return $client;
   }
 
-  private function setLoginOAuthUserStatusCode(array $retArray): void
-  {
-    $retArray['statusCode'] = StatusCode::OK;
-  }
-
   /**
    * @throws Exception
    */