Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix user details failing when user meta data is not enabled #117

Merged
merged 2 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

## [0.8.2] - 2023-09-20

- Fixes an issue where user details would not load if user meta data was not enabled in the backend

## [0.8.1] - 2023-09-18

- Updates the text for the popup that shows when deleting a user to explain that it will also delete all linked accounts
Expand Down
4 changes: 2 additions & 2 deletions build/static/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/css/main.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/js/bundle.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dashboard",
"version": "0.8.1",
"version": "0.8.2",
"private": true,
"dependencies": {
"@babel/core": "^7.16.0",
Expand Down
20 changes: 0 additions & 20 deletions server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import Passwordless from "supertokens-node/recipe/passwordless";
import Session from "supertokens-node/recipe/session";
import ThirdParty from "supertokens-node/recipe/thirdparty";
import UserMetaData from "supertokens-node/recipe/usermetadata";
import RecipeUserId from "../../supertokens-node/lib/build/recipeUserId";

const websiteDomain = "http://localhost:3000";

Expand Down Expand Up @@ -108,25 +107,6 @@ app.get("/status", (req, res) => {
res.status(200).send("Started");
});

app.get("/link", async (req, res) => {
await AccountLinking.linkAccounts(
"public",
new RecipeUserId("6b763048-486f-4965-b2e0-2f7650efbdf5"),
"6f922cbf-99de-4078-a9d0-e67dff5df09d"
);
await AccountLinking.linkAccounts(
"public",
new RecipeUserId("9a8837c0-ee02-457b-93bd-61bf16a6c2f9"),
"6f922cbf-99de-4078-a9d0-e67dff5df09d"
);
await AccountLinking.linkAccounts(
"public",
new RecipeUserId("a31e669f-553a-40dc-9192-1b06c9d75d31"),
"6f922cbf-99de-4078-a9d0-e67dff5df09d"
);
return res.status(200).send("OK");
});

app.use((err: any, req: Request, res: Response, next: NextFunction) => {
// Leaving this in because it helps with debugging
console.log("Internal error", err);
Expand Down
20 changes: 19 additions & 1 deletion src/ui/components/userDetail/userDetailInfoGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import TooltipContainer from "../tooltip/tooltip";
import { UserDetailNameField } from "./components/nameField/nameField";
import { useUserDetailContext } from "./context/UserDetailContext";
import { UserDetailProps } from "./userDetail";
import { METADATA_NOT_ENABLED_TEXT } from "./userMetaDataSection";

type UserDetailInfoGridProps = Pick<
UserDetailProps,
Expand Down Expand Up @@ -194,9 +195,26 @@ export const UserDetailInfoGrid: FC<UserDetailInfoGridProps> = (props) => {
const { showLoadingOverlay, hideLoadingOverlay, userDetail } = useUserDetailContext();
const [emailErrorFromAPI, setEmailErrorFromAPI] = useState<string | undefined>(undefined);
const [phoneErrorFromAPI, setPhoneErrorFromAPI] = useState<string | undefined>(undefined);

let nameInfo = {};

if (userDetail.metaData !== undefined && userDetail.metaData !== METADATA_NOT_ENABLED_TEXT) {
const metaData = JSON.parse(userDetail.metaData);
const firstName = metaData.first_name;
const lastName = metaData.last_name;

if (firstName !== undefined) {
nameInfo = { ...nameInfo, firstName };
}

if (lastName !== undefined) {
nameInfo = { ...nameInfo, lastName };
}
}

const [userState, setUserState] = useState<User>({
...userDetail.details,
...JSON.parse(userDetail.metaData ?? "{}"),
...nameInfo,
});
const { showModal } = useContext(PopupContentContext);
const { firstName, lastName, timeJoined, emails, isPrimaryUser } = userState;
Expand Down
4 changes: 3 additions & 1 deletion src/ui/components/userDetail/userMetaDataSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import IconButton from "../common/iconButton";
import { useUserDetailContext } from "./context/UserDetailContext";
import "./userMetaDataSection.scss";

export const METADATA_NOT_ENABLED_TEXT = "Feature Not Enabled";

export const UserMetaDataSection: React.FC = () => {
const { hideLoadingOverlay, showLoadingOverlay, userDetail } = useUserDetailContext();
const [isEditing, setIsEditing] = useState<boolean>(false);
Expand All @@ -40,7 +42,7 @@ export const UserMetaDataSection: React.FC = () => {
}, [userDetail]);

const getFormattedMetaData = (_metadata: string): string => {
if (_metadata === "Feature Not Enabled") {
if (_metadata === METADATA_NOT_ENABLED_TEXT) {
return _metadata;
}

Expand Down
2 changes: 1 addition & 1 deletion src/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
* under the License.
*/

export const package_version = "0.8.1";
export const package_version = "0.8.2";
Loading