From bb558b4c61d93336e95707f4c5c7a46be2fb7441 Mon Sep 17 00:00:00 2001
From: Dan Goss <freemvmt@posteo.net>
Date: Thu, 5 Sep 2024 19:05:08 +0100
Subject: [PATCH] [api] minor edits

---
 .env.example                        | 4 ++++
 .github/workflows/pull-request.yml  | 1 +
 api.planx.uk/tsconfig.json          | 2 +-
 api.planx.uk/tsconfig.test.json     | 7 -------
 editor.planx.uk/src/pages/Login.tsx | 5 ++---
 5 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 api.planx.uk/tsconfig.test.json

diff --git a/.env.example b/.env.example
index 222a893a48..ee53588dc0 100644
--- a/.env.example
+++ b/.env.example
@@ -16,6 +16,10 @@ SESSION_SECRET=👻
 GOOGLE_CLIENT_ID=👻
 GOOGLE_CLIENT_SECRET=👻
 
+# Microsoft Azure OIDC credentials
+MICROSOFT_CLIENT_ID=👻
+MICROSOFT_CLIENT_SECRET=👻
+
 # AWS credentials for uploading user files from local and pull request environments to a staging S3 bucket
 AWS_S3_REGION=eu-west-2
 AWS_S3_ACL=public-read
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index a4948c5fda..519f02eca8 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -215,6 +215,7 @@ jobs:
           VITE_APP_SHAREDB_URL: wss://sharedb.${{ env.FULL_DOMAIN }}
           # needed because there's no API to change google's allowed OAuth URLs
           VITE_APP_GOOGLE_OAUTH_OVERRIDE: https://api.editor.planx.dev
+          VITE_APP_MICROSOFT_OAUTH_OVERRIDE: https://api.editor.planx.dev
           VITE_APP_ENV: pizza
         working-directory: ${{ env.EDITOR_DIRECTORY }}
       - run: pnpm build-storybook
diff --git a/api.planx.uk/tsconfig.json b/api.planx.uk/tsconfig.json
index 63ed4456b5..91fa3cb1b1 100644
--- a/api.planx.uk/tsconfig.json
+++ b/api.planx.uk/tsconfig.json
@@ -15,7 +15,7 @@
     "strict": true,
     "target": "esnext",
     "types": ["vitest/globals"],
-    // ensure the code is ready for transpilation by tsx/esbuild (used in dev)
+    // ensure the code is ready for per-file transpilation by tsx (used in dev mode)
     "isolatedModules": true,
     // TODO: implement "verbatimModuleSyntax" option (laborious)
   },
diff --git a/api.planx.uk/tsconfig.test.json b/api.planx.uk/tsconfig.test.json
deleted file mode 100644
index ea5b7c77b4..0000000000
--- a/api.planx.uk/tsconfig.test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "esnext",
-    "moduleResolution": "bundler"
-  }
-}
diff --git a/editor.planx.uk/src/pages/Login.tsx b/editor.planx.uk/src/pages/Login.tsx
index edc44dad54..07407b6efe 100644
--- a/editor.planx.uk/src/pages/Login.tsx
+++ b/editor.planx.uk/src/pages/Login.tsx
@@ -67,12 +67,11 @@ const Login: React.FC = () => {
           </Box>
         </LoginButton>
         <LoginButton
-          disabled
           variant="contained"
           color="secondary"
           href={`${
-            process.env.REACT_APP_MICROSOFT_OAUTH_OVERRIDE ??
-            process.env.REACT_APP_API_URL
+            import.meta.env.VITE_APP_MICROSOFT_OAUTH_OVERRIDE ??
+            import.meta.env.VITE_APP_API_URL
           }/auth/microsoft`}
         >
           <Box component="span">