Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
juthikahoque committed Feb 21, 2023
2 parents 4181f3e + fac5b40 commit 63bb296
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react-jsonschema-form": "^1.7.4",
"react-microsoft-login": "^1.15.0",
"@types/react-table": "^7.0.29",
"apollo-upload-client": "^16.0.0",
"axios": "^0.21.1",
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/auth/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useContext, useState } from "react";
import { Redirect, useHistory } from "react-router-dom";
import MicrosoftLogin from "react-microsoft-login";
import {
GoogleLogin,
GoogleLoginResponse,
Expand Down Expand Up @@ -91,7 +92,7 @@ const Login = (): React.ReactElement => {
}
/>
<MicrosoftLogin
clientId="1cecce6a-6a74-4a50-bb01-2735e34e16e2"
clientId="REPLACE_WITH_ENV_FILE_SECRET"
authCallback={(error) => {
// eslint-disable-next-line no-alert
window.alert(JSON.stringify(error));
Expand Down

0 comments on commit 63bb296

Please sign in to comment.