diff --git a/dictation_client/src/features/account/selectors.ts b/dictation_client/src/features/account/selectors.ts index 23a0bfe..e99fdc1 100644 --- a/dictation_client/src/features/account/selectors.ts +++ b/dictation_client/src/features/account/selectors.ts @@ -1,4 +1,4 @@ -import { Dealer } from "api/api"; +import { Dealer, User } from "api/api"; import { RootState } from "app/store"; export const selectAccountInfo = (state: RootState) => @@ -10,7 +10,8 @@ export const selectDealers = (state: RootState) => { const { country } = state.account.domain.getAccountInfo.account; return dealers.filter((x: Dealer) => x.country === country); }; -export const selectUsers = (state: RootState) => state.account.domain.users; +export const selectUsers = (state: RootState) => + state.account.domain.users.filter((x: User) => x.emailVerified); export const selectIsLoading = (state: RootState) => state.account.apps.isLoading; export const selectUpdateAccountInfo = (state: RootState) => diff --git a/dictation_client/src/features/login/operations.ts b/dictation_client/src/features/login/operations.ts index ffbf4e9..cc7c65c 100644 --- a/dictation_client/src/features/login/operations.ts +++ b/dictation_client/src/features/login/operations.ts @@ -1,6 +1,6 @@ import { createAsyncThunk } from "@reduxjs/toolkit"; import type { RootState } from "app/store"; -import { getAccessToken, setToken } from "features/auth"; +import { setToken } from "features/auth"; import { AuthApi, UsersApi, diff --git a/dictation_server/src/repositories/accounts/accounts.repository.service.ts b/dictation_server/src/repositories/accounts/accounts.repository.service.ts index 65fe99d..8380461 100644 --- a/dictation_server/src/repositories/accounts/accounts.repository.service.ts +++ b/dictation_server/src/repositories/accounts/accounts.repository.service.ts @@ -886,11 +886,12 @@ export class AccountsRepositoryService { where: { id: primaryAdminUserId, account_id: myAccountId, + email_verified: true, }, }); if (!primaryAdminUser) { throw new AdminUserNotFoundError( - `Primary admin user is not found. id: ${primaryAdminUserId}, account_id: ${myAccountId}`, + `Primary admin user is not found or email not verified. id: ${primaryAdminUserId}, account_id: ${myAccountId}`, ); } } @@ -901,11 +902,12 @@ export class AccountsRepositoryService { where: { id: secondryAdminUserId, account_id: myAccountId, + email_verified: true, }, }); if (!secondryAdminUser) { throw new AdminUserNotFoundError( - `Secondry admin user is not found. id: ${secondryAdminUserId}, account_id: ${myAccountId}`, + `Secondary admin user is not found or email not verified. id: ${secondryAdminUserId}, account_id: ${myAccountId}`, ); } }