Merge pull request #575 from bakaphp/branch-0.2.2

[0.2] Update to 0.3

Author: rwhite27

.github/workflows/test.yml

@@ -108,6 +108,14 @@ jobs:
       - name: Phinx Migrate Kanvas Seed
         run: vendor/bin/phinx seed:run
 
-      - name: Run all test suites
+      - name: Run Integration
         if: success()
-        run: vendor/bin/codecept run
+        run: vendor/bin/codecept run integration
+
+      - name: Run Unit
+        if: success()
+        run: vendor/bin/codecept run unit
+
+      - name: Run Api
+        if: success()
+        run: vendor/bin/codecept run api

routes/api.php

@@ -61,7 +61,8 @@
     Route::post('/roles-accesslist/{id}/copy')->controller('RolesAccessListController')->action('copy'),
     Route::get('/custom-fields-modules/{id}/fields')->controller('CustomFieldsModulesController')->action('customFieldsByModulesId'),
     Route::put('/apps-plans/{id}/method')->controller('AppsPlansController')->action('updatePaymentMethod'),
-    Route::get('/apps-plans/{id}/method')->controller('PaymentMethodsCredsController')->action('getCurrentPaymentMethodsCreds'),
+    Route::get('/apps-plans/{id}/method')->controller('PaymentMethodsCredentialsController')->action('getCurrentPaymentMethods'),
+    //Route::get('/apps-plans/{id}/method')->controller('PaymentMethodsCredsController')->action('getCurrentPaymentMethodsCreds'),
     Route::get('/schema/{slug}')->controller('SchemaController')->action('getBySlug'),
     Route::get('/schema/{slug}/description')->controller('SchemaController')->action('getModelDescription'),
     Route::post('/users/{hash}/change-email')->controller('AuthController')->action('changeUserEmail'),

src/Acl/Manager.php

@@ -186,7 +186,7 @@ public function addRole($role, $scope = 0, $accessInherits = null) : bool
         if (!RolesDB::exist($role)) {
             $rolesDB = new RolesDB();
             $rolesDB->name = $role->getName();
-            $rolesDB->description = $role->getDescription() ?? $role->getName();
+            $rolesDB->description = $role->getDescription() ?: $role->getName();
             $rolesDB->companies_id = $this->getCompany()->getId();
             $rolesDB->apps_id = $this->getApp()->getId();
             $rolesDB->scope = $scope;

src/Api/Controllers/AppsPlansController.php

@@ -4,20 +4,18 @@
 
 namespace Canvas\Api\Controllers;
 
-use Canvas\Models\AppsPlans;
-use Stripe\Token as StripeToken;
-use Phalcon\Http\Response;
-use Stripe\Customer as StripeCustomer;
-use Phalcon\Validation\Validator\PresenceOf;
 use Baka\Http\Exception\NotFoundException;
-use Baka\Http\Exception\UnauthorizedException;
 use Baka\Http\Exception\UnprocessableEntityException;
+use Baka\Validation as CanvasValidation;
+use Canvas\Models\AppsPlans;
+use Canvas\Models\PaymentMethodsCredentials;
 use Canvas\Models\Subscription as CanvasSubscription;
-use Phalcon\Cashier\Subscription;
 use Canvas\Models\UserCompanyApps;
-use function Baka\paymentGatewayIsActive;
-use Baka\Validation as CanvasValidation;
-use Canvas\Models\PaymentMethodsCreds;
+use Phalcon\Cashier\Subscription;
+use Phalcon\Http\Response;
+use Phalcon\Validation\Validator\PresenceOf;
+use Stripe\Customer as StripeCustomer;
+use Stripe\Token as StripeToken;
 
 /**
  * Class LanguagesController.
@@ -70,6 +68,7 @@ public function onConstruct()
      * Update a given subscription.
      *
      * @param string $stripeId
+     *
      * @return Response
      */
     public function edit($stripeId) : Response
@@ -127,9 +126,10 @@ public function edit($stripeId) : Response
      * Cancel a given subscription.
      *
      * @param string $stripeId
+     *
      * @return Response
      */
-    public function delete($stripeId): Response
+    public function delete($stripeId) : Response
     {
         $appPlan = $this->model->findFirstByStripeId($stripeId);
 
@@ -154,9 +154,10 @@ public function delete($stripeId): Response
      * Reactivate a given subscription.
      *
      * @param string $stripeId
+     *
      * @return Response
      */
-    public function reactivateSubscription($stripeId): Response
+    public function reactivateSubscription($stripeId) : Response
     {
         $appPlan = $this->model->findFirstByStripeId($stripeId);
 
@@ -179,10 +180,12 @@ public function reactivateSubscription($stripeId): Response
 
     /**
      * Update payment method.
-     * @param integer $id
+     *
+     * @param int $id
+     *
      * @return Response
      */
-    public function updatePaymentMethod(string $id): Response
+    public function updatePaymentMethod(string $id) : Response
     {
         if (empty($this->request->hasPut('card_token'))) {
             $validation = new CanvasValidation();
@@ -235,9 +238,8 @@ public function updatePaymentMethod(string $id): Response
         }
 
         if (is_object($stripeCustomer) && $stripeCustomer instanceof StripeCustomer) {
-
             //We now create a partially persist the payment method data
-            PaymentMethodsCreds::createByStripeToken($token);
+            PaymentMethodsCredentials::createByStripeToken($token);
             return $this->response($subscription);
         }
         return $this->response('Card could not be updated');

src/Api/Controllers/AuthController.php

@@ -6,17 +6,18 @@
 
 use Baka\Auth\Models\Sessions;
 use Baka\Auth\Models\Users as BakaUsers;
+use Baka\Auth\UserProvider;
 use Baka\Http\Exception\InternalServerErrorException;
 use Baka\Http\Exception\NotFoundException;
 use Baka\Validation as CanvasValidation;
 use Baka\Validations\PasswordValidation;
 use Canvas\Auth\Auth;
 use Canvas\Auth\Factory;
 use Canvas\Exception\ModelException;
+use Canvas\Models\RegisterRoles;
 use Canvas\Models\Sources;
 use Canvas\Models\UserLinkedSources;
 use Canvas\Models\Users;
-use Canvas\Models\RegisterRoles;
 use Canvas\Notifications\PasswordUpdate;
 use Canvas\Notifications\ResetPassword;
 use Canvas\Notifications\Signup;
@@ -127,7 +128,7 @@ public function login() : Response
      */
     public function signup() : Response
     {
-        $user = $this->userModel;
+        $user = UserProvider::get();
 
         $request = $this->request->getPostData();
 
@@ -211,7 +212,7 @@ public function signup() : Response
      */
     public function signupByRegisterRole() : Response
     {
-        $user = $this->userModel;
+        $user = UserProvider::get();
 
         $request = $this->request->getPostData();
 
@@ -243,7 +244,7 @@ public function signupByRegisterRole() : Response
         //validate this form for password
         $validation->validate($request);
 
-        $registerRole = RegisterRoles::getByUuid($request["roles_uuid"]);
+        $registerRole = RegisterRoles::getByUuid($request['roles_uuid']);
 
         $user->email = $validation->getValue('email');
         $user->firstname = $validation->getValue('firstname');
@@ -309,15 +310,19 @@ public function refresh() : Response
         }
 
         //Check if both tokens relate to the same user's email
-        if ($accessToken->getClaim('sessionId') == $refreshToken->getClaim('sessionId')) {
+        if ($accessToken->getClaim('sessionId') === $refreshToken->getClaim('sessionId')) {
             $user = Users::getByEmail($accessToken->getClaim('email'));
         }
 
         if (!$user) {
             throw new NotFoundException(_('User not found'));
         }
 
-        $token = Sessions::restart($user, $refreshToken->getClaim('sessionId'), (string)$this->request->getClientAddress());
+        $token = Sessions::restart(
+            $user,
+            $refreshToken->getClaim('sessionId'),
+            (string)$this->request->getClientAddress()
+        );
 
         return $this->response([
             'token' => $token['token'],

src/Api/Controllers/IndexController.php

@@ -87,6 +87,18 @@ public function status() : Response
             $response['errors']['db'] = "The database isn't working.";
         }
 
+        if ($this->di->has('dbLocal')) {
+            try {
+                $this->dbLocal->connect();
+            } catch (PDOException $e) {
+                $this->log->error($e->getMessage(), $e->getTrace());
+                $response['errors']['dbLocal'] = $e->getMessage();
+            } catch (Exception $e) {
+                $this->log->error("The database isn't working. {$e->getMessage()}", $e->getTrace());
+                $response['errors']['dbLocal'] = "The database isn't working.";
+            }
+        }
+
         if (!count($response)) {
             return $this->response(['OK']);
         }

src/Api/Controllers/PaymentMethodsCredsController.php src/Api/Controllers/PaymentMethodsCredentialsController.php

@@ -4,7 +4,7 @@
 
 namespace Canvas\Api\Controllers;
 
-use Canvas\Models\PaymentMethodsCreds;
+use Canvas\Models\PaymentMethodsCredentials;
 use Exception;
 use Phalcon\Http\Response;
 
@@ -14,7 +14,7 @@
  * @package Canvas\Api\Controllers
  *
  */
-class PaymentMethodsCredsController extends BaseController
+class PaymentMethodsCredentialsController extends BaseController
 {
     /*
      * fields we accept to create
@@ -37,7 +37,7 @@ class PaymentMethodsCredsController extends BaseController
      */
     public function onConstruct()
     {
-        $this->model = new PaymentMethodsCreds();
+        $this->model = new PaymentMethodsCredentials();
         $this->additionalSearchFields = [
             ['is_deleted', ':', '0'],
             ['users_id', ':', $this->userData->getId()],
@@ -51,7 +51,7 @@ public function onConstruct()
      *
      * @return Response
      */
-    public function getCurrentPaymentMethodsCreds() : Response
+    public function getCurrentPaymentMethods() : Response
     {
         $paymentMethod = [];
 

src/Api/Controllers/RolesController.php

@@ -4,8 +4,10 @@
 
 namespace Canvas\Api\Controllers;
 
-use Canvas\Models\Roles;
+use Baka\Http\Exception\ForbiddenException;
 use Canvas\Models\Apps;
+use Canvas\Models\Roles;
+use Phalcon\Http\Response;
 
 class RolesController extends BaseController
 {
@@ -33,10 +35,55 @@ public function onConstruct()
         $this->model = new Roles();
 
         //get the list of roes for the systems + my company
+        $companyTotalRoles = Roles::count([
+            'conditions' => 'apps_id = :apps_id: AND companies_id = :companies_id:',
+            'bind' => [
+                'apps_id' => $this->acl->getApp()->getId(),
+                'companies_id' => $this->userData->currentCompanyId(),
+            ]
+        ]);
+
         $this->additionalSearchFields = [
             ['is_deleted', ':', '0'],
-            ['apps_id', ':', Apps::CANVAS_DEFAULT_APP_ID . '|' . $this->acl->getApp()->getId()],
-            ['companies_id', ':', '1|' . $this->userData->currentCompanyId()],
+            ['apps_id', ':',  $this->acl->getApp()->getId()],
+            ['companies_id', ':',  $this->userData->currentCompanyId()],
         ];
+
+        if ($companyTotalRoles === 0) {
+            $this->additionalSearchFields = [
+                ['is_deleted', ':', '0'],
+                ['apps_id', ':', Apps::CANVAS_DEFAULT_APP_ID],
+                ['companies_id', ':', 1],
+                ['is_default', ':', 1],
+            ];
+        }
+    }
+
+    /**
+     * Delete a Record.
+     *
+     * @throws Exception
+     *
+     * @return Response
+     */
+    public function delete($id) : Response
+    {
+        $role = $this->getRecordById($id);
+
+        if ($role->companies_id === Apps::CANVAS_DEFAULT_APP_ID) {
+            throw new ForbiddenException('Cant delete a Global App Role');
+        }
+
+        if ($role->getUsers()->count() > 0) {
+            throw new ForbiddenException('Cant delete a Role in use');
+        }
+
+        if ($this->softDelete) {
+            $role->softDelete();
+        } else {
+            $role->delete();
+        }
+
+        return $this->response(['Delete Successfully']);
     }
 }

src/Api/Controllers/SessionsController.php

@@ -5,12 +5,12 @@
 namespace Canvas\Api\Controllers;
 
 use Baka\Auth\Models\Sessions;
-use Phalcon\Http\Response;
 
 /**
  * Class LanguagesController.
  *
  * @package Canvas\Api\Controllers
+ *
  * @property UserData $userData
  *
  */

src/Api/Controllers/UsersInviteController.php

@@ -107,13 +107,6 @@ public function insertInvite() : Response
         //validate this form for password
         $validation->validate($request);
 
-        //Check if role is not a default one.
-        if (!Roles::existsById((int)$request['role_id'])->isDefault()) {
-            throw new UnprocessableEntityException(
-                "Can't create a new user with a default role."
-            );
-        }
-
         //Check if user was already was invited to current company and return message
         UsersInvite::isValid($request['email'], (int) $request['role_id']);
 
@@ -202,15 +195,11 @@ public function processUserInvite(string $hash) : Response
         //move to DTO
         $newUser->password = null;
 
-        if (!defined('API_TESTS')) {
-            $usersInvite->softDelete();
+        $usersInvite->softDelete();
 
-            return $this->response([
-                'user' => $newUser,
-                'session' => $authInfo
-            ]);
-        }
-
-        return $this->response($newUser);
+        return $this->response([
+            'user' => $newUser,
+            'session' => $authInfo
+        ]);
     }
 }