Return id instead of model when looking up by invite token

And minor polish

Author: Andrewdt97

src/Api/Model/Shared/InviteToken.php

@@ -16,7 +16,4 @@ public function __construct() {
 
     /** @var LexRole */
     public $defaultRole;
-
-    /** @var boolean */
-    public $isEnabled;
 }

src/Api/Model/Shared/ProjectModel.php

@@ -220,7 +220,6 @@ public function addUser($userId, $role)
     /**
      * Adds the $userId as a member of this project.
      * @param string $userId
-     * @param string $role The system role the user has.
      * @see Roles;
      */
     public function addUserByInviteToken($userId)
@@ -463,24 +462,20 @@ public static function getById($projectId)
      * @return ProjectModel
      * @throws ResourceNotAvailableException
      */
-    public static function getByInviteToken($token)
+    public static function getIdByInviteToken($token)
     {
         $model = new ProjectModel();
         $model->readByProperty('inviteToken.token', $token);
         switch ($model->appName) {
             case 'sfchecks':
-                return new SfchecksProjectModel($model->id->id);
             case 'rapuma':
-                return new RapumaProjectModel($model->id->id);
             case 'lexicon':
-                return new LexProjectModel($model->id->id);
             case 'translate':
-                return new TranslateProjectModel($model->id->id);
             case 'semdomtrans':
-                return new SemDomTransProjectModel($model->id->id);
+                return $model->id->id;
             default:
                 throw new ResourceNotAvailableException(
-                    "inviteToken '$token' could not be found when calling ProjectModel::getByInviteToke()");
+                    "inviteToken '$token' could not be found when calling ProjectModel::getIdByInviteToken()");
         }
     }
 

src/Site/Controller/App.php

@@ -7,8 +7,8 @@
 use Api\Library\Shared\SilexSessionHelper;
 use Api\Library\Shared\Website;
 use Api\Model\Languageforge\LfProjectModel;
-use Api\Model\Shared\Command\ProjectCommands;
 use Api\Model\Shared\ProjectModel;
+use Api\Model\Shared\Command\ProjectCommands;
 use Api\Model\Shared\UserModel;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Request;
@@ -27,6 +27,7 @@ public function view(
         /** @noinspection PhpUnusedParameterInspection */
         Request $request, Application $app, $appName, $projectId = ''
     ) {
+        // Check if an invite token should be processed
         if (($appName == LfProjectModel::LEXICON_APP || $appName == 'projects') && $app['session']->get('inviteToken'))
         {
             try
@@ -164,13 +165,13 @@ private function processInviteToken(Application $app)
     {
         try
         {
-            $model = ProjectModel::getByInviteToken($app['session']->get('inviteToken'));
+            $projectId = ProjectModel::getIdByInviteToken($app['session']->get('inviteToken'));
         } catch (ResourceNotAvailableException $e)
         {
             throw new ResourceNotAvailableException('This invite link is not valid, it may have been disabled. Please check with your project manager.');
         }
         $userId = SilexSessionHelper::getUserId($app);
-        ProjectCommands::useInviteToken($userId, $model->id->id);
+        ProjectCommands::useInviteToken($userId, $projectId);
 
         return $model->id->id;
     }

src/Site/Controller/Validate.php

@@ -2,7 +2,6 @@
 
 namespace Site\Controller;
 
-use Api\Model\Languageforge\LfProjectModel;
 use Api\Model\Shared\Command\ProjectCommands;
 use Api\Library\Shared\SilexSessionHelper;
 use Api\Library\Shared\Palaso\Exception\ResourceNotAvailableException;
@@ -40,7 +39,7 @@ public function processInviteAndRedirect(Application $app, $inviteToken = '')
         // Attempt to find the project with the given invite link
         try
         {
-            $model = ProjectModel::getByInviteToken($inviteToken);
+            $projectId = ProjectModel::getIdByInviteToken($inviteToken);
 
         } catch (ResourceNotAvailableException $e)
         {
@@ -55,8 +54,8 @@ public function processInviteAndRedirect(Application $app, $inviteToken = '')
         // Add the user based on the invite token if they are logged in, otherwise redirect to login
         if ($this->isLoggedIn($app))
         {
-            ProjectCommands::useInviteToken(SilexSessionHelper::getUserId($app), $model->id->id);
-            return $app->redirect('/app/lexicon/' . $model->id->id);
+            ProjectCommands::useInviteToken(SilexSessionHelper::getUserId($app), $projectId);
+            return $app->redirect('/app/lexicon/' . $projectId);
         } else
         {
             $app['session']->set('inviteToken', $inviteToken);

src/angular-app/bellows/apps/public/login/login-app.component.ts

@@ -3,8 +3,8 @@ import * as angular from 'angular';
 import { NoticeService } from '../../../core/notice/notice.service';
 
 export class LoginAppController implements angular.IController {
-  static $inject = ['silNoticeService', 'loginPath'];
-  constructor(private notice: NoticeService, private loginPath: any) { }
+  static $inject = ['silNoticeService'];
+  constructor(private notice: NoticeService) { }
 
   $onInit() {
     this.notice.checkUrlForNotices();

src/angular-app/bellows/apps/public/login/login-app.module.ts

@@ -8,8 +8,5 @@ export const LoginAppModule = angular
     'ui.bootstrap',
     CoreModule
   ])
-  .value('loginPath', "pasta")
-  .value('last_username', '{{ last_username }}')
-  // .controller('LoginCtrl', () => {})
   .component('loginApp', LoginAppComponent)
   .name;