CFM-496_REST_API_v2_DELETE_CO_Group_returns_400

app/src/Controller/ApiUsersController.php

@@ -56,9 +56,11 @@ public function generate(string $id) {
       $this->Flash->error($e->getMessage());
     }
 
-    [$title, , ] = StringUtilities::entityAndActionToTitle(null,
-                                                           'api.key',
-                                                           $this->request->getParam('action'));
+    [$title, , ] = StringUtilities::entityAndActionToTitle(
+      null,
+      null,
+      'api.key.' . $this->request->getParam('action'),
+    );
     $this->set('vv_title', $title);
 
     // Render the view.

app/src/Controller/ApiV2Controller.php

@@ -193,13 +193,12 @@ public function delete($id) {
     try {
       $obj = $table->findById($id)->firstOrFail();
 
-// XXX document AR-CO-1 when we implement hard delete/changelog
-//     note similar logic in StandardController
-      $table->deleteOrFail($obj);
-
       if(method_exists($obj, "isReadOnly") && $obj->isReadOnly()) {
         throw new BadRequestException(__d('error', 'edit.readonly'));
       }
+// XXX document AR-CO-1 when we implement hard delete/changelog
+//     note similar logic in StandardController
+      $table->deleteOrFail($obj);
 
       // Trigger provisioning, letting errors bubble up (AR-GMR-5)
       if(method_exists($table, "requestProvisioning")) {

app/src/Controller/Component/RegistryAuthComponent.php

@@ -245,12 +245,17 @@ public function beforeFilter(EventInterface $event) {
         $this->llog('debug', "User authorization failed: " . $e->getMessage());
 
         $ApiUsers = TableRegistry::getTableLocator()->get('ApiUsers');
-
-        if($ApiUsers->getUserPrivilege($this->authenticatedUser) === true) {
+
+        $priv = $ApiUsers->getUserPrivilege($this->authenticatedUser);
+        $apiUserCoId = $this->cache['api_user']['co_id'] ?? null;
+
+        if ($priv === true || ($apiUserCoId !== null && $priv === $apiUserCoId)) {
+          // Platform API user, or privileged API user for this CO:
+          // let the RecordNotFoundException bubble up.
           throw $e;
-        } else {
-          throw new UnauthorizedException(__d('error', 'auth.api.failed'));
         }
+
+        throw new UnauthorizedException(__d('error', 'auth.api.failed'));
       }
       catch(\Exception $e) {
         $this->llog('debug', $e->getMessage());

app/src/Controller/ExternalIdentitySourcesController.php

@@ -187,9 +187,11 @@ public function search(string $id) {
 
     $this->set('vv_search_attrs', $this->ExternalIdentitySources->searchableAttributes((int)$id));
 
-    [$title, , ] = StringUtilities::entityAndActionToTitle(null,
-                                                           $this->getName(),
-                                                           $this->request->getParam('action'));
+    [$title, , ] = StringUtilities::entityAndActionToTitle(
+      null,
+      null,
+      $this->getName() . '.search',
+    );
     $this->set('vv_title', $title);
   }
 

app/src/Controller/StandardController.php

@@ -252,6 +252,13 @@ public function delete($id) {
     try {
       $obj = $table->findById($id)->firstOrFail();
 
+      // Align with REST API: do not allow delete of read-only records
+      if (method_exists($obj, "isReadOnly") && $obj->isReadOnly()) {
+        $this->Flash->error(__d('error', 'edit.readonly'));
+        // Redirect to view, as we do for read-only edits
+        return $this->redirect(['action' => 'view', $obj->id]);
+      }
+
       // By default, a delete is a soft delete. The exceptions is when
       // deleting a CO (AR-CO-1). In v4, we permitted a controller level
       // flag to be set, but the only controller this really applies to

app/src/Model/Table/ApiUsersTable.php

@@ -175,11 +175,11 @@ public function generateKey(int $id) {
    * 
    * @since  COmanage Registry v5.0.0
    * @param  string $username API Username
-   * @return mixed            true if $username is a platform API user, an integer (the CO ID) if the user is a privileged API user within that CO, or false otherwise
+   * @return bool|int         true if $username is a platform API user, an integer (the CO ID) if the user is a privileged API user within that CO, or false otherwise
    * @throws InvalidArgumentException
    */
 
-  public function getUserPrivilege(string $username) {
+  public function getUserPrivilege(string $username): bool|int {
     $apiUser = $this->find()->where(['username' => $username])->contain('Cos')->first();
 
     if(empty($apiUser)) {