Login:Src:Components: change api methods

packages/login/src/components/ActivateUserForm/index.tsx

@@ -46,15 +46,15 @@ import { login } from "@docspace/shared/utils/loginUtils";
 
 import withLoader from "@/HOCs/withLoader";
 import { TActivateConfirmUser, TError, WithLoaderProps } from "@/types";
-import {
-  changePassword,
-  updateActivationStatus,
-  updateUser,
-} from "@/utils/actions";
 
 import { RegisterContainer } from "../CreateUserForm/CreateUserForm.styled";
 import { GreetingUserContainer } from "../CreateUserForm/sub-components/GreetingUserContainer";
 import { ConfirmRouteContext } from "../ConfirmRoute";
+import {
+  changePassword,
+  updateActivationStatus,
+  updateUser,
+} from "@docspace/shared/api/people";
 
 type ActivateUserFormPorps = {
   passwordHash: TPasswordHash;
@@ -166,16 +166,18 @@ const ActivateUserForm = ({
     userId,
     activationStatus,
   }: TActivateConfirmUser) => {
+    const changedData = {
+      id: userId,
+      FirstName: personalData.firstname,
+      LastName: personalData.lastname,
+    };
+
     const { userName, passwordHash } = loginData;
 
-    const res1 = await changePassword(passwordHash, userId, key);
+    const res1 = await changePassword(userId, passwordHash, key);
     const res2 = await updateActivationStatus(activationStatus, userId, key);
     const res3 = await login(userName, passwordHash);
-    const res4 = await updateUser(
+    const res4 = await updateUser(changedData);
-      userId,
-      personalData.firstname,
-      personalData.lastname,
-    );
   };
 
   const onKeyPress = (event: KeyboardEvent<HTMLInputElement>) => {

packages/login/src/components/ChangeOwnerForm/index.tsx

@@ -35,10 +35,10 @@ import { toastr } from "@docspace/shared/components/toast";
 
 import withLoader from "@/HOCs/withLoader";
 import { TError, WithLoaderProps } from "@/types";
-import { ownerChange } from "@/utils/actions";
 
 import { ConfirmRouteContext } from "../ConfirmRoute";
 import { ButtonsWrapper } from "../StyledConfirm.styled";
+import { ownerChange } from "@docspace/shared/api/settings";
 
 type ChangeOwnerFormProps = {
   newOwner?: string;
@@ -48,13 +48,14 @@ const ChangeOwnerForm = ({ newOwner }: ChangeOwnerFormProps) => {
   const { t } = useTranslation(["Confirm", "Common"]);
   const { linkData } = useContext(ConfirmRouteContext);
 
-  const ownerId = linkData.uid;
+  const ownerId = linkData.uid ?? "";
+  const confirmKey = linkData.confirmHeader ?? "";
 
   const [isOwnerChanged, setIsOwnerChanged] = useState(false);
 
   const onChangeOwnerClick = async () => {
     try {
-      await ownerChange(ownerId, linkData.confirmHeader);
+      await ownerChange(ownerId, confirmKey);
       setIsOwnerChanged(true);
       setTimeout(() => (location.href = "/"), 10000);
     } catch (error) {

packages/login/src/components/ConfirmRoute.tsx

@@ -32,9 +32,8 @@ import { useTranslation } from "react-i18next";
 
 import { getCookie } from "@docspace/shared/utils";
 import { LANGUAGE } from "@docspace/shared/constants";
-import { checkConfirmLink } from "@docspace/shared/api/user";
+import { checkConfirmLink, logout } from "@docspace/shared/api/user";
 
-import { logout } from "@/utils/actions";
 import { AuthenticatedAction, ValidationResult } from "@/utils/enums";
 import {
   TConfirmLinkResult,

packages/login/src/components/ContinuePortalForm/index.tsx

@@ -33,10 +33,10 @@ import { Link } from "@docspace/shared/components/link";
 import { Text } from "@docspace/shared/components/text";
 import { toastr } from "@docspace/shared/components/toast";
 import { Button, ButtonSize } from "@docspace/shared/components/button";
+import { continuePortal } from "@docspace/shared/api/portal";
 
 import withLoader from "@/HOCs/withLoader";
 import { TError } from "@/types";
-import { continuePortal } from "@/utils/actions";
 
 import { ConfirmRouteContext } from "../ConfirmRoute";
 import { ButtonsWrapper } from "../StyledConfirm.styled";

packages/login/src/components/CreateUserForm/index.tsx

@@ -59,12 +59,16 @@ import { TCreateUserData, TError, WithLoaderProps } from "@/types";
 import { SocialButtonsGroup } from "@docspace/shared/components/social-buttons-group";
 import { Text } from "@docspace/shared/components/text";
 import { login } from "@docspace/shared/api/user";
+import {
+  createUser,
+  getUserByEmail,
+  signupOAuth,
+} from "@docspace/shared/api/people";
 
 import SsoReactSvgUrl from "PUBLIC_DIR/images/sso.react.svg?url";
 
 import withLoader from "@/HOCs/withLoader";
 import useDeviceType from "@/hooks/useDeviceType";
-import { createUser, getUserByEmail, signupOAuth } from "@/utils/actions";
 import { ConfirmRouteContext } from "../ConfirmRoute";
 
 import EmailInputForm from "./sub-components/EmailInputForm";
@@ -141,7 +145,7 @@ const CreateUserForm = (props: CreateUserFormProps) => {
       };
 
       return signupOAuth(signupAccount)
-        .then(() => {
+        ?.then(() => {
           const url = roomData.roomId
             ? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}/`
             : defaultPage;

packages/login/src/components/DeactivatePortalForm/index.tsx

@@ -35,12 +35,12 @@ import { Button, ButtonSize } from "@docspace/shared/components/button";
 import { toastr } from "@docspace/shared/components/toast";
 
 import withLoader from "@/HOCs/withLoader";
-import { suspendPortal } from "@/utils/actions";
 import { TError, WithLoaderProps } from "@/types";
 import { URL_ONLYOFFICE } from "@/utils/constants";
 
 import { ButtonsWrapper } from "../StyledConfirm.styled";
 import { ConfirmRouteContext } from "../ConfirmRoute";
+import { suspendPortal } from "@docspace/shared/api/portal";
 
 type DeactivatePortalProps = {
   siteUrl?: string;

packages/login/src/components/EmailActivationHandler/index.tsx

@@ -31,9 +31,9 @@ import { useRouter } from "next/navigation";
 
 import { EmployeeActivationStatus } from "@docspace/shared/enums";
 import AppLoader from "@docspace/shared/components/app-loader";
+import { updateActivationStatus } from "@docspace/shared/api/people";
 
 import { TError } from "@/types";
-import { updateActivationStatus } from "@/utils/actions";
 
 import { ConfirmRouteContext } from "../ConfirmRoute";
 

packages/login/src/components/EmailChangeHandler/index.tsx

@@ -30,7 +30,7 @@ import AppLoader from "@docspace/shared/components/app-loader";
 import { useContext, useEffect, useState } from "react";
 import { ConfirmRouteContext } from "../ConfirmRoute";
 import { TError } from "@/types";
-import { changeEmail } from "@/utils/actions";
+import { changeEmail } from "@docspace/shared/api/people";
 
 const EmailChangeHandler = () => {
   const [error, setError] = useState<string>();
@@ -39,7 +39,7 @@ const EmailChangeHandler = () => {
   const { email = "", uid = "", key = "" } = linkData;
 
   useEffect(() => {
-    changeEmail(email, uid, key)
+    changeEmail(uid, email, key)
       .then(() => {
         window.location.replace(`/profile?email_change=success`);
       })

packages/login/src/components/PasswordChangeForm/index.tsx

@@ -41,9 +41,9 @@ import { TPasswordHash } from "@docspace/shared/api/settings/types";
 import { ALLOWED_PASSWORD_CHARACTERS } from "@docspace/shared/constants";
 
 import withLoader from "@/HOCs/withLoader";
-import { changePassword } from "@/utils/actions";
 import { TError, WithLoaderProps } from "@/types";
 import { ConfirmRouteContext } from "../ConfirmRoute";
+import { changePassword } from "@docspace/shared/api/people";
 
 type PasswordChangeFormProps = {
   passwordHash: TPasswordHash;
@@ -90,7 +90,7 @@ const PasswordChangeForm = ({
     try {
       const hash = createPasswordHash(password, passwordHash);
 
-      await changePassword(hash, uid, confirmHeader);
+      await changePassword(uid, hash, confirmHeader);
       setIsLoading(false);
       toastr.success(t("ChangePasswordSuccess"));
 

packages/login/src/components/ProfileRemoveForm /index.tsx

@@ -38,8 +38,8 @@ import { TError, WithLoaderProps } from "@/types";
 import { ConfirmRouteContext } from "../ConfirmRoute";
 import withLoader from "@/HOCs/withLoader";
 import { TColorScheme } from "@docspace/shared/themes";
-import { deleteSelf } from "@/utils/actions";
 import { GreetingContainer } from "../GreetingContainer";
+import { deleteSelf } from "@docspace/shared/api/people";
 
 type ProfileRemoveFormProps = {
   legalTerms: string;
@@ -61,7 +61,7 @@ const ProfileRemoveForm = ({
     setIsLoading(true);
 
     deleteSelf(linkData.confirmHeader)
-      .then(() => {
+      ?.then(() => {
         setIsLoading(false);
         setIsProfileDeleted(true);
       })

packages/login/src/components/RemovePortalForm/index.tsx

@@ -37,7 +37,7 @@ import { useContext, useState } from "react";
 import { TError, WithLoaderProps } from "@/types";
 import { ConfirmRouteContext } from "../ConfirmRoute";
 import { URL_ONLYOFFICE } from "@/utils/constants";
-import { deletePortal } from "@/utils/actions";
+import { deletePortal } from "@docspace/shared/api/portal";
 
 type RemovePortalFormProps = {
   siteUrl?: string;
@@ -55,8 +55,10 @@ const RemovePortalForm = ({ siteUrl }: RemovePortalFormProps) => {
     try {
       const res = await deletePortal(linkData.confirmHeader);
       setIsRemoved(true);
-      console.log("res", res);
+      setTimeout(
-      setTimeout(() => (location.href = res ? res : url), 10000);
+        () => (location.href = res && typeof res === "string" ? res : url),
+        10000,
+      );
     } catch (error) {
       const knownError = error as TError;
       let errorMessage: string;