mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 23:27:35 +00:00
fixed bugs with env and password reset
This commit is contained in:
@@ -30,7 +30,6 @@ interface FeatureSet {
|
|||||||
customRateLimits: boolean;
|
customRateLimits: boolean;
|
||||||
customAlerts: boolean;
|
customAlerts: boolean;
|
||||||
auditLogs: boolean;
|
auditLogs: boolean;
|
||||||
envLimit?: number | null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -60,8 +59,7 @@ class EELicenseService {
|
|||||||
rbac: true,
|
rbac: true,
|
||||||
customRateLimits: true,
|
customRateLimits: true,
|
||||||
customAlerts: true,
|
customAlerts: true,
|
||||||
auditLogs: false,
|
auditLogs: false
|
||||||
envLimit: null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public localFeatureSet: NodeCache;
|
public localFeatureSet: NodeCache;
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ export default function InitialLoginStep({
|
|||||||
{t('login.continue-with-google')}
|
{t('login.continue-with-google')}
|
||||||
</Button>
|
</Button>
|
||||||
</div> */}
|
</div> */}
|
||||||
<div className="relative md:px-1.5 flex items-center justify-center lg:w-1/6 w-1/4 min-w-[20rem] md:min-w-[22rem] mx-auto w-full rounded-lg max-h-24 md:max-h-28">
|
<div className="relative md:px-1.5 flex items-center justify-center lg:w-1/6 w-1/4 min-w-[21.3rem] md:min-w-[22rem] mx-auto rounded-lg max-h-24 md:max-h-28">
|
||||||
<div className="flex items-center justify-center w-full md:px-2 md:py-1 rounded-lg max-h-24 md:max-h-28">
|
<div className="flex items-center justify-center w-full md:px-2 md:py-1 rounded-lg max-h-24 md:max-h-28">
|
||||||
<Input
|
<Input
|
||||||
value={email}
|
value={email}
|
||||||
@@ -89,7 +89,7 @@ export default function InitialLoginStep({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="relative pt-2 md:pt-0 md:px-1.5 flex items-center justify-center lg:w-1/6 w-1/4 min-w-[20rem] md:min-w-[22rem] mx-auto w-full rounded-lg max-h-24 md:max-h-28">
|
<div className="relative pt-2 md:pt-0 md:px-1.5 flex items-center justify-center w-1/4 lg:w-1/6 min-w-[21.3rem] md:min-w-[22rem] mx-auto rounded-lg max-h-24 md:max-h-28">
|
||||||
<div className="flex items-center justify-center w-full md:p-2 rounded-lg max-h-24 md:max-h-28">
|
<div className="flex items-center justify-center w-full md:p-2 rounded-lg max-h-24 md:max-h-28">
|
||||||
<Input
|
<Input
|
||||||
value={password}
|
value={password}
|
||||||
@@ -137,5 +137,11 @@ export default function InitialLoginStep({
|
|||||||
<span className='hover:underline hover:underline-offset-4 hover:decoration-primary-700 hover:text-bunker-200 duration-200 cursor-pointer'>{t('login.create-account')}</span>
|
<span className='hover:underline hover:underline-offset-4 hover:decoration-primary-700 hover:text-bunker-200 duration-200 cursor-pointer'>{t('login.create-account')}</span>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="text-bunker-400 text-sm flex flex-row">
|
||||||
|
<span className="mr-1">Forgot password?</span>
|
||||||
|
<Link href="/verify-email">
|
||||||
|
<span className='hover:underline hover:underline-offset-4 hover:decoration-primary-700 hover:text-bunker-200 duration-200 cursor-pointer'>Recover your account</span>
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,5 +12,5 @@ export type SubscriptionPlan = {
|
|||||||
tier: number;
|
tier: number;
|
||||||
workspaceLimit: number;
|
workspaceLimit: number;
|
||||||
workspacesUsed: number;
|
workspacesUsed: number;
|
||||||
envLimit: number;
|
environmentLimit: number;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -41,12 +41,11 @@ import {
|
|||||||
CreateServiceToken,
|
CreateServiceToken,
|
||||||
CreateUpdateEnvFormData,
|
CreateUpdateEnvFormData,
|
||||||
CreateWsTag,
|
CreateWsTag,
|
||||||
|
E2EESection,
|
||||||
EnvironmentSection,
|
EnvironmentSection,
|
||||||
ProjectIndexSecretsSection,
|
ProjectIndexSecretsSection,
|
||||||
ProjectNameChangeSection,
|
ProjectNameChangeSection,
|
||||||
ServiceTokenSection,
|
ServiceTokenSection} from './components';
|
||||||
E2EESection
|
|
||||||
} from './components';
|
|
||||||
|
|
||||||
export const ProjectSettingsPage = () => {
|
export const ProjectSettingsPage = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -91,7 +90,7 @@ export const ProjectSettingsPage = () => {
|
|||||||
// get user subscription
|
// get user subscription
|
||||||
const { subscription } = useSubscription();
|
const { subscription } = useSubscription();
|
||||||
const host = window.location.origin;
|
const host = window.location.origin;
|
||||||
const isEnvServiceAllowed = ((currentWorkspace?.environments || []).length < (subscription?.envLimit || 3) || host !== 'https://app.infisical.com');
|
const isEnvServiceAllowed = (((currentWorkspace?.environments || []).length < (subscription?.environmentLimit || 3)) || host !== 'https://app.infisical.com');
|
||||||
|
|
||||||
const onRenameWorkspace = async (name: string) => {
|
const onRenameWorkspace = async (name: string) => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user