From 9b25a72025f29ab384d1116721ba4f7818c1d7c8 Mon Sep 17 00:00:00 2001
From: Christel Westerberg <christel.westerberg@scandichotels.com>
Date: Mon, 26 Feb 2024 16:34:44 +0100
Subject: [PATCH] fix: install design repo with access token

---
 .env.local.example                      | 3 ++-
 components/Current/Aside/Puff/index.tsx | 2 +-
 env/server.ts                           | 2 ++
 package-lock.json                       | 5 +++--
 package.json                            | 5 +++--
 types/requests/puff.ts                  | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.env.local.example b/.env.local.example
index 5b058d208..e62eb3856 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -4,4 +4,5 @@ CMS_ENVIRONMENT="development"
 CMS_URL="https://eu-graphql.contentstack.com/stacks/${CMS_API_KEY}?environment=${CMS_ENVIRONMENT}"
 CMS_PREVIEW_URL="https://graphql-preview.contentstack.com/stacks/${CMS_API_KEY}?environment=${CMS_ENVIRONMENT}";
 CMS_PREVIEW_TOKEN=""
-ADOBE_SCRIPT_SRC=""
\ No newline at end of file
+ADOBE_SCRIPT_SRC=""
+REPOSITORY_ACCESS_TOKEN=""
diff --git a/components/Current/Aside/Puff/index.tsx b/components/Current/Aside/Puff/index.tsx
index f5aad9c17..3568d4292 100644
--- a/components/Current/Aside/Puff/index.tsx
+++ b/components/Current/Aside/Puff/index.tsx
@@ -45,7 +45,7 @@ export default function Puff({
               renderOptions={renderOptions}
             />
             <div>
-              <Button onPress={onClick}>{link.title}</Button>
+              <Button onPress={onClick}>{link.title || title}</Button>
             </div>
           </section>
         </article>
diff --git a/env/server.ts b/env/server.ts
index 36581221f..faf3b62af 100644
--- a/env/server.ts
+++ b/env/server.ts
@@ -15,6 +15,7 @@ export const env = createEnv({
     NODE_ENV: z.enum(["development", "test", "production"]),
     PRINT_QUERY: z.boolean().default(false),
     REVALIDATE_SECRET: z.string(),
+    REPOSITORY_ACCESS_TOKEN: z.string(),
   },
   emptyStringAsUndefined: true,
   runtimeEnv: {
@@ -30,5 +31,6 @@ export const env = createEnv({
     NODE_ENV: process.env.NODE_ENV,
     PRINT_QUERY: process.env.PRINT_QUERY,
     REVALIDATE_SECRET: process.env.REVALIDATE_SECRET,
+    REPOSITORY_ACCESS_TOKEN: process.env.REPOSITORY_ACCESS_TOKEN,
   },
 })
diff --git a/package-lock.json b/package-lock.json
index 85c432e52..5b4101134 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,10 +7,11 @@
     "": {
       "name": "web",
       "version": "0.1.0",
+      "hasInstallScript": true,
       "dependencies": {
         "@contentstack/live-preview-utils": "^1.4.0",
         "@netlify/plugin-nextjs": "^5.0.0-beta.9",
-        "@scandic-hotels/design-system": "git+ssh://git@scandichotels.bitbucket.org:scandic-swap/design-system.git#v0.1.0-rc.1",
+        "@scandic-hotels/design-system": "git+https://x-token-auth:$REPOSITORY_ACCESS_TOKEN@bitbucket.org/scandic-swap/design-system.git#v0.1.0-rc.1",
         "@t3-oss/env-nextjs": "^0.9.2",
         "class-variance-authority": "^0.7.0",
         "graphql": "^16.8.1",
@@ -589,7 +590,7 @@
     },
     "node_modules/@scandic-hotels/design-system": {
       "version": "0.1.0",
-      "resolved": "git+ssh://git@scandichotels.bitbucket.org:scandic-swap/design-system.git#fa01fbbf819145fd69e9685232a6a254c0ff7f07",
+      "resolved": "git+https://x-token-auth:ATCTT3xFfGN0gu4BSBWR71ifMM-_iAT2ip_jnjF0OjTkYhEB3sn71fPCGuMUA7O3BxJ2oHptZVGAlVvMUoeo3Wfute7RYido9HlvrVjemqns9hR3WSf6eNHhsSy5bLtxQ6VK7mnSSAGHaCqTejxirs_PmOB_jPIi1Ft4OEDehtnMxCteg8rO-IE%3D27DF8E0B@bitbucket.org/scandic-swap/design-system.git#fa01fbbf819145fd69e9685232a6a254c0ff7f07",
       "peerDependencies": {
         "react": "^18.2.0",
         "react-aria-components": "^1.0.1",
diff --git a/package.json b/package.json
index b34baacdb..7d3e05956 100644
--- a/package.json
+++ b/package.json
@@ -13,13 +13,14 @@
     "test:component:headless": "cypress run --component",
     "test:e2e": "start-server-and-test test:setup http://127.0.0.1:3000/en/test \"cypress open --e2e\"",
     "test:e2e:headless": "start-server-and-test test:setup http://127.0.0.1:3000/en/test \"cypress run --e2e\"",
-    "test:setup": "npm run build && npm run start"
+    "test:setup": "npm run build && npm run start",
+    "preinstall": "export $(cat .env.local | grep -v '^#' | xargs)"
   },
   "dependencies": {
     "@contentstack/live-preview-utils": "^1.4.0",
     "@netlify/plugin-nextjs": "^5.0.0-beta.9",
+    "@scandic-hotels/design-system": "git+https://x-token-auth:$REPOSITORY_ACCESS_TOKEN@bitbucket.org/scandic-swap/design-system.git#v0.1.0-rc.1",
     "@t3-oss/env-nextjs": "^0.9.2",
-    "@scandic-hotels/design-system": "git+ssh://git@scandichotels.bitbucket.org:scandic-swap/design-system.git#v0.1.0-rc.1",
     "class-variance-authority": "^0.7.0",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
diff --git a/types/requests/puff.ts b/types/requests/puff.ts
index 1c3d6d8a8..ddcd247bf 100644
--- a/types/requests/puff.ts
+++ b/types/requests/puff.ts
@@ -11,7 +11,7 @@ export type Puff = {
   imageConnection: Edges<Image>
   link: {
     href: string
-    title: string
+    title?: string
   }
   puff_style: PuffStyleEnum
   text: {