From 0768f10a952532613c0da1b0d3c04502cbf51ce7 Mon Sep 17 00:00:00 2001
From: Taran Vohra <taranvohra@outlook.com>
Date: Wed, 9 Aug 2023 17:40:11 +0530
Subject: [PATCH] Hotfix OAuth handler crashing (#208)

* use optional chaining

* changeset
---
 .changeset/good-seahorses-sin.md | 5 +++++
 packages/runtime/src/oauth.ts    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/good-seahorses-sin.md

diff --git a/.changeset/good-seahorses-sin.md b/.changeset/good-seahorses-sin.md
new file mode 100644
index 000000000..dcea9a413
--- /dev/null
+++ b/.changeset/good-seahorses-sin.md
@@ -0,0 +1,5 @@
+---
+'@gitbook/runtime': patch
+---
+
+Fix OAuth handler crashing due lack of optional chaining use while reading spaceInstallation
diff --git a/packages/runtime/src/oauth.ts b/packages/runtime/src/oauth.ts
index fee33cc91..13b9ffadc 100644
--- a/packages/runtime/src/oauth.ts
+++ b/packages/runtime/src/oauth.ts
@@ -103,8 +103,8 @@ export function createOAuthHandler(
                 'state',
                 JSON.stringify({
                     installationId: environment.installation.id,
-                    ...(environment.spaceInstallation.space
-                        ? { spaceId: environment.spaceInstallation.space }
+                    ...(environment.spaceInstallation?.space
+                        ? { spaceId: environment.spaceInstallation?.space }
                         : {}),
                 })
             );