return 404 status in RPC when iModel is not open (#3330) (#3333)

* return 404 status in RPC when iModel is not open * remove redundant throw * remove unused import (cherry picked from commit 71e8a16) Co-authored-by: Paulius Valiūnas <[email protected]> Co-authored-by: Caleb Shafer <[email protected]>
iTwin · Mar 10, 2022 · b39abc2 · b39abc2
1 parent e1dc420
commit b39abc2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/common/changes/@itwin/core-backend/imodel-not-open-404_2022-03-10-14-47.json b/common/changes/@itwin/core-backend/imodel-not-open-404_2022-03-10-14-47.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-backend",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-backend"
+}
diff --git a/common/changes/@itwin/core-common/imodel-not-open-404_2022-03-10-14-47.json b/common/changes/@itwin/core-common/imodel-not-open-404_2022-03-10-14-47.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-common",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-common"
+}
diff --git a/core/backend/src/rpc-impl/RpcBriefcaseUtility.ts b/core/backend/src/rpc-impl/RpcBriefcaseUtility.ts
@@ -113,9 +113,7 @@ export class RpcBriefcaseUtility {
    * @param the IModelRpcProps to locate the opened iModel.
    */
   public static async findOpenIModel(accessToken: AccessToken, iModel: IModelRpcProps) {
-    const iModelDb = IModelDb.tryFindByKey(iModel.key);
-    if (undefined === iModelDb)
-      throw new IModelError(IModelStatus.NotOpen, "iModel is not opened", () => iModel);
+    const iModelDb = IModelDb.findByKey(iModel.key);
 
     // call reattach, just in case this is a V2 checkpoint whose accessToken is about to expire.
     await iModelDb.reattachDaemon(accessToken);

diff --git a/core/common/src/rpc/core/RpcInvocation.ts b/core/common/src/rpc/core/RpcInvocation.ts
@@ -216,15 +216,12 @@ export class RpcInvocation {
 
     const result = await RpcMarshaling.serialize(this.protocol, reason);
 
-    let isNoContentError = false;
-    try { isNoContentError = reason.errorNumber === IModelStatus.NoContent; } catch { }
-
     if (reason instanceof RpcPendingResponse) {
       this._pending = true;
       this._threw = false;
       result.objects = reason.message;
       this.protocol.events.raiseEvent(RpcProtocolEvent.BackendReportedPending, this);
-    } else if (this.supportsNoContent() && isNoContentError) {
+    } else if (this.supportsNoContent() && reason?.errorNumber === IModelStatus.NoContent) {
       this._noContent = true;
       this._threw = false;
       this.protocol.events.raiseEvent(RpcProtocolEvent.BackendReportedNoContent, this);