Skip to content
Snippets Groups Projects
Unverified Commit 07c2bccf authored by Samuel Couillard's avatar Samuel Couillard Committed by GitHub
Browse files

Add external_account to currentUser (#4740)

parent dc58f100
Branches
No related tags found
No related merge requests found
......@@ -36,11 +36,14 @@ export default function UpdateUserForm({ user }) {
<Form methods={methods} onSubmit={updateUserAPI.mutate}>
<FormControl field={fields.name} type="text" />
<FormControl field={fields.email} type="email" readOnly />
{ !currentUser?.external_account
&& (
<FormSelect field={fields.language} variant="dropdown">
{
Object.keys(localesAPI.data || {}).map((code) => <Option key={code} value={code}>{localesAPI.data[code]}</Option>)
}
</FormSelect>
)}
{(canUpdateRole && rolesAPI.data) && (
<FormSelect field={fields.role_id} variant="dropdown">
{
......
......@@ -27,6 +27,7 @@ export default function AuthProvider({ children }) {
role: currentUser?.role,
verified: currentUser?.verified,
status: currentUser?.status,
external_account: currentUser?.external_account,
stateChanging: false,
};
......
# frozen_string_literal: true
class CurrentUserSerializer < UserSerializer
attributes :signed_in, :permissions, :status
attributes :signed_in, :permissions, :status, :external_account
def signed_in
true
end
def external_account
object.external_id?
end
def permissions
RolePermission.joins(:permission)
.where(role_id: object.role_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment