From 44108621b42cdb383ddeccc77cb358327b0b06a6 Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Fri, 21 Jul 2023 15:01:28 +0700 Subject: [PATCH] Run linter, fix import error --- frontend/src/hooks/api/index.tsx | 2 +- frontend/src/hooks/api/organization/queries.tsx | 2 ++ frontend/src/hooks/api/ssoConfig/index.tsx | 2 +- frontend/src/hooks/api/ssoConfig/queries.tsx | 5 +++-- frontend/src/pages/login/index.tsx | 1 + frontend/src/pages/login/sso/index.tsx | 1 + frontend/src/pages/signup/index.tsx | 1 + frontend/src/pages/signup/sso/index.tsx | 1 + frontend/src/views/Login/Login.tsx | 3 ++- frontend/src/views/Login/LoginSSO.tsx | 1 + .../components/OrgAuthTab/OrgSSOSection.tsx | 2 ++ .../components/OrgAuthTab/SSOModal.tsx | 3 ++- frontend/src/views/Signup/SignupSSO.tsx | 10 +++++----- .../components/BackupPDFStep/BackupPDFStep.tsx | 3 ++- .../UserInfoSSOStep/UserInfoSSOStep.tsx | 17 +++++++++-------- frontend/src/views/Signup/components/index.tsx | 4 ++-- 16 files changed, 36 insertions(+), 22 deletions(-) diff --git a/frontend/src/hooks/api/index.tsx b/frontend/src/hooks/api/index.tsx index 832f05c25..59840d9b3 100644 --- a/frontend/src/hooks/api/index.tsx +++ b/frontend/src/hooks/api/index.tsx @@ -5,13 +5,13 @@ export * from "./integrationAuth"; export * from "./integrations"; export * from "./keys"; export * from "./organization"; -export * from "./ssoConfig"; export * from "./secretFolders"; export * from "./secretImports"; export * from "./secrets"; export * from "./secretSnapshots"; export * from "./serviceAccounts"; export * from "./serviceTokens"; +export * from "./ssoConfig"; export * from "./subscriptions"; export * from "./tags"; export * from "./users"; diff --git a/frontend/src/hooks/api/organization/queries.tsx b/frontend/src/hooks/api/organization/queries.tsx index a6d346dfb..63de2773d 100644 --- a/frontend/src/hooks/api/organization/queries.tsx +++ b/frontend/src/hooks/api/organization/queries.tsx @@ -1,5 +1,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; + import { apiRequest } from "@app/config/request"; + import { BillingDetails, Invoice, diff --git a/frontend/src/hooks/api/ssoConfig/index.tsx b/frontend/src/hooks/api/ssoConfig/index.tsx index 173a327b1..5b618ed07 100644 --- a/frontend/src/hooks/api/ssoConfig/index.tsx +++ b/frontend/src/hooks/api/ssoConfig/index.tsx @@ -1,5 +1,5 @@ export { - useGetSSOConfig, useCreateSSOConfig, + useGetSSOConfig, useUpdateSSOConfig } from "./queries"; \ No newline at end of file diff --git a/frontend/src/hooks/api/ssoConfig/queries.tsx b/frontend/src/hooks/api/ssoConfig/queries.tsx index 328902e3b..c17c2531a 100644 --- a/frontend/src/hooks/api/ssoConfig/queries.tsx +++ b/frontend/src/hooks/api/ssoConfig/queries.tsx @@ -1,4 +1,5 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; + import { apiRequest } from "@app/config/request"; const ssoConfigKeys = { @@ -40,7 +41,7 @@ export const useCreateSSOConfig = () => { audience: string; }) => { const { data } = await apiRequest.post( - `/api/v1/sso/config`, + "/api/v1/sso/config", { organizationId, authProvider, @@ -81,7 +82,7 @@ export const useUpdateSSOConfig = () => { audience?: string; }) => { const { data } = await apiRequest.patch( - `/api/v1/sso/config`, + "/api/v1/sso/config", { organizationId, ...(authProvider !== undefined ? { authProvider } : {}), diff --git a/frontend/src/pages/login/index.tsx b/frontend/src/pages/login/index.tsx index ebcfb3bd2..cf1d96d1f 100644 --- a/frontend/src/pages/login/index.tsx +++ b/frontend/src/pages/login/index.tsx @@ -2,6 +2,7 @@ import { useTranslation } from "react-i18next"; import Head from "next/head"; import Image from "next/image"; import Link from "next/link"; + import { Login } from "@app/views/Login"; export default function LoginPage() { diff --git a/frontend/src/pages/login/sso/index.tsx b/frontend/src/pages/login/sso/index.tsx index b0812e9bc..95bffab70 100644 --- a/frontend/src/pages/login/sso/index.tsx +++ b/frontend/src/pages/login/sso/index.tsx @@ -3,6 +3,7 @@ import Head from "next/head"; import Image from "next/image"; import Link from "next/link"; import { useRouter } from "next/router" + import { LoginSSO } from "@app/views/Login"; export default function LoginSSOPage() { diff --git a/frontend/src/pages/signup/index.tsx b/frontend/src/pages/signup/index.tsx index 97cb61c2d..ff8c41e61 100644 --- a/frontend/src/pages/signup/index.tsx +++ b/frontend/src/pages/signup/index.tsx @@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next"; import Head from "next/head"; import Image from "next/image"; import { useRouter } from "next/router"; + import CodeInputStep from "@app/components/signup/CodeInputStep"; import DownloadBackupPDF from "@app/components/signup/DonwloadBackupPDFStep"; import EnterEmailStep from "@app/components/signup/EnterEmailStep"; diff --git a/frontend/src/pages/signup/sso/index.tsx b/frontend/src/pages/signup/sso/index.tsx index 95a710cff..5d964f38d 100644 --- a/frontend/src/pages/signup/sso/index.tsx +++ b/frontend/src/pages/signup/sso/index.tsx @@ -2,6 +2,7 @@ import { useTranslation } from "react-i18next"; import Head from "next/head"; import Image from "next/image"; import { useRouter } from "next/router" + import { SignupSSO } from "@app/views/Signup"; export default function SignupSSOPage() { diff --git a/frontend/src/views/Login/Login.tsx b/frontend/src/views/Login/Login.tsx index 95d8cc7be..6a54268e9 100644 --- a/frontend/src/views/Login/Login.tsx +++ b/frontend/src/views/Login/Login.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from "react"; import { useRouter } from "next/router"; import axios from "axios" + import { fetchUserDetails } from "@app/hooks/api/users/queries"; -import getOrganizations from "@app/pages/api/organization/GetOrgs"; +import getOrganizations from "@app/pages/api/organization/getOrgs"; import { getAuthToken, isLoggedIn } from "@app/reactQuery"; import { diff --git a/frontend/src/views/Login/LoginSSO.tsx b/frontend/src/views/Login/LoginSSO.tsx index c79f979ef..170b591d4 100644 --- a/frontend/src/views/Login/LoginSSO.tsx +++ b/frontend/src/views/Login/LoginSSO.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from "react"; import { useRouter } from "next/router" import jwt_decode from "jwt-decode"; + import { MFAStep, PasswordStep diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OrgSSOSection.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OrgSSOSection.tsx index 7bca2594a..7f6b2c0e3 100644 --- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OrgSSOSection.tsx +++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OrgSSOSection.tsx @@ -1,5 +1,6 @@ import { faPlus } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; + import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider"; import { Button , Switch } from "@app/components/v2"; import { useOrganization } from "@app/context"; @@ -8,6 +9,7 @@ import { useUpdateSSOConfig } from "@app/hooks/api"; import { usePopUp } from "@app/hooks/usePopUp"; + import { SSOModal } from "./SSOModal"; const ssoAuthProviderMap: { [key: string]: string } = { diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx index 5d394f593..15cffa761 100644 --- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx +++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/SSOModal.tsx @@ -2,6 +2,7 @@ import { useEffect } from "react"; import { Controller, useForm } from "react-hook-form"; import { yupResolver } from "@hookform/resolvers/yup"; import * as yup from "yup"; + import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider"; import { Button, @@ -14,8 +15,8 @@ import { TextArea} from "@app/components/v2"; import { useOrganization } from "@app/context"; import { - useGetSSOConfig, useCreateSSOConfig, + useGetSSOConfig, useUpdateSSOConfig } from "@app/hooks/api"; import { UsePopUpState } from "@app/hooks/usePopUp"; diff --git a/frontend/src/views/Signup/SignupSSO.tsx b/frontend/src/views/Signup/SignupSSO.tsx index 19b3c02a2..b82b2f00c 100644 --- a/frontend/src/views/Signup/SignupSSO.tsx +++ b/frontend/src/views/Signup/SignupSSO.tsx @@ -1,10 +1,10 @@ import { useState } from "react"; -import { - UserInfoSSOStep, - BackupPDFStep -} from "./components"; import jwt_decode from "jwt-decode"; +import { + BackupPDFStep, + UserInfoSSOStep} from "./components"; + type Props = { providerAuthToken: string; } @@ -45,7 +45,7 @@ export const SignupSSO = ({ /> ); default: - return
+ return
} } diff --git a/frontend/src/views/Signup/components/BackupPDFStep/BackupPDFStep.tsx b/frontend/src/views/Signup/components/BackupPDFStep/BackupPDFStep.tsx index 5552b7154..8e8b582c1 100644 --- a/frontend/src/views/Signup/components/BackupPDFStep/BackupPDFStep.tsx +++ b/frontend/src/views/Signup/components/BackupPDFStep/BackupPDFStep.tsx @@ -1,7 +1,8 @@ -import { useRouter } from "next/router" import { useTranslation } from "react-i18next"; +import { useRouter } from "next/router" import { faWarning } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; + import issueBackupKey from "@app/components/utilities/cryptography/issueBackupKey"; import { Button } from "@app/components/v2"; diff --git a/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx b/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx index 68a501ae1..4423f54d5 100644 --- a/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx +++ b/frontend/src/views/Signup/components/UserInfoSSOStep/UserInfoSSOStep.tsx @@ -1,16 +1,14 @@ +import crypto from "crypto"; + import React, { useState } from "react"; -import crypto from "crypto"; import { useTranslation } from "react-i18next"; import { faXmark } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import jsrp from "jsrp"; import nacl from "tweetnacl"; import { encodeBase64 } from "tweetnacl-util"; -import { useGetCommonPasswords } from "@app/hooks/api"; -import completeAccountInformationSignup from "@app/pages/api/auth/CompleteAccountInformationSignup"; -import getOrganizations from "@app/pages/api/organization/getOrgs"; -import ProjectService from "@app/services/ProjectService"; + import InputField from "@app/components/basic/InputField"; import checkPassword from "@app/components/utilities/checks/checkPassword"; import Aes256Gcm from "@app/components/utilities/cryptography/aes-256-gcm"; @@ -18,7 +16,10 @@ import { deriveArgonKey } from "@app/components/utilities/cryptography/crypto"; import { saveTokenToLocalStorage } from "@app/components/utilities/saveTokenToLocalStorage"; import SecurityClient from "@app/components/utilities/SecurityClient"; import { Button, Input } from "@app/components/v2"; -import { setSignupTempToken } from "@app/reactQuery"; +import { useGetCommonPasswords } from "@app/hooks/api"; +import completeAccountInformationSignup from "@app/pages/api/auth/CompleteAccountInformationSignup"; +import getOrganizations from "@app/pages/api/organization/getOrgs"; +import ProjectService from "@app/services/ProjectService"; // eslint-disable-next-line new-cap const client = new jsrp.client(); @@ -212,7 +213,7 @@ export const UserInfoSSOStep = ({ {organizationNameError &&

Please, specify your organization name

}
diff --git a/frontend/src/views/Signup/components/index.tsx b/frontend/src/views/Signup/components/index.tsx index 6c6e87831..4ae3ec526 100644 --- a/frontend/src/views/Signup/components/index.tsx +++ b/frontend/src/views/Signup/components/index.tsx @@ -1,2 +1,2 @@ -export { UserInfoSSOStep } from "./UserInfoSSOStep"; -export { BackupPDFStep } from "./BackupPDFStep"; \ No newline at end of file +export { BackupPDFStep } from "./BackupPDFStep"; +export { UserInfoSSOStep } from "./UserInfoSSOStep"; \ No newline at end of file