Skip to content

Commit

Permalink
Merge upstream changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Sync Fork committed Jan 5, 2024
1 parent ca90c24 commit 9f7278f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .changeset/slimy-avocados-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@nhost/dashboard': patch
'@nhost/docs': patch
---

chore: change `Allowed Roles` to `Default Allowed Roles`
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export interface RoleSettingsFormValues {
*/
authUserDefaultRole: string;
/**
* Allowed roles for the project.
* Default Allowed roles for the project.
*/
authUserDefaultAllowedRoles: Role[];
}
Expand Down Expand Up @@ -169,8 +169,8 @@ export default function RoleSettings() {

return (
<SettingsContainer
title="Allowed Roles"
description="Allowed roles are roles users get automatically when they sign up."
title="Default Allowed Roles"
description="Default Allowed Roles are roles users get automatically when they sign up."
docsLink="https://docs.nhost.io/authentication/users#allowed-roles"
rootClassName="gap-0"
className={twMerge(
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/authentication/users.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ The default role is used when no role is specified in the request. By default, u

You can change what the default role for new users should be at **Settings -> Roles and Permissions**.

### Allowed Roles
### Default Allowed Roles

Allowed roles are roles the user is allowed to use when making a request. Usually, you would change the role from `user` (the default role) to some other role because you want to use a different role to resolve permissions for a particular request.
Default Allowed roles are roles the user is allowed to use when making a request. Usually, you would change the role from `user` (the default role) to some other role because you want to use a different role to resolve permissions for a particular request.

By default, users have two allowed roles:

Expand Down

0 comments on commit 9f7278f

Please sign in to comment.