Skip to content

Commit

Permalink
Update sidebaritems.ts to fix Account request label (sourcegraph#49178)
Browse files Browse the repository at this point in the history
* Update admin routes to "/account-requests"

Co-authored-by: Erzhan Torokulov <erzhan.torokulov@gmail.com>
  • Loading branch information
rrhyne and erzhtor committed Mar 21, 2023
1 parent d05d8db commit 4bc4234
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const AccessRequestsGlobalNavItem: React.FunctionComponent<AccessRequests
<ButtonLink
variant="success"
size="sm"
to="/site-admin/access-requests"
to="/site-admin/account-requests"
className="d-flex align-items-center py-1"
>
<Icon svgPath={mdiAccountPlus} size="md" aria-label="Account requests icons" color="var(--success-2)" />
Expand Down
2 changes: 1 addition & 1 deletion client/web/src/site-admin/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const otherSiteAdminRoutes: readonly SiteAdminAreaRoute[] = [
render: props => <SiteAdminOrgsPage {...props} />,
},
{
path: '/access-requests',
path: '/account-requests',
render: () => <AccessRequestsPage />,
condition: context =>
checkRequestAccessAllowed(
Expand Down
4 changes: 2 additions & 2 deletions client/web/src/site-admin/sidebaritems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ export const usersGroup: SiteAdminSideBarGroup = {
to: '/site-admin/users',
},
{
label: 'Access requests',
to: '/site-admin/access-requests',
label: 'Account requests',
to: '/site-admin/account-requests',
condition: context =>
checkRequestAccessAllowed(
context.isSourcegraphDotCom,
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/auth/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ You can use the filter `allowSignup`, available in the builtin configuration, to

If set to `true`, users will see a sign-up link under the login form and will have access to the sign-up page, where they can create their accounts without restriction.

When not set, it will default to `false` -- in this case, users will see request access link. Unauthenticated users can submit request access forms and admins will get notification on the instance which they can approve or reject. Access request feature can be disabled by setting `experimentalFeatures.accessRequest.enabled: false`, and in this case new user accounts should be created by the site admin manually.
When not set, it will default to `false` -- in this case, users will see request access link. Unauthenticated users can submit request access forms and admins will get notification on the instance which they can approve or reject. Account request feature can be disabled by setting `experimentalFeatures.accessRequest.enabled: false`, and in this case new user accounts should be created by the site admin manually.

If you choose to block sign-ups by using the `allowSignup` filter avaliable in another auth provider (eg., [GitHub](#how-to-control-user-sign-up-and-sign-in-with-github-auth-provider) or [GiLab](#how-to-control-user-sign-up-and-sign-in-with-gitlab-auth-provider)), make sure this builtin filter is removed or set to `false`. Otherwise, users will have a way to bypass the restriction.

Expand Down

0 comments on commit 4bc4234

Please sign in to comment.