Skip to content

Commit

Permalink
small nits for admin login toggle pr
Browse files Browse the repository at this point in the history
  • Loading branch information
maidul98 committed Jun 28, 2024
1 parent d6881e2 commit 59fc344
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion backend/src/ee/services/ldap-config/ldap-config-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ export const ldapConfigServiceFactory = ({

if (serverCfg.enabledLoginMethods && !serverCfg.enabledLoginMethods.includes(LoginMethod.LDAP)) {
throw new BadRequestError({
message: "Login with LDAP is disabled."
message: "Login with LDAP is disabled by administrator."
});
}

Expand Down
2 changes: 1 addition & 1 deletion backend/src/ee/services/oidc/oidc-config-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export const oidcConfigServiceFactory = ({

if (serverCfg.enabledLoginMethods && !serverCfg.enabledLoginMethods.includes(LoginMethod.OIDC)) {
throw new BadRequestError({
message: "Login with OIDC is disabled."
message: "Login with OIDC is disabled by administrator."
});
}

Expand Down
2 changes: 1 addition & 1 deletion backend/src/ee/services/saml-config/saml-config-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ export const samlConfigServiceFactory = ({

if (serverCfg.enabledLoginMethods && !serverCfg.enabledLoginMethods.includes(LoginMethod.SAML)) {
throw new BadRequestError({
message: "Login with SAML is disabled."
message: "Login with SAML is disabled by administrator."
});
}

Expand Down
8 changes: 4 additions & 4 deletions backend/src/services/auth/auth-login-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export const authLoginServiceFactory = ({
!providerAuthToken
) {
throw new BadRequestError({
message: "Login with email is disabled."
message: "Login with email is disabled by administrator."
});
}

Expand Down Expand Up @@ -526,7 +526,7 @@ export const authLoginServiceFactory = ({
case AuthMethod.GITHUB: {
if (!serverCfg.enabledLoginMethods.includes(LoginMethod.GITHUB)) {
throw new BadRequestError({
message: "Login with Github is disabled.",
message: "Login with Github is disabled by administrator.",
name: "Oauth 2 login"
});
}
Expand All @@ -535,7 +535,7 @@ export const authLoginServiceFactory = ({
case AuthMethod.GOOGLE: {
if (!serverCfg.enabledLoginMethods.includes(LoginMethod.GOOGLE)) {
throw new BadRequestError({
message: "Login with Google is disabled.",
message: "Login with Google is disabled by administrator.",
name: "Oauth 2 login"
});
}
Expand All @@ -544,7 +544,7 @@ export const authLoginServiceFactory = ({
case AuthMethod.GITLAB: {
if (!serverCfg.enabledLoginMethods.includes(LoginMethod.GITLAB)) {
throw new BadRequestError({
message: "Login with Gitlab is disabled.",
message: "Login with Gitlab is disabled by administrator.",
name: "Oauth 2 login"
});
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/admin/DashboardPage/AuthPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const AuthPanel = () => {
<div className="flex flex-col justify-start">
<div className="mb-2 text-xl font-semibold text-mineshaft-100">Login Methods</div>
<div className="mb-4 max-w-sm text-sm text-mineshaft-400">
Select the login methods available to users
Select the login methods you wish to allow for all users of this instance.
</div>
<Controller
control={control}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/admin/DashboardPage/DashboardPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const AdminDashboardPage = () => {
<div className="mx-auto mb-6 w-full max-w-7xl pt-6">
<div className="mb-8 flex flex-col items-start justify-between text-xl">
<h1 className="text-3xl font-semibold">Admin Dashboard</h1>
<p className="text-base text-bunker-300">Manage your Infisical instance.</p>
<p className="text-base text-bunker-300">Manage your instance level configurations.</p>
</div>
</div>
{isUserLoading || isNotAllowed ? (
Expand All @@ -133,7 +133,7 @@ export const AdminDashboardPage = () => {
<TabList>
<div className="flex w-full flex-row border-b border-mineshaft-600">
<Tab value={TabSections.Settings}>General</Tab>
<Tab value={TabSections.Auth}>Auth</Tab>
<Tab value={TabSections.Auth}>Authentication</Tab>
<Tab value={TabSections.RateLimit}>Rate Limit</Tab>
</div>
</TabList>
Expand Down

0 comments on commit 59fc344

Please sign in to comment.