From ed32ccbc89b9924a81d66ccf8f69e997306283f4 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 1 Feb 2023 09:42:44 +0100
Subject: [PATCH 01/15] feat: acn mircosoft login

---
 .env.example                                  |  3 ++
 packages/frontend/package.json                |  3 ++
 .../src/components/ms-sign-in-button.tsx      | 20 +++++++++
 packages/frontend/src/frontend.tsx            | 12 +++++-
 packages/frontend/src/hooks/ms-auth.ts        | 23 ++++++++++
 packages/frontend/src/pages/login-page.tsx    | 24 ++++++-----
 yarn.lock                                     | 43 +++++++++++++++++--
 7 files changed, 114 insertions(+), 14 deletions(-)
 create mode 100644 packages/frontend/src/components/ms-sign-in-button.tsx
 create mode 100644 packages/frontend/src/hooks/ms-auth.ts

diff --git a/.env.example b/.env.example
index 1190c35..6baa929 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,9 @@
 GOOGLE_API_KEY = secret
 GOOGLE_CLIENT_ID = secret
 
+MICROSOFT_API_KEY = secret
+MICROSOFT_CLIENT_ID = secret
+
 AUTH_HEADER = secret
 URL_ORIGIN = lara.exampleCompany
 DEBUG = true
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index d391ec6..00c692a 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -15,7 +15,10 @@
   },
   "dependencies": {
     "@apollo/client": "^3.2.2",
+    "@azure/msal-browser": "^2.32.2",
+    "@azure/msal-react": "^1.5.2",
     "@lara/components": "^1.0.0",
+    "@microsoft/microsoft-graph-client": "^3.0.4",
     "@rebass/grid": "^6.1.0",
     "apollo-link-token-refresh": "^0.4.0",
     "date-fns": "^2.16.1",
diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
new file mode 100644
index 0000000..b7a0fc7
--- /dev/null
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -0,0 +1,20 @@
+import React from 'react'
+import { useMsal } from '@azure/msal-react'
+import { loginRequest } from '../hooks/ms-auth'
+import { PrimaryButton } from './button'
+
+/**
+ * Renders a button which, when selected, will redirect the page to the login prompt
+ */
+export const SignInButton = () => {
+  const { instance } = useMsal()
+
+  const handleLogin = (loginType: any) => {
+    if (loginType === 'redirect') {
+      instance.loginRedirect(loginRequest).catch((e) => {
+        console.log(e)
+      })
+    }
+  }
+  return <PrimaryButton onClick={() => handleLogin('redirect')}>sign in with ACN</PrimaryButton>
+}
diff --git a/packages/frontend/src/frontend.tsx b/packages/frontend/src/frontend.tsx
index 0a0dd3a..64f3534 100644
--- a/packages/frontend/src/frontend.tsx
+++ b/packages/frontend/src/frontend.tsx
@@ -1,9 +1,19 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import { MsalProvider } from '@azure/msal-react'
+import { msalConfig } from './hooks/ms-auth'
 
 import { App } from './app'
+import { PublicClientApplication } from '@azure/msal-browser'
 
-ReactDOM.render(<App />, document.getElementById('app'))
+const msalInstance = new PublicClientApplication(msalConfig)
+
+ReactDOM.render(
+  <MsalProvider instance={msalInstance}>
+    <App />
+  </MsalProvider>,
+  document.getElementById('app')
+)
 
 if (module.hot && ENVIRONMENT.debug) {
   module.hot.accept()
diff --git a/packages/frontend/src/hooks/ms-auth.ts b/packages/frontend/src/hooks/ms-auth.ts
new file mode 100644
index 0000000..b432f9c
--- /dev/null
+++ b/packages/frontend/src/hooks/ms-auth.ts
@@ -0,0 +1,23 @@
+import { PublicClientApplication } from '@azure/msal-browser'
+
+const redirectDomain = 'localhost:8080'
+const redirectUrl = redirectDomain
+const tenantId = 'e0793d39-0939-496d-b129-198edd916feb'
+
+export const msalConfig = {
+  auth: {
+    clientId: 'test',
+    authority: 'https://login.microsoftonline.com/' + tenantId,
+    redirectUri: redirectUrl,
+  },
+  cache: {
+    cacheLocation: 'sessionStorage',
+    storeAuthStateInCookie: false,
+  },
+}
+
+export const loginRequest = {
+  scopes: ['User.Read', 'openid', 'profile'],
+}
+
+export const MyMSALObj = new PublicClientApplication(msalConfig)
diff --git a/packages/frontend/src/pages/login-page.tsx b/packages/frontend/src/pages/login-page.tsx
index 99953a7..75dee2e 100644
--- a/packages/frontend/src/pages/login-page.tsx
+++ b/packages/frontend/src/pages/login-page.tsx
@@ -9,6 +9,7 @@ import { useLoginPageLoginMutation } from '../graphql'
 import { useAuthentication } from '../hooks/use-authentication'
 import { Template } from '../templates/template'
 import { SplashPage } from './splash-page'
+import { SignInButton } from '../components/ms-sign-in-button'
 
 const LoginPage: React.FunctionComponent = () => {
   const { login } = useAuthentication()
@@ -57,16 +58,19 @@ const LoginPage: React.FunctionComponent = () => {
           </Paragraph>
         </Spacer>
         <Paragraph center noMargin>
-          <GoogleLogin
-            render={({ onClick, disabled }) => (
-              <PrimaryButton onClick={onClick} disabled={disabled}>
-                sign in with Google
-              </PrimaryButton>
-            )}
-            clientId={ENVIRONMENT.googleClientID}
-            onSuccess={onLoginSuccess}
-            onFailure={onLoginFailure}
-          />
+          <Spacer bottom="xs">
+            <GoogleLogin
+              render={({ onClick, disabled }) => (
+                <PrimaryButton onClick={onClick} disabled={disabled}>
+                  sign in with Google
+                </PrimaryButton>
+              )}
+              clientId={ENVIRONMENT.googleClientID}
+              onSuccess={onLoginSuccess}
+              onFailure={onLoginFailure}
+            />
+          </Spacer>
+          <SignInButton />
         </Paragraph>
       </Container>
     </Template>
diff --git a/yarn.lock b/yarn.lock
index a02eee6..587a72c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1048,6 +1048,23 @@
   dependencies:
     tslib "^2.3.1"
 
+"@azure/msal-browser@^2.32.2":
+  version "2.32.2"
+  resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.32.2.tgz#b2284773c95656ed52710e82aedd7fe3e86fa38d"
+  integrity sha512-1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g==
+  dependencies:
+    "@azure/msal-common" "^9.0.2"
+
+"@azure/msal-common@^9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-9.0.2.tgz#b01c0faef18125987682e669494163da06449a20"
+  integrity sha512-qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w==
+
+"@azure/msal-react@^1.5.2":
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/@azure/msal-react/-/msal-react-1.5.2.tgz#9d945af2a140e00c3950c1c3fafd1dddb533d12a"
+  integrity sha512-YgtonunuNR00Td/Z+taMKd9df+EnstbEzNd3nS+6oX4AL6kxwkDybF+1EqJEQdofOwGZl3xvifiFpyZZsnr4tA==
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -1548,6 +1565,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.12.5":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
+  integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/template@^7.18.10", "@babel/template@^7.3.3":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
@@ -3476,6 +3500,14 @@
     npmlog "^6.0.2"
     write-file-atomic "^4.0.1"
 
+"@microsoft/microsoft-graph-client@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@microsoft/microsoft-graph-client/-/microsoft-graph-client-3.0.4.tgz#6fc409336574521734379f033787af153828bf5d"
+  integrity sha512-K7GIg/inDukZC2iBhFEvOSoq5ShnlIl8JSRUv8Ksw1iXTtu6kxLmBwF6xY8RZN7CTSJh+5N91aMKu5KeF0/9fA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    tslib "^2.2.0"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -4558,9 +4590,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@^17", "@types/react@^17.0.4", "@types/react@^17.0.9":
-  version "17.0.50"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.50.tgz#39abb4f7098f546cfcd6b51207c90c4295ee81fc"
-  integrity sha512-ZCBHzpDb5skMnc1zFXAXnL3l1FAdi+xZvwxK+PkglMmBrwjpp9nKaWuEvrGnSifCJmBFGxZOOFuwC6KH/s0NuA==
+  version "17.0.53"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab"
+  integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -13842,6 +13874,11 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
+regenerator-runtime@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
 regenerator-runtime@^0.13.4:
   version "0.13.10"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee"

From 665e6380ee7c871edeb5c36825b1e86bf3d09d8d Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Tue, 11 Apr 2023 09:22:38 +0200
Subject: [PATCH 02/15] feat: add microsoft login

---
 .../src/components/ms-sign-in-button.tsx      | 55 ++++++++++++++++---
 packages/frontend/src/hooks/ms-auth.ts        | 13 ++---
 packages/frontend/src/pages/login-page.tsx    |  6 +-
 3 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
index b7a0fc7..655240f 100644
--- a/packages/frontend/src/components/ms-sign-in-button.tsx
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -1,20 +1,57 @@
-import React from 'react'
-import { useMsal } from '@azure/msal-react'
-import { loginRequest } from '../hooks/ms-auth'
+import React, {ButtonHTMLAttributes, useState} from 'react'
+import AppHistory from '../app-history'
 import { PrimaryButton } from './button'
+import {useMsal} from "@azure/msal-react";
+import {loginRequest} from "../hooks/ms-auth";
+import {useAuthentication} from "../hooks/use-authentication";
+import {useLoginPageLoginMutation} from "../graphql";
+import {useIsAuthenticated } from "@azure/msal-react";
 
-/**
- * Renders a button which, when selected, will redirect the page to the login prompt
- */
-export const SignInButton = () => {
-  const { instance } = useMsal()
+export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+  fullsize?: boolean
+}
+export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
+  const { instance, accounts } = useMsal();
+  const [msalAccessToken, setAccessToken] = useState("");
+  const { login } = useAuthentication()
+  const [mutate] = useLoginPageLoginMutation()
+  const isAuthenticated = useIsAuthenticated();
 
+  const RequestMsalAccessToken = () => {
+    const request = {
+      ...loginRequest,
+      account: accounts[0]
+    };
+    // Silently acquires an access token which is then attached to a request for Microsoft Graph data
+    instance.acquireTokenSilent(request).then((response) => {
+      setAccessToken(response.accessToken);
+    }).catch(() => {
+      instance.acquireTokenPopup(request).then((response) => {
+        setAccessToken(response.accessToken);
+      });
+    });
+  }
   const handleLogin = (loginType: any) => {
     if (loginType === 'redirect') {
       instance.loginRedirect(loginRequest).catch((e) => {
         console.log(e)
       })
     }
-  }
+
+    if(isAuthenticated){
+        RequestMsalAccessToken()
+
+        const accessToken = msalAccessToken
+        console.log(accessToken)
+
+        mutate({ variables: { token: accessToken } }).then((response) => {
+          const { data } = response
+          if (!data?.login) {
+            return AppHistory.getInstance().push('/no-user-found')
+          }
+          login(data.login)
+        })
+      }
+    }
   return <PrimaryButton onClick={() => handleLogin('redirect')}>sign in with ACN</PrimaryButton>
 }
diff --git a/packages/frontend/src/hooks/ms-auth.ts b/packages/frontend/src/hooks/ms-auth.ts
index b432f9c..6f219b0 100644
--- a/packages/frontend/src/hooks/ms-auth.ts
+++ b/packages/frontend/src/hooks/ms-auth.ts
@@ -1,13 +1,12 @@
-import { PublicClientApplication } from '@azure/msal-browser'
-
-const redirectDomain = 'localhost:8080'
+const redirectDomain = 'http://localhost:8080'
 const redirectUrl = redirectDomain
-const tenantId = 'e0793d39-0939-496d-b129-198edd916feb'
+const { MICROSOFT_API_KEY } = process.env
+const { MICROSOFT_TENANT_ID } = process.env
 
 export const msalConfig = {
   auth: {
-    clientId: 'test',
-    authority: 'https://login.microsoftonline.com/' + tenantId,
+    clientId: MICROSOFT_API_KEY,
+    authority: 'https://login.microsoftonline.com/' + MICROSOFT_TENANT_ID,
     redirectUri: redirectUrl,
   },
   cache: {
@@ -19,5 +18,3 @@ export const msalConfig = {
 export const loginRequest = {
   scopes: ['User.Read', 'openid', 'profile'],
 }
-
-export const MyMSALObj = new PublicClientApplication(msalConfig)
diff --git a/packages/frontend/src/pages/login-page.tsx b/packages/frontend/src/pages/login-page.tsx
index 75dee2e..69ff712 100644
--- a/packages/frontend/src/pages/login-page.tsx
+++ b/packages/frontend/src/pages/login-page.tsx
@@ -23,12 +23,10 @@ const LoginPage: React.FunctionComponent = () => {
     if (!('getAuthResponse' in googleResponse)) {
       return
     }
-
-    const accessToken = googleResponse.getAuthResponse().access_token
-
+    const accessToken =  googleResponse.getAuthResponse().access_token
+    console.log(accessToken)
     mutate({ variables: { token: accessToken } }).then((response) => {
       const { data } = response
-
       if (!data?.login) {
         return AppHistory.getInstance().push('/no-user-found')
       }

From 8db4b4035a6fbc10331bdac57434cf1215bf4309 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Fri, 2 Jun 2023 17:22:27 +0200
Subject: [PATCH 03/15] feat: email as param for login and removed google login

---
 .env.example                                  |  3 -
 .github/workflows/reusable-build-job.yml      |  2 +
 .github/workflows/reusable-deploy-job.yml     |  2 +
 packages/api/schema.gql                       |  4 +-
 packages/api/src/graphql.ts                   |  4 +-
 packages/backend/src/google-auth.ts           | 15 -----
 .../backend/src/resolvers/auth.resolver.ts    |  5 +-
 packages/backend/src/test/getEnv.js           |  3 +-
 packages/frontend/src/app.tsx                 | 17 +++--
 .../src/components/ms-sign-in-button.tsx      | 67 ++++++++-----------
 packages/frontend/src/frontend.tsx            | 12 +---
 packages/frontend/src/global.d.ts             |  3 +
 packages/frontend/src/graphql/index.tsx       |  8 +--
 .../graphql/mutations/login-page-login.gql    |  4 +-
 packages/frontend/src/hooks/ms-auth.ts        | 11 +--
 packages/frontend/src/pages/login-page.tsx    | 55 +--------------
 packages/frontend/src/routes.tsx              |  1 -
 packages/frontend/webpack.config.js           | 21 +++++-
 readme.md                                     |  6 +-
 19 files changed, 89 insertions(+), 154 deletions(-)
 delete mode 100644 packages/backend/src/google-auth.ts

diff --git a/.env.example b/.env.example
index 6baa929..f007afc 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,3 @@
-GOOGLE_API_KEY = secret
-GOOGLE_CLIENT_ID = secret
-
 MICROSOFT_API_KEY = secret
 MICROSOFT_CLIENT_ID = secret
 
diff --git a/.github/workflows/reusable-build-job.yml b/.github/workflows/reusable-build-job.yml
index 09c9136..2406abb 100644
--- a/.github/workflows/reusable-build-job.yml
+++ b/.github/workflows/reusable-build-job.yml
@@ -26,6 +26,8 @@ jobs:
       MODE: ${{ inputs.mode }}
       AUTH_HEADER: ${{ secrets.AUTH_HEADER }}
       GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+      MICROSOFT_CLIENT_ID = ${{ secrets.MICROSOFT_CLIENT_ID }}
+      MICROSOFT_TENANT_ID = ${{ secrets.MICROSOFT_TENANT_ID }}
       SUPPORT_MAIL: ${{ secrets.SUPPORT_MAIL }}
       URL_ORIGIN: ${{ secrets.URL_ORIGIN }}
       COMPANY_ABBREVIATION: ${{ secrets.COMPANY_ABBREVIATION }}
diff --git a/.github/workflows/reusable-deploy-job.yml b/.github/workflows/reusable-deploy-job.yml
index cafe368..d97def8 100644
--- a/.github/workflows/reusable-deploy-job.yml
+++ b/.github/workflows/reusable-deploy-job.yml
@@ -31,6 +31,8 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
       GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+      MICROSOFT_CLIENT_ID = ${{ secrets.MICROSOFT_CLIENT_ID }}
+      MICROSOFT_TENANT_ID = ${{ secrets.MICROSOFT_TENANT_ID }}
       LARA_SECRET: ${{ secrets.LARA_SECRET }}
       SES_EMAIL: ${{ secrets.SES_EMAIL }}
       SUPPORT_MAIL: ${{ secrets.SUPPORT_MAIL }}
diff --git a/packages/api/schema.gql b/packages/api/schema.gql
index f89bc98..26c2a79 100644
--- a/packages/api/schema.gql
+++ b/packages/api/schema.gql
@@ -140,9 +140,9 @@ type Mutation {
   deleteEntry(id: ID!): MutateEntryPayload!
 
   """
-  Login via google.
+  Login via microsoft
   """
-  login(googleToken: String!): OAuthPayload
+  login(email: String!): OAuthPayload
 
   """
   Unclaims a Trainee by the current Trainer
diff --git a/packages/api/src/graphql.ts b/packages/api/src/graphql.ts
index d30f8fa..3026d89 100644
--- a/packages/api/src/graphql.ts
+++ b/packages/api/src/graphql.ts
@@ -256,7 +256,7 @@ export type GqlMutationLinkAlexaArgs = {
 
 
 export type GqlMutationLoginArgs = {
-  googleToken: Scalars['String'];
+  email: Scalars['String'];
 };
 
 
@@ -770,7 +770,7 @@ export type GqlMutationResolvers<ContextType = Context, ParentType extends GqlRe
   createTrainer?: Resolver<Maybe<GqlResolversTypes['Trainer']>, ParentType, ContextType, RequireFields<GqlMutationCreateTrainerArgs, 'input'>>;
   deleteEntry?: Resolver<GqlResolversTypes['MutateEntryPayload'], ParentType, ContextType, RequireFields<GqlMutationDeleteEntryArgs, 'id'>>;
   linkAlexa?: Resolver<Maybe<GqlResolversTypes['UserInterface']>, ParentType, ContextType, RequireFields<GqlMutationLinkAlexaArgs, 'code' | 'state'>>;
-  login?: Resolver<Maybe<GqlResolversTypes['OAuthPayload']>, ParentType, ContextType, RequireFields<GqlMutationLoginArgs, 'googleToken'>>;
+  login?: Resolver<Maybe<GqlResolversTypes['OAuthPayload']>, ParentType, ContextType, RequireFields<GqlMutationLoginArgs, 'email'>>;
   markUserForDeletion?: Resolver<Maybe<GqlResolversTypes['UserInterface']>, ParentType, ContextType, RequireFields<GqlMutationMarkUserForDeletionArgs, 'id'>>;
   unclaimTrainee?: Resolver<Maybe<GqlResolversTypes['TrainerTraineePayload']>, ParentType, ContextType, RequireFields<GqlMutationUnclaimTraineeArgs, 'id'>>;
   unlinkAlexa?: Resolver<Maybe<GqlResolversTypes['UserInterface']>, ParentType, ContextType>;
diff --git a/packages/backend/src/google-auth.ts b/packages/backend/src/google-auth.ts
deleted file mode 100644
index 804a378..0000000
--- a/packages/backend/src/google-auth.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import fetch from 'node-fetch'
-
-const { GOOGLE_API_KEY } = process.env
-if (!GOOGLE_API_KEY) {
-  throw new Error("Missing Environment Variable: 'GOOGLE_API_KEY'")
-}
-
-export const validateToken = async (token: string): Promise<string> => {
-  const url = 'https://www.googleapis.com/oauth2/v2/tokeninfo'
-  const params = `?key=${GOOGLE_API_KEY}&access_token=${token}`
-
-  return fetch(url + params)
-    .then((res) => res.json())
-    .then((json) => json.email)
-}
diff --git a/packages/backend/src/resolvers/auth.resolver.ts b/packages/backend/src/resolvers/auth.resolver.ts
index 2d90b9f..fbed342 100644
--- a/packages/backend/src/resolvers/auth.resolver.ts
+++ b/packages/backend/src/resolvers/auth.resolver.ts
@@ -4,7 +4,6 @@ import { GraphQLError } from 'graphql'
 
 import { GqlResolvers } from '@lara/api'
 
-import { validateToken } from '../google-auth'
 import { t } from '../i18n'
 import { isDebug } from '../permissions'
 import { saveUser, userByEmail, userById } from '../repositories/user.repo'
@@ -27,9 +26,7 @@ const createMockUser = async (email: string) => {
 
 export const authResolver: GqlResolvers = {
   Mutation: {
-    login: async (_parent, { googleToken }) => {
-      const email = await validateToken(googleToken)
-
+    login: async (_parent, { email }) => {
       if (!email) {
         return
       }
diff --git a/packages/backend/src/test/getEnv.js b/packages/backend/src/test/getEnv.js
index 7afe322..7146c9d 100644
--- a/packages/backend/src/test/getEnv.js
+++ b/packages/backend/src/test/getEnv.js
@@ -12,7 +12,8 @@ process.env = {
 
   GOOGLE_API_KEY: 'secret',
   GOOGLE_CLIENT_ID: 'secret',
-
+  MICROSOFT_CLIENT_ID: 'secret',
+  MICROSOFT_TENANT_ID: 'secret',
   AUTH_HEADER: 'secret',
   DEBUG: true,
 
diff --git a/packages/frontend/src/app.tsx b/packages/frontend/src/app.tsx
index 4d1979c..906e723 100644
--- a/packages/frontend/src/app.tsx
+++ b/packages/frontend/src/app.tsx
@@ -11,16 +11,23 @@ import { AuthenticatedState, AuthenticationContext } from './hooks/use-authentic
 import { SplashPage } from './pages/splash-page'
 import Routes from './routes'
 import ThemeProvider from './theme-provider'
+import { MsalProvider } from '@azure/msal-react'
+import { msalConfig } from './hooks/ms-auth'
 
+import { PublicClientApplication } from '@azure/msal-browser'
+
+const msalInstance = new PublicClientApplication(msalConfig)
 export const App: React.FunctionComponent = () => {
   const [authenticated, setAuthenticated] = React.useState<AuthenticatedState>('loading')
 
   return (
-    <AuthenticationContext.Provider value={{ authenticated, setAuthenticated }}>
-      <ApolloProvider>
-        <InnerApp />
-      </ApolloProvider>
-    </AuthenticationContext.Provider>
+    <MsalProvider instance={msalInstance}>
+      <AuthenticationContext.Provider value={{ authenticated, setAuthenticated }}>
+        <ApolloProvider>
+          <InnerApp />
+        </ApolloProvider>
+      </AuthenticationContext.Provider>
+    </MsalProvider>
   )
 }
 
diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
index 655240f..0479285 100644
--- a/packages/frontend/src/components/ms-sign-in-button.tsx
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -1,57 +1,48 @@
-import React, {ButtonHTMLAttributes, useState} from 'react'
+import React, { ButtonHTMLAttributes } from 'react'
 import AppHistory from '../app-history'
 import { PrimaryButton } from './button'
-import {useMsal} from "@azure/msal-react";
-import {loginRequest} from "../hooks/ms-auth";
-import {useAuthentication} from "../hooks/use-authentication";
-import {useLoginPageLoginMutation} from "../graphql";
-import {useIsAuthenticated } from "@azure/msal-react";
+import { useMsal } from '@azure/msal-react'
+import { loginRequest } from '../hooks/ms-auth'
+import { useAuthentication } from '../hooks/use-authentication'
+import { useLoginPageLoginMutation } from '../graphql'
+import { useIsAuthenticated } from '@azure/msal-react'
 
 export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
   fullsize?: boolean
 }
 export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
-  const { instance, accounts } = useMsal();
-  const [msalAccessToken, setAccessToken] = useState("");
+  const { instance, accounts } = useMsal()
   const { login } = useAuthentication()
   const [mutate] = useLoginPageLoginMutation()
-  const isAuthenticated = useIsAuthenticated();
+  const isAuthenticated = useIsAuthenticated()
 
-  const RequestMsalAccessToken = () => {
-    const request = {
-      ...loginRequest,
-      account: accounts[0]
-    };
-    // Silently acquires an access token which is then attached to a request for Microsoft Graph data
-    instance.acquireTokenSilent(request).then((response) => {
-      setAccessToken(response.accessToken);
-    }).catch(() => {
-      instance.acquireTokenPopup(request).then((response) => {
-        setAccessToken(response.accessToken);
-      });
-    });
-  }
-  const handleLogin = (loginType: any) => {
+  const handleLogin = async (loginType: any) => {
     if (loginType === 'redirect') {
       instance.loginRedirect(loginRequest).catch((e) => {
         console.log(e)
       })
     }
-
-    if(isAuthenticated){
-        RequestMsalAccessToken()
-
-        const accessToken = msalAccessToken
-        console.log(accessToken)
-
-        mutate({ variables: { token: accessToken } }).then((response) => {
-          const { data } = response
-          if (!data?.login) {
-            return AppHistory.getInstance().push('/no-user-found')
-          }
-          login(data.login)
-        })
+    if (isAuthenticated) {
+      const request = {
+        ...loginRequest,
+        account: accounts[0],
       }
+      instance
+        .acquireTokenSilent(request)
+        .then((response) => {
+          console.log(response)
+          mutate({ variables: { email: response.account?.username ?? '' } }).then((response) => {
+            const { data } = response
+            if (!data?.login) {
+              return AppHistory.getInstance().push('/no-user-found')
+            }
+            login(data.login)
+          })
+        })
+        .catch((e) => {
+          console.log(e)
+        })
     }
+  }
   return <PrimaryButton onClick={() => handleLogin('redirect')}>sign in with ACN</PrimaryButton>
 }
diff --git a/packages/frontend/src/frontend.tsx b/packages/frontend/src/frontend.tsx
index 64f3534..0a0dd3a 100644
--- a/packages/frontend/src/frontend.tsx
+++ b/packages/frontend/src/frontend.tsx
@@ -1,19 +1,9 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import { MsalProvider } from '@azure/msal-react'
-import { msalConfig } from './hooks/ms-auth'
 
 import { App } from './app'
-import { PublicClientApplication } from '@azure/msal-browser'
 
-const msalInstance = new PublicClientApplication(msalConfig)
-
-ReactDOM.render(
-  <MsalProvider instance={msalInstance}>
-    <App />
-  </MsalProvider>,
-  document.getElementById('app')
-)
+ReactDOM.render(<App />, document.getElementById('app'))
 
 if (module.hot && ENVIRONMENT.debug) {
   module.hot.accept()
diff --git a/packages/frontend/src/global.d.ts b/packages/frontend/src/global.d.ts
index 8df0f2d..aef311f 100644
--- a/packages/frontend/src/global.d.ts
+++ b/packages/frontend/src/global.d.ts
@@ -23,8 +23,11 @@ declare const ENVIRONMENT: {
   name: string
   debug: boolean
   googleClientID: string
+  microsoftClientID: string
+  microsoftTenantID: string
   authHeader: string
   backendUrl: string
+  frontendUrl: string
   supportMail: string
 }
 
diff --git a/packages/frontend/src/graphql/index.tsx b/packages/frontend/src/graphql/index.tsx
index 6af9264..7fe4f3c 100644
--- a/packages/frontend/src/graphql/index.tsx
+++ b/packages/frontend/src/graphql/index.tsx
@@ -255,7 +255,7 @@ export type MutationLinkAlexaArgs = {
 
 
 export type MutationLoginArgs = {
-  googleToken: Scalars['String'];
+  email: Scalars['String'];
 };
 
 
@@ -637,7 +637,7 @@ export type LinkAlexaMutationVariables = Exact<{
 export type LinkAlexaMutation = { __typename?: 'Mutation', linkAlexa?: { __typename?: 'Admin', id: string, alexaSkillLinked?: boolean | undefined } | { __typename?: 'Trainee', id: string, alexaSkillLinked?: boolean | undefined } | { __typename?: 'Trainer', id: string, alexaSkillLinked?: boolean | undefined } | undefined };
 
 export type LoginPageLoginMutationVariables = Exact<{
-  token: Scalars['String'];
+  email: Scalars['String'];
 }>;
 
 
@@ -1136,8 +1136,8 @@ export function useLinkAlexaMutation(baseOptions?: Apollo.MutationHookOptions<Li
       }
 export type LinkAlexaMutationHookResult = ReturnType<typeof useLinkAlexaMutation>;
 export const LoginPageLoginDocument = gql`
-    mutation LoginPageLogin($token: String!) {
-  login(googleToken: $token) {
+    mutation LoginPageLogin($email: String!) {
+  login(email: $email) {
     accessToken
     refreshToken
     expiresIn
diff --git a/packages/frontend/src/graphql/mutations/login-page-login.gql b/packages/frontend/src/graphql/mutations/login-page-login.gql
index f960d88..5963147 100644
--- a/packages/frontend/src/graphql/mutations/login-page-login.gql
+++ b/packages/frontend/src/graphql/mutations/login-page-login.gql
@@ -1,5 +1,5 @@
-mutation LoginPageLogin($token: String!) {
-  login(googleToken: $token) {
+mutation LoginPageLogin($email: String!) {
+  login(email: $email) {
     accessToken
     refreshToken
     expiresIn
diff --git a/packages/frontend/src/hooks/ms-auth.ts b/packages/frontend/src/hooks/ms-auth.ts
index 6f219b0..0397b67 100644
--- a/packages/frontend/src/hooks/ms-auth.ts
+++ b/packages/frontend/src/hooks/ms-auth.ts
@@ -1,13 +1,8 @@
-const redirectDomain = 'http://localhost:8080'
-const redirectUrl = redirectDomain
-const { MICROSOFT_API_KEY } = process.env
-const { MICROSOFT_TENANT_ID } = process.env
-
 export const msalConfig = {
   auth: {
-    clientId: MICROSOFT_API_KEY,
-    authority: 'https://login.microsoftonline.com/' + MICROSOFT_TENANT_ID,
-    redirectUri: redirectUrl,
+    clientId: ENVIRONMENT.microsoftClientID ?? '',
+    authority: 'https://login.microsoftonline.com/' + ENVIRONMENT.microsoftTenantID,
+    redirectUri: ENVIRONMENT.frontendUrl,
   },
   cache: {
     cacheLocation: 'sessionStorage',
diff --git a/packages/frontend/src/pages/login-page.tsx b/packages/frontend/src/pages/login-page.tsx
index 69ff712..b8c1c36 100644
--- a/packages/frontend/src/pages/login-page.tsx
+++ b/packages/frontend/src/pages/login-page.tsx
@@ -1,73 +1,22 @@
-import React, { useState } from 'react'
-import { GoogleLogin, GoogleLoginResponse, GoogleLoginResponseOffline } from 'react-google-login'
-
+import React from 'react'
 import { Container, Paragraph, Spacer, StyledLogo } from '@lara/components'
 
-import AppHistory from '../app-history'
-import { PrimaryButton } from '../components/button'
-import { useLoginPageLoginMutation } from '../graphql'
-import { useAuthentication } from '../hooks/use-authentication'
 import { Template } from '../templates/template'
-import { SplashPage } from './splash-page'
 import { SignInButton } from '../components/ms-sign-in-button'
 
 const LoginPage: React.FunctionComponent = () => {
-  const { login } = useAuthentication()
-  const [mutate] = useLoginPageLoginMutation()
-
-  const [authLoading, setAuthLoading] = useState(false)
-
-  const onLoginSuccess = (googleResponse: GoogleLoginResponse | GoogleLoginResponseOffline) => {
-    setAuthLoading(true)
-
-    if (!('getAuthResponse' in googleResponse)) {
-      return
-    }
-    const accessToken =  googleResponse.getAuthResponse().access_token
-    console.log(accessToken)
-    mutate({ variables: { token: accessToken } }).then((response) => {
-      const { data } = response
-      if (!data?.login) {
-        return AppHistory.getInstance().push('/no-user-found')
-      }
-
-      login(data.login)
-    })
-  }
-
-  const onLoginFailure = (error: string) => {
-    console.log('Login error', error)
-    return
-  }
-
-  if (authLoading) {
-    return <SplashPage />
-  }
-
   return (
     <Template type={'Secondary'}>
       <Spacer bottom="xxl">
         <StyledLogo width="250" />
       </Spacer>
       <Container flat paddingY="xl" paddingX="xxl">
-        <Spacer bottom="xl">
+        <Spacer bottom="l">
           <Paragraph noMargin center>
             Authenticate using your company email
           </Paragraph>
         </Spacer>
         <Paragraph center noMargin>
-          <Spacer bottom="xs">
-            <GoogleLogin
-              render={({ onClick, disabled }) => (
-                <PrimaryButton onClick={onClick} disabled={disabled}>
-                  sign in with Google
-                </PrimaryButton>
-              )}
-              clientId={ENVIRONMENT.googleClientID}
-              onSuccess={onLoginSuccess}
-              onFailure={onLoginFailure}
-            />
-          </Spacer>
           <SignInButton />
         </Paragraph>
       </Container>
diff --git a/packages/frontend/src/routes.tsx b/packages/frontend/src/routes.tsx
index ee1330f..aec2d04 100644
--- a/packages/frontend/src/routes.tsx
+++ b/packages/frontend/src/routes.tsx
@@ -43,7 +43,6 @@ const Routes: React.FunctionComponent<RoutesProps> = ({ currentUser }) => {
   } else {
     if (currentUser) {
       strings.setLanguage(currentUser.language || navigator.language)
-
       // Current user was found
       // eslint-disable-next-line no-underscore-dangle
       if (currentUser.type === UserTypeEnum.Trainee && currentUser.__typename === 'Trainee') {
diff --git a/packages/frontend/webpack.config.js b/packages/frontend/webpack.config.js
index ae12333..093c5b6 100644
--- a/packages/frontend/webpack.config.js
+++ b/packages/frontend/webpack.config.js
@@ -10,12 +10,23 @@ const dotenv = require('dotenv')
 /* eslint-enable @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, no-undef */
 
 // eslint-disable-next-line no-undef
-const { GOOGLE_CLIENT_ID, DEBUG, AUTH_HEADER, BACKEND_URL, MODE, ENVIRONMENT_NAME, SUPPORT_MAIL } = process.env
+const {
+  GOOGLE_CLIENT_ID,
+  MICROSOFT_CLIENT_ID,
+  MICROSOFT_TENANT_ID,
+  DEBUG,
+  AUTH_HEADER,
+  BACKEND_URL,
+  FRONTEND_URL,
+  MODE,
+  ENVIRONMENT_NAME,
+  SUPPORT_MAIL,
+} = process.env
 
 const DEFAULT_ENVIRONMENT = 'development'
 const DEFAULT_MODE = 'development'
 
-/** @returns { { name: string; mode: string; debug: boolean; googleClientID: string; authHeader: string; backendUrl: string; supportMail: string; } }} */
+/** @returns {{mode: string, authHeader: string, supportMail: string, debug: boolean, microsoftClientID: string, frontendUrl: string, name: (*|string), microsoftTenantID: string, backendUrl: string, googleClientID: string}}} */
 const getEnvironmentConfig = () => {
   // eslint-disable-next-line no-undef
   const name = ENVIRONMENT_NAME ?? DEFAULT_ENVIRONMENT
@@ -29,9 +40,12 @@ const getEnvironmentConfig = () => {
       name,
       mode: parsed.MODE,
       googleClientID: parsed.GOOGLE_CLIENT_ID,
+      microsoftClientID: parsed.MICROSOFT_CLIENT_ID,
+      microsoftTenantID: parsed.MICROSOFT_TENANT_ID,
       debug: parsed.DEBUG === 'true',
       authHeader: parsed.AUTH_HEADER,
       backendUrl: parsed.BACKEND_URL,
+      frontendUrl: parsed.FRONTEND_URL,
       supportMail: parsed.SUPPORT_MAIL,
     }
   }
@@ -42,9 +56,12 @@ const getEnvironmentConfig = () => {
     name,
     mode: MODE,
     googleClientID: GOOGLE_CLIENT_ID,
+    microsoftClientID: MICROSOFT_CLIENT_ID,
+    microsoftTenantID: MICROSOFT_TENANT_ID,
     debug: DEBUG === 'true',
     authHeader: AUTH_HEADER,
     backendUrl: BACKEND_URL,
+    frontendUrl: FRONTEND_URL,
     supportMail: SUPPORT_MAIL,
   }
 }
diff --git a/readme.md b/readme.md
index 61655cb..8a222a8 100644
--- a/readme.md
+++ b/readme.md
@@ -99,9 +99,9 @@ The following variables should be added to your cloned version of Lara.
 - AWS_SECRET_ACCESS_KEY
 - COMPANY_ABBREVIATION
   - Shortform of your companies name to create s3-buckets
-- GOOGLE_API_KEY
-- GOOGLE_CLIENT_ID
-  - Google keys to use for login
+- MICROSOFT_CLIENT_ID
+- MICROSOFT_TENANT_ID
+  - Microsoft keys to use for login
 - LARA_SECRET
   - Secret used in creating oauth secrets
 - OLD_COMPANY_NAME

From 926b07df0ecc639a077d255081cef1a9069228eb Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Fri, 2 Jun 2023 17:24:39 +0200
Subject: [PATCH 04/15] fix: actions jobs syntax

---
 .github/workflows/reusable-build-job.yml  | 4 ++--
 .github/workflows/reusable-deploy-job.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/reusable-build-job.yml b/.github/workflows/reusable-build-job.yml
index 2406abb..bb18c4c 100644
--- a/.github/workflows/reusable-build-job.yml
+++ b/.github/workflows/reusable-build-job.yml
@@ -26,8 +26,8 @@ jobs:
       MODE: ${{ inputs.mode }}
       AUTH_HEADER: ${{ secrets.AUTH_HEADER }}
       GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
-      MICROSOFT_CLIENT_ID = ${{ secrets.MICROSOFT_CLIENT_ID }}
-      MICROSOFT_TENANT_ID = ${{ secrets.MICROSOFT_TENANT_ID }}
+      MICROSOFT_CLIENT_ID: ${{ secrets.MICROSOFT_CLIENT_ID }}
+      MICROSOFT_TENANT_ID: ${{ secrets.MICROSOFT_TENANT_ID }}
       SUPPORT_MAIL: ${{ secrets.SUPPORT_MAIL }}
       URL_ORIGIN: ${{ secrets.URL_ORIGIN }}
       COMPANY_ABBREVIATION: ${{ secrets.COMPANY_ABBREVIATION }}
diff --git a/.github/workflows/reusable-deploy-job.yml b/.github/workflows/reusable-deploy-job.yml
index d97def8..4689b3a 100644
--- a/.github/workflows/reusable-deploy-job.yml
+++ b/.github/workflows/reusable-deploy-job.yml
@@ -31,8 +31,8 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
       GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
-      MICROSOFT_CLIENT_ID = ${{ secrets.MICROSOFT_CLIENT_ID }}
-      MICROSOFT_TENANT_ID = ${{ secrets.MICROSOFT_TENANT_ID }}
+      MICROSOFT_CLIENT_ID: ${{ secrets.MICROSOFT_CLIENT_ID }}
+      MICROSOFT_TENANT_ID: ${{ secrets.MICROSOFT_TENANT_ID }}
       LARA_SECRET: ${{ secrets.LARA_SECRET }}
       SES_EMAIL: ${{ secrets.SES_EMAIL }}
       SUPPORT_MAIL: ${{ secrets.SUPPORT_MAIL }}

From 79e91f9be26f6397dc00fb400c84a5a7ed10ad3d Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 1 Feb 2023 09:42:44 +0100
Subject: [PATCH 05/15] feat: acn mircosoft login

---
 .env.example                                         |  3 +++
 .../frontend/src/components/ms-sign-in-button.tsx    |  2 +-
 packages/frontend/src/frontend.tsx                   | 12 +++++++++++-
 yarn.lock                                            |  5 -----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index f007afc..039626e 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,9 @@
 MICROSOFT_API_KEY = secret
 MICROSOFT_CLIENT_ID = secret
 
+MICROSOFT_API_KEY = secret
+MICROSOFT_CLIENT_ID = secret
+
 AUTH_HEADER = secret
 URL_ORIGIN = lara.exampleCompany
 DEBUG = true
diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
index 0479285..4e2bdb5 100644
--- a/packages/frontend/src/components/ms-sign-in-button.tsx
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -16,7 +16,7 @@ export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
   const [mutate] = useLoginPageLoginMutation()
   const isAuthenticated = useIsAuthenticated()
 
-  const handleLogin = async (loginType: any) => {
+  const handleLogin = (loginType: any) => {
     if (loginType === 'redirect') {
       instance.loginRedirect(loginRequest).catch((e) => {
         console.log(e)
diff --git a/packages/frontend/src/frontend.tsx b/packages/frontend/src/frontend.tsx
index 0a0dd3a..64f3534 100644
--- a/packages/frontend/src/frontend.tsx
+++ b/packages/frontend/src/frontend.tsx
@@ -1,9 +1,19 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import { MsalProvider } from '@azure/msal-react'
+import { msalConfig } from './hooks/ms-auth'
 
 import { App } from './app'
+import { PublicClientApplication } from '@azure/msal-browser'
 
-ReactDOM.render(<App />, document.getElementById('app'))
+const msalInstance = new PublicClientApplication(msalConfig)
+
+ReactDOM.render(
+  <MsalProvider instance={msalInstance}>
+    <App />
+  </MsalProvider>,
+  document.getElementById('app')
+)
 
 if (module.hot && ENVIRONMENT.debug) {
   module.hot.accept()
diff --git a/yarn.lock b/yarn.lock
index ef201af..587a72c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3913,11 +3913,6 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
-"@react-oauth/google@^0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@react-oauth/google/-/google-0.5.1.tgz#fc5cf33bff5d59583c5b0ed387431350216dd907"
-  integrity sha512-XCMMke24klAHIVnrZAMibodyjSUsxBOJ+vO5yvRptWC2Vnq02uLUnydjtIdCzCUIAxbvbFbQWZxG0xF0Y8GtHA==
-
 "@rebass/grid@^6.1.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@rebass/grid/-/grid-6.1.0.tgz#17827e13d9b461d86e3e5c6b47393b5aea857370"

From b6c6bbc4d89588fc994c138cb1423a60477adc38 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Fri, 2 Jun 2023 17:22:27 +0200
Subject: [PATCH 06/15] feat: email as param for login and removed google login

---
 packages/frontend/src/app.tsx      |  1 -
 packages/frontend/src/frontend.tsx | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/frontend/src/app.tsx b/packages/frontend/src/app.tsx
index 4d272d4..906e723 100644
--- a/packages/frontend/src/app.tsx
+++ b/packages/frontend/src/app.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 import { Router, Switch } from 'react-router-dom'
-import { GoogleOAuthProvider } from '@react-oauth/google'
 
 import ApolloProvider from './apollo-provider'
 import AppHistory from './app-history'
diff --git a/packages/frontend/src/frontend.tsx b/packages/frontend/src/frontend.tsx
index 64f3534..0a0dd3a 100644
--- a/packages/frontend/src/frontend.tsx
+++ b/packages/frontend/src/frontend.tsx
@@ -1,19 +1,9 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import { MsalProvider } from '@azure/msal-react'
-import { msalConfig } from './hooks/ms-auth'
 
 import { App } from './app'
-import { PublicClientApplication } from '@azure/msal-browser'
 
-const msalInstance = new PublicClientApplication(msalConfig)
-
-ReactDOM.render(
-  <MsalProvider instance={msalInstance}>
-    <App />
-  </MsalProvider>,
-  document.getElementById('app')
-)
+ReactDOM.render(<App />, document.getElementById('app'))
 
 if (module.hot && ENVIRONMENT.debug) {
   module.hot.accept()

From efa4d708680518c8e7fadb54493fd0b9ddaacb0e Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Fri, 2 Jun 2023 17:46:00 +0200
Subject: [PATCH 07/15] fix: .env.example fix

---
 .env.example | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.env.example b/.env.example
index 039626e..f007afc 100644
--- a/.env.example
+++ b/.env.example
@@ -1,9 +1,6 @@
 MICROSOFT_API_KEY = secret
 MICROSOFT_CLIENT_ID = secret
 
-MICROSOFT_API_KEY = secret
-MICROSOFT_CLIENT_ID = secret
-
 AUTH_HEADER = secret
 URL_ORIGIN = lara.exampleCompany
 DEBUG = true

From cad6e463cb4defb6d74acfb85e71cdbe7d4c8597 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Tue, 6 Jun 2023 13:46:44 +0200
Subject: [PATCH 08/15] fix: make handlelogin async and check for email
 beforehand

---
 packages/api/src/graphql.ts                   |  2 +-
 .../src/components/ms-sign-in-button.tsx      | 28 +++++++++----------
 packages/frontend/src/graphql/index.tsx       |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/api/src/graphql.ts b/packages/api/src/graphql.ts
index 3026d89..8ed54b3 100644
--- a/packages/api/src/graphql.ts
+++ b/packages/api/src/graphql.ts
@@ -165,7 +165,7 @@ export type GqlMutation = {
   deleteEntry: GqlMutateEntryPayload;
   /** Link Alexa account */
   linkAlexa?: Maybe<GqlUserInterface>;
-  /** Login via google. */
+  /** Login via microsoft */
   login?: Maybe<GqlOAuthPayload>;
   /** Marks User to be deleted */
   markUserForDeletion?: Maybe<GqlUserInterface>;
diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
index 4e2bdb5..255d776 100644
--- a/packages/frontend/src/components/ms-sign-in-button.tsx
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -16,7 +16,7 @@ export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
   const [mutate] = useLoginPageLoginMutation()
   const isAuthenticated = useIsAuthenticated()
 
-  const handleLogin = (loginType: any) => {
+   const handleLogin  = async (loginType: any) => {
     if (loginType === 'redirect') {
       instance.loginRedirect(loginRequest).catch((e) => {
         console.log(e)
@@ -27,21 +27,19 @@ export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
         ...loginRequest,
         account: accounts[0],
       }
-      instance
-        .acquireTokenSilent(request)
-        .then((response) => {
-          console.log(response)
-          mutate({ variables: { email: response.account?.username ?? '' } }).then((response) => {
-            const { data } = response
-            if (!data?.login) {
-              return AppHistory.getInstance().push('/no-user-found')
-            }
-            login(data.login)
-          })
-        })
-        .catch((e) => {
-          console.log(e)
+      const authResult = await instance.acquireTokenSilent(request)
+      const email = authResult.account?.username
+      if (email) {
+        mutate({variables: { email } }).then((response) => {
+          const {data} = response
+          if (!data?.login) {
+            return AppHistory.getInstance().push('/no-user-found')
+          }
+          login(data.login)
+        }).catch(err => {
+          console.log(err)
         })
+      }
     }
   }
   return <PrimaryButton onClick={() => handleLogin('redirect')}>sign in with ACN</PrimaryButton>
diff --git a/packages/frontend/src/graphql/index.tsx b/packages/frontend/src/graphql/index.tsx
index 7fe4f3c..b63c515 100644
--- a/packages/frontend/src/graphql/index.tsx
+++ b/packages/frontend/src/graphql/index.tsx
@@ -164,7 +164,7 @@ export type Mutation = {
   deleteEntry: MutateEntryPayload;
   /** Link Alexa account */
   linkAlexa?: Maybe<UserInterface>;
-  /** Login via google. */
+  /** Login via microsoft */
   login?: Maybe<OAuthPayload>;
   /** Marks User to be deleted */
   markUserForDeletion?: Maybe<UserInterface>;

From ad1602f4652b67c8d15387d9733442b742669bbf Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Tue, 6 Jun 2023 16:17:19 +0200
Subject: [PATCH 09/15] feat: login now as popup

---
 packages/frontend/package.json                |  4 +-
 packages/frontend/src/app.tsx                 |  7 +--
 .../src/components/ms-sign-in-button.tsx      | 54 ++++++++++---------
 yarn.lock                                     | 36 +++++--------
 4 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index b92eaac..04baebb 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.2.2",
-    "@azure/msal-browser": "^2.32.2",
-    "@azure/msal-react": "^1.5.2",
+    "@azure/msal-browser": "^2.37.0",
+    "@azure/msal-react": "^1.5.7",
     "@lara/components": "^1.0.0",
     "@microsoft/microsoft-graph-client": "^3.0.4",
     "@rebass/grid": "^6.1.0",
diff --git a/packages/frontend/src/app.tsx b/packages/frontend/src/app.tsx
index 906e723..f80db0a 100644
--- a/packages/frontend/src/app.tsx
+++ b/packages/frontend/src/app.tsx
@@ -40,19 +40,20 @@ const InnerApp: React.FunctionComponent = () => {
    * the redundant api call
    */
   const { data, loading } = useCurrentUserQuery()
+  const currentUser = data?.currentUser
 
   return (
-    <ThemeProvider currentUser={data?.currentUser}>
+    <ThemeProvider currentUser={currentUser}>
       {loading && <SplashPage />}
 
       {!loading && (
         <ToastContextProvider>
           <Router history={AppHistory.getInstance()}>
             <Switch>
-              <Routes currentUser={data?.currentUser} />
+              <Routes currentUser={currentUser} />
             </Switch>
 
-            {ENVIRONMENT.debug && <StatusBar currentUser={data?.currentUser} />}
+            {ENVIRONMENT.debug && <StatusBar currentUser={currentUser} />}
           </Router>
         </ToastContextProvider>
       )}
diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
index 255d776..b09eeec 100644
--- a/packages/frontend/src/components/ms-sign-in-button.tsx
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -1,46 +1,48 @@
-import React, { ButtonHTMLAttributes } from 'react'
+import React, {ButtonHTMLAttributes} from 'react'
 import AppHistory from '../app-history'
-import { PrimaryButton } from './button'
-import { useMsal } from '@azure/msal-react'
-import { loginRequest } from '../hooks/ms-auth'
-import { useAuthentication } from '../hooks/use-authentication'
-import { useLoginPageLoginMutation } from '../graphql'
-import { useIsAuthenticated } from '@azure/msal-react'
+import {PrimaryButton} from './button'
+import {useMsal} from '@azure/msal-react'
+import {loginRequest} from '../hooks/ms-auth'
+import {useAuthentication} from '../hooks/use-authentication'
+import {useLoginPageLoginMutation} from '../graphql'
+import {useIsAuthenticated} from '@azure/msal-react'
 
 export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
   fullsize?: boolean
 }
+
 export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
-  const { instance, accounts } = useMsal()
-  const { login } = useAuthentication()
+  const {instance, accounts} = useMsal()
+  const {login} = useAuthentication()
   const [mutate] = useLoginPageLoginMutation()
   const isAuthenticated = useIsAuthenticated()
 
-   const handleLogin  = async (loginType: any) => {
-    if (loginType === 'redirect') {
-      instance.loginRedirect(loginRequest).catch((e) => {
-        console.log(e)
-      })
-    }
+  const handleLogin = async () => {
+    instance.loginPopup(loginRequest).catch((e) => {
+      console.log(e)
+    })
     if (isAuthenticated) {
       const request = {
         ...loginRequest,
         account: accounts[0],
       }
-      const authResult = await instance.acquireTokenSilent(request)
+      const authResult = await instance.ssoSilent(request)
       const email = authResult.account?.username
       if (email) {
-        mutate({variables: { email } }).then((response) => {
-          const {data} = response
-          if (!data?.login) {
-            return AppHistory.getInstance().push('/no-user-found')
-          }
-          login(data.login)
-        }).catch(err => {
-          console.log(err)
-        })
+        mutate({variables: {email}})
+          .then((response) => {
+            const {data} = response
+            if (!data?.login) {
+              return AppHistory.getInstance().push('/no-user-found')
+            }
+            login(data.login)
+          })
+          .catch((err) => {
+            console.log(err)
+          })
       }
     }
   }
-  return <PrimaryButton onClick={() => handleLogin('redirect')}>sign in with ACN</PrimaryButton>
+  return <PrimaryButton onClick={() => handleLogin()}>sign in with
+    ACN</PrimaryButton>
 }
diff --git a/yarn.lock b/yarn.lock
index 587a72c..d085c96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1048,22 +1048,22 @@
   dependencies:
     tslib "^2.3.1"
 
-"@azure/msal-browser@^2.32.2":
-  version "2.32.2"
-  resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.32.2.tgz#b2284773c95656ed52710e82aedd7fe3e86fa38d"
-  integrity sha512-1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g==
+"@azure/msal-browser@^2.37.0":
+  version "2.37.0"
+  resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.37.0.tgz#32d7af74eef53f2692f8a9d6bd6818c78faf4c1b"
+  integrity sha512-YNGD/W/tw/5wDWlXOfmrVILaxVsorVLxYU2ovmL1PDvxkdudbQRyGk/76l4emqgDAl/kPQeqyivxjOU6w1YfvQ==
   dependencies:
-    "@azure/msal-common" "^9.0.2"
+    "@azure/msal-common" "13.0.0"
 
-"@azure/msal-common@^9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-9.0.2.tgz#b01c0faef18125987682e669494163da06449a20"
-  integrity sha512-qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w==
+"@azure/msal-common@13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-13.0.0.tgz#9c39184903b5d0fd6e643ccc12193fae220e912b"
+  integrity sha512-GqCOg5H5bouvLij9NFXFkh+asRRxsPBRwnTDsfK7o0KcxYHJbuidKw8/VXpycahGXNxgtuhqtK/n5he+5NhyEA==
 
-"@azure/msal-react@^1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@azure/msal-react/-/msal-react-1.5.2.tgz#9d945af2a140e00c3950c1c3fafd1dddb533d12a"
-  integrity sha512-YgtonunuNR00Td/Z+taMKd9df+EnstbEzNd3nS+6oX4AL6kxwkDybF+1EqJEQdofOwGZl3xvifiFpyZZsnr4tA==
+"@azure/msal-react@^1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@azure/msal-react/-/msal-react-1.5.7.tgz#89ae61a557a5b3359d5e6b7280c013e1d6a0e0fe"
+  integrity sha512-Ub9XPAZCWdBEpTyCGdA1RPdmIAOgLCt344pdL54eCQl3sNVAJQo8DWtRj9UM/qu4tW1dK6HESmznjoBPhuqGdg==
 
 "@babel/code-frame@7.12.11":
   version "7.12.11"
@@ -13454,7 +13454,7 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
-prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -13662,14 +13662,6 @@ react-focus-lock@^2.9.0:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-google-login@^5.1.21:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/react-google-login/-/react-google-login-5.2.2.tgz#a20b46440c6c1610175ef75baf427118ff0e9859"
-  integrity sha512-JUngfvaSMcOuV0lFff7+SzJ2qviuNMQdqlsDJkUM145xkGPVIfqWXq9Ui+2Dr6jdJWH5KYdynz9+4CzKjI5u6g==
-  dependencies:
-    "@types/react" "*"
-    prop-types "^15.6.0"
-
 react-hook-form@^7.28.1:
   version "7.37.0"
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.37.0.tgz#4d1738f092d3d8a3ade34ee892d97350b1032b19"

From 2147c42075799a2374bd33ffa3b5a91267986b83 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 7 Jun 2023 11:59:33 +0200
Subject: [PATCH 10/15] feat: set client id for env and fix format job

---
 .github/workflows/reusable-build-job.yml      | 14 ++++++--
 .github/workflows/reusable-deploy-job.yml     | 14 ++++++--
 .../src/components/ms-sign-in-button.tsx      | 36 ++++++++-----------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/reusable-build-job.yml b/.github/workflows/reusable-build-job.yml
index bb18c4c..2c34bdd 100644
--- a/.github/workflows/reusable-build-job.yml
+++ b/.github/workflows/reusable-build-job.yml
@@ -25,8 +25,6 @@ jobs:
       DEBUG: ${{ inputs.debug }}
       MODE: ${{ inputs.mode }}
       AUTH_HEADER: ${{ secrets.AUTH_HEADER }}
-      GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
-      MICROSOFT_CLIENT_ID: ${{ secrets.MICROSOFT_CLIENT_ID }}
       MICROSOFT_TENANT_ID: ${{ secrets.MICROSOFT_TENANT_ID }}
       SUPPORT_MAIL: ${{ secrets.SUPPORT_MAIL }}
       URL_ORIGIN: ${{ secrets.URL_ORIGIN }}
@@ -57,6 +55,18 @@ jobs:
         if: env.ENVIRONMENT_NAME == 'staging'
         run: |
           echo "BACKEND_URL=${{ secrets.STAGING_BE_URL }}" >> $GITHUB_ENV
+
+      ##############
+      # Set MICROSOFT CLIENT_ID env variable this way, so not all variables have to be passed to the reusable workflow
+      - name: Set production MICROSOFT CLIENT_ID
+        if: env.ENVIRONMENT_NAME == 'production'
+        run: |
+          echo "MICROSOFT_CLIENT_ID: ${{ secrets.PROD_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+      - name: Set staging MICROSOFT CLIENT_ID
+        if: env.ENVIRONMENT_NAME == 'staging'
+        run: |
+          echo "MICROSOFT_CLIENT_ID: ${{ secrets.STAGING_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+
 ##############
       - name: Compile and build
         run: yarn clean && yarn compile && yarn build
diff --git a/.github/workflows/reusable-deploy-job.yml b/.github/workflows/reusable-deploy-job.yml
index 4689b3a..bd783c3 100644
--- a/.github/workflows/reusable-deploy-job.yml
+++ b/.github/workflows/reusable-deploy-job.yml
@@ -29,9 +29,6 @@ jobs:
       AUTH_HEADER: ${{ secrets.AUTH_HEADER }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
-      GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
-      MICROSOFT_CLIENT_ID: ${{ secrets.MICROSOFT_CLIENT_ID }}
       MICROSOFT_TENANT_ID: ${{ secrets.MICROSOFT_TENANT_ID }}
       LARA_SECRET: ${{ secrets.LARA_SECRET }}
       SES_EMAIL: ${{ secrets.SES_EMAIL }}
@@ -79,6 +76,17 @@ jobs:
           echo "FRONTEND_URL=${{ secrets.STAGING_FE_URL }}" >> $GITHUB_ENV
           echo "BACKEND_URL=${{ secrets.STAGING_BE_URL }}" >> $GITHUB_ENV
 
+      ##############
+      # Set MICROSOFT CLIENT_ID env variable this way, so not all variables have to be passed to the reusable workflow
+      - name: Set production MICROSOFT CLIENT_ID
+        if: env.ENVIRONMENT_NAME == 'production'
+        run: |
+          echo "MICROSOFT_CLIENT_ID: ${{ secrets.PROD_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+      - name: Set staging MICROSOFT CLIENT_ID
+        if: env.ENVIRONMENT_NAME == 'staging'
+        run: |
+          echo "MICROSOFT_CLIENT_ID: ${{ secrets.STAGING_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+
       - name: Deploy Frontend
         run: serverless s3sync bucket --bucket ${{ secrets.COMPANY_ABBREVIATION }}-lara-frontend-${{ inputs.target }}
 
diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
index b09eeec..cdd264c 100644
--- a/packages/frontend/src/components/ms-sign-in-button.tsx
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -1,37 +1,30 @@
-import React, {ButtonHTMLAttributes} from 'react'
+import React, { ButtonHTMLAttributes } from 'react'
 import AppHistory from '../app-history'
-import {PrimaryButton} from './button'
-import {useMsal} from '@azure/msal-react'
-import {loginRequest} from '../hooks/ms-auth'
-import {useAuthentication} from '../hooks/use-authentication'
-import {useLoginPageLoginMutation} from '../graphql'
-import {useIsAuthenticated} from '@azure/msal-react'
+import { PrimaryButton } from './button'
+import { useMsal } from '@azure/msal-react'
+import { loginRequest } from '../hooks/ms-auth'
+import { useAuthentication } from '../hooks/use-authentication'
+import { useLoginPageLoginMutation } from '../graphql'
+import { useIsAuthenticated } from '@azure/msal-react'
 
 export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
   fullsize?: boolean
 }
 
 export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
-  const {instance, accounts} = useMsal()
-  const {login} = useAuthentication()
+  const { instance } = useMsal()
+  const { login } = useAuthentication()
   const [mutate] = useLoginPageLoginMutation()
   const isAuthenticated = useIsAuthenticated()
 
   const handleLogin = async () => {
-    instance.loginPopup(loginRequest).catch((e) => {
-      console.log(e)
-    })
+    const loginResponse = await instance.loginPopup(loginRequest)
     if (isAuthenticated) {
-      const request = {
-        ...loginRequest,
-        account: accounts[0],
-      }
-      const authResult = await instance.ssoSilent(request)
-      const email = authResult.account?.username
+      const email = loginResponse.account?.username
       if (email) {
-        mutate({variables: {email}})
+        mutate({ variables: { email } })
           .then((response) => {
-            const {data} = response
+            const { data } = response
             if (!data?.login) {
               return AppHistory.getInstance().push('/no-user-found')
             }
@@ -43,6 +36,5 @@ export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
       }
     }
   }
-  return <PrimaryButton onClick={() => handleLogin()}>sign in with
-    ACN</PrimaryButton>
+  return <PrimaryButton onClick={() => handleLogin()}>sign in with ACN</PrimaryButton>
 }

From a9ccbbd3f44ed8e43041b17ab7020a8958713da4 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 7 Jun 2023 12:06:29 +0200
Subject: [PATCH 11/15] fix: fix deploy job

---
 .github/workflows/reusable-build-job.yml  | 4 ++--
 .github/workflows/reusable-deploy-job.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/reusable-build-job.yml b/.github/workflows/reusable-build-job.yml
index 2c34bdd..8307fa4 100644
--- a/.github/workflows/reusable-build-job.yml
+++ b/.github/workflows/reusable-build-job.yml
@@ -61,11 +61,11 @@ jobs:
       - name: Set production MICROSOFT CLIENT_ID
         if: env.ENVIRONMENT_NAME == 'production'
         run: |
-          echo "MICROSOFT_CLIENT_ID: ${{ secrets.PROD_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+          echo "MICROSOFT_CLIENT_ID=${{ secrets.PROD_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
       - name: Set staging MICROSOFT CLIENT_ID
         if: env.ENVIRONMENT_NAME == 'staging'
         run: |
-          echo "MICROSOFT_CLIENT_ID: ${{ secrets.STAGING_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+          echo "MICROSOFT_CLIENT_ID=${{ secrets.STAGING_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
 
 ##############
       - name: Compile and build
diff --git a/.github/workflows/reusable-deploy-job.yml b/.github/workflows/reusable-deploy-job.yml
index bd783c3..4a8eb96 100644
--- a/.github/workflows/reusable-deploy-job.yml
+++ b/.github/workflows/reusable-deploy-job.yml
@@ -81,11 +81,11 @@ jobs:
       - name: Set production MICROSOFT CLIENT_ID
         if: env.ENVIRONMENT_NAME == 'production'
         run: |
-          echo "MICROSOFT_CLIENT_ID: ${{ secrets.PROD_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+          echo "MICROSOFT_CLIENT_ID=${{ secrets.PROD_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
       - name: Set staging MICROSOFT CLIENT_ID
         if: env.ENVIRONMENT_NAME == 'staging'
         run: |
-          echo "MICROSOFT_CLIENT_ID: ${{ secrets.STAGING_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
+          echo "MICROSOFT_CLIENT_ID=${{ secrets.STAGING_MICROSOFT_CLIENT_ID }}" >> $GITHUB_ENV
 
       - name: Deploy Frontend
         run: serverless s3sync bucket --bucket ${{ secrets.COMPANY_ABBREVIATION }}-lara-frontend-${{ inputs.target }}

From a247cd8050c9f16f5ab2e7adb296b0393be26787 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 28 Jun 2023 13:06:57 +0200
Subject: [PATCH 12/15] fix: fullscreen login

---
 packages/frontend/src/frontend.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/frontend.tsx b/packages/frontend/src/frontend.tsx
index 0a0dd3a..2354e4a 100644
--- a/packages/frontend/src/frontend.tsx
+++ b/packages/frontend/src/frontend.tsx
@@ -2,8 +2,13 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 
 import { App } from './app'
-
-ReactDOM.render(<App />, document.getElementById('app'))
+if (window.location.hash !== ''){
+  console.log("hash found" + window.location.hash);
+}
+else
+{
+  ReactDOM.render(<App/>, document.getElementById('app'))
+}
 
 if (module.hot && ENVIRONMENT.debug) {
   module.hot.accept()

From e8fba077ec07cb816ededca7171c842ab4786510 Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 28 Jun 2023 13:34:35 +0200
Subject: [PATCH 13/15] chore: formatting

---
 packages/frontend/src/frontend.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/frontend.tsx b/packages/frontend/src/frontend.tsx
index 2354e4a..863e254 100644
--- a/packages/frontend/src/frontend.tsx
+++ b/packages/frontend/src/frontend.tsx
@@ -2,12 +2,9 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 
 import { App } from './app'
-if (window.location.hash !== ''){
-  console.log("hash found" + window.location.hash);
-}
-else
-{
-  ReactDOM.render(<App/>, document.getElementById('app'))
+
+if (window.location.hash === '') {
+  ReactDOM.render(<App />, document.getElementById('app'))
 }
 
 if (module.hot && ENVIRONMENT.debug) {

From bbf4bf2a5823b06e2dae94709bb355facd987a8f Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 28 Jun 2023 15:46:45 +0200
Subject: [PATCH 14/15] fix: review findings

---
 packages/frontend/package.json                      |  6 +++---
 packages/frontend/src/app.tsx                       | 13 ++++++-------
 .../frontend/src/components/ms-sign-in-button.tsx   |  2 +-
 packages/frontend/src/global.d.ts                   |  1 -
 packages/frontend/webpack.config.js                 |  5 +----
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 04baebb..a7f16a9 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -15,10 +15,10 @@
   },
   "dependencies": {
     "@apollo/client": "^3.2.2",
-    "@azure/msal-browser": "^2.37.0",
-    "@azure/msal-react": "^1.5.7",
+    "@azure/msal-browser": "^2.37.1",
+    "@azure/msal-react": "^1.5.8",
     "@lara/components": "^1.0.0",
-    "@microsoft/microsoft-graph-client": "^3.0.4",
+    "@microsoft/microsoft-graph-client": "^3.0.5",
     "@rebass/grid": "^6.1.0",
     "apollo-link-token-refresh": "^0.4.0",
     "date-fns": "^2.16.1",
diff --git a/packages/frontend/src/app.tsx b/packages/frontend/src/app.tsx
index f80db0a..8bce2c0 100644
--- a/packages/frontend/src/app.tsx
+++ b/packages/frontend/src/app.tsx
@@ -1,20 +1,19 @@
 import React from 'react'
 import { Router, Switch } from 'react-router-dom'
-
 import ApolloProvider from './apollo-provider'
 import AppHistory from './app-history'
-import { GlobalFonts } from './components/fonts'
 import StatusBar from './components/status-bar'
-import { ToastContextProvider } from './context/toast/toast-context-provider'
-import { useCurrentUserQuery } from './graphql'
-import { AuthenticatedState, AuthenticationContext } from './hooks/use-authentication'
-import { SplashPage } from './pages/splash-page'
 import Routes from './routes'
 import ThemeProvider from './theme-provider'
+import { AuthenticatedState, AuthenticationContext } from './hooks/use-authentication'
+import { GlobalFonts } from './components/fonts'
 import { MsalProvider } from '@azure/msal-react'
 import { msalConfig } from './hooks/ms-auth'
-
 import { PublicClientApplication } from '@azure/msal-browser'
+import { SplashPage } from './pages/splash-page'
+import { ToastContextProvider } from './context/toast/toast-context-provider'
+import { useCurrentUserQuery } from './graphql'
+
 
 const msalInstance = new PublicClientApplication(msalConfig)
 export const App: React.FunctionComponent = () => {
diff --git a/packages/frontend/src/components/ms-sign-in-button.tsx b/packages/frontend/src/components/ms-sign-in-button.tsx
index cdd264c..b74b198 100644
--- a/packages/frontend/src/components/ms-sign-in-button.tsx
+++ b/packages/frontend/src/components/ms-sign-in-button.tsx
@@ -36,5 +36,5 @@ export const SignInButton: React.FunctionComponent<ButtonProps> = () => {
       }
     }
   }
-  return <PrimaryButton onClick={() => handleLogin()}>sign in with ACN</PrimaryButton>
+  return <PrimaryButton onClick={() => handleLogin()}>Sign in with Microsoft</PrimaryButton>
 }
diff --git a/packages/frontend/src/global.d.ts b/packages/frontend/src/global.d.ts
index aef311f..e37d11f 100644
--- a/packages/frontend/src/global.d.ts
+++ b/packages/frontend/src/global.d.ts
@@ -22,7 +22,6 @@ declare module '*.png'
 declare const ENVIRONMENT: {
   name: string
   debug: boolean
-  googleClientID: string
   microsoftClientID: string
   microsoftTenantID: string
   authHeader: string
diff --git a/packages/frontend/webpack.config.js b/packages/frontend/webpack.config.js
index 093c5b6..e5e8ed7 100644
--- a/packages/frontend/webpack.config.js
+++ b/packages/frontend/webpack.config.js
@@ -11,7 +11,6 @@ const dotenv = require('dotenv')
 
 // eslint-disable-next-line no-undef
 const {
-  GOOGLE_CLIENT_ID,
   MICROSOFT_CLIENT_ID,
   MICROSOFT_TENANT_ID,
   DEBUG,
@@ -26,7 +25,7 @@ const {
 const DEFAULT_ENVIRONMENT = 'development'
 const DEFAULT_MODE = 'development'
 
-/** @returns {{mode: string, authHeader: string, supportMail: string, debug: boolean, microsoftClientID: string, frontendUrl: string, name: (*|string), microsoftTenantID: string, backendUrl: string, googleClientID: string}}} */
+/** @returns {{mode: string, authHeader: string, supportMail: string, debug: boolean, microsoftClientID: string, frontendUrl: string, name: (*|string), microsoftTenantID: string, backendUrl: string}}} */
 const getEnvironmentConfig = () => {
   // eslint-disable-next-line no-undef
   const name = ENVIRONMENT_NAME ?? DEFAULT_ENVIRONMENT
@@ -39,7 +38,6 @@ const getEnvironmentConfig = () => {
     return {
       name,
       mode: parsed.MODE,
-      googleClientID: parsed.GOOGLE_CLIENT_ID,
       microsoftClientID: parsed.MICROSOFT_CLIENT_ID,
       microsoftTenantID: parsed.MICROSOFT_TENANT_ID,
       debug: parsed.DEBUG === 'true',
@@ -55,7 +53,6 @@ const getEnvironmentConfig = () => {
   return {
     name,
     mode: MODE,
-    googleClientID: GOOGLE_CLIENT_ID,
     microsoftClientID: MICROSOFT_CLIENT_ID,
     microsoftTenantID: MICROSOFT_TENANT_ID,
     debug: DEBUG === 'true',

From 41a527adc20e159a88afa54e61963aef00abddef Mon Sep 17 00:00:00 2001
From: "alex.opoku" <alex.opoku@sinnerschrader.com>
Date: Wed, 28 Jun 2023 15:53:26 +0200
Subject: [PATCH 15/15] fix: format job

---
 packages/frontend/src/app.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/app.tsx b/packages/frontend/src/app.tsx
index 8bce2c0..8d60424 100644
--- a/packages/frontend/src/app.tsx
+++ b/packages/frontend/src/app.tsx
@@ -14,7 +14,6 @@ import { SplashPage } from './pages/splash-page'
 import { ToastContextProvider } from './context/toast/toast-context-provider'
 import { useCurrentUserQuery } from './graphql'
 
-
 const msalInstance = new PublicClientApplication(msalConfig)
 export const App: React.FunctionComponent = () => {
   const [authenticated, setAuthenticated] = React.useState<AuthenticatedState>('loading')