Unverified Commit ccc06f7b authored by Denys Butenko's avatar Denys Butenko Committed by GitHub
Browse files

NAS-117438 / 22.12 / Remove `Microsoft Account` from user (#6912)

parent d2e75693
Showing with 0 additions and 47 deletions
+0 -47
......@@ -50,7 +50,5 @@ export default {
user_form_sudo_tooltip: T('Give this user permission to use <a \
href="https://www.sudo.ws/" target="_blank">sudo</a>. When using sudo, \
a user is prompted for their account <b>Password</b>.'),
user_form_microsoft_tooltip: T('Set to allow additional username authentication\
methods when the user is connecting from a Windows 8 or newer operating system.'),
user_form_smb_tooltip: T('Set to allow user to authenticate to Samba shares.'),
};
......@@ -17,7 +17,6 @@ export interface User {
sudo: boolean;
sudo_nopasswd: boolean;
sudo_commands: string[];
microsoft_account: boolean;
attributes: {
preferences: Preferences;
dashState: DashConfigItem[];
......@@ -58,7 +57,6 @@ export interface UserUpdate {
password?: string;
password_disabled?: boolean;
locked?: boolean;
microsoft_account?: boolean;
smb?: boolean;
sudo?: boolean;
sudo_nopasswd?: boolean;
......
......@@ -33,7 +33,6 @@ const dummyUser = {
sudo: false,
sudo_nopasswd: false,
sudo_commands: [],
microsoft_account: false,
email: 'test-user@test-user.com',
group: {
id: 41,
......
......@@ -44,7 +44,6 @@ export class UserDetailsRowComponent {
{ label: this.translate.instant('Password Disabled'), value: user.password_disabled.toString() },
{ label: this.translate.instant('Lock User'), value: user.locked.toString() },
{ label: this.translate.instant('Permit Sudo'), value: user.sudo.toString() },
{ label: this.translate.instant('Microsoft Account'), value: user.microsoft_account.toString() },
{ label: this.translate.instant('Samba Authentication'), value: user.smb.toString() },
];
}
......
......@@ -123,11 +123,6 @@
[label]="'Permit Sudo' | translate"
[tooltip]="tooltips.sudo | translate"
></ix-checkbox>
<ix-checkbox
formControlName="microsoft_account"
[label]="'Microsoft Account' | translate"
[tooltip]="tooltips.microsoft_account | translate"
></ix-checkbox>
<ix-checkbox
formControlName="smb"
[label]="'Samba Authentication' | translate"
......
......@@ -36,7 +36,6 @@ const mockUser = {
sudo: false,
sudo_nopasswd: false,
sudo_commands: [],
microsoft_account: false,
email: null,
sshpubkey: null,
group: {
......@@ -202,7 +201,6 @@ describe('UserFormComponent', () => {
'Home Directory Permissions': '700',
'Home Directory': '/home/test',
'Lock User': false,
'Microsoft Account': false,
'Permit Sudo': false,
'Primary Group': 'test-group',
'Samba Authentication': true,
......@@ -222,7 +220,6 @@ describe('UserFormComponent', () => {
'Full Name': 'updated',
'Home Directory Permissions': '755',
'Home Directory': '/home/updated',
'Microsoft Account': true,
'Permit Sudo': true,
'Primary Group': 'mock-group',
'Samba Authentication': false,
......@@ -244,7 +241,6 @@ describe('UserFormComponent', () => {
home_mode: '755',
home: '/home/updated',
locked: true,
microsoft_account: true,
password_disabled: false,
shell: '/usr/bin/zsh',
smb: false,
......@@ -285,7 +281,6 @@ describe('UserFormComponent', () => {
'Home Directory': true,
'Primary Group': true,
Username: true,
'Microsoft Account': true,
}));
});
});
......
......@@ -81,7 +81,6 @@ export class UserFormComponent {
shell: [null as string],
locked: [false],
sudo: [false],
microsoft_account: [false],
smb: [true],
});
......@@ -103,7 +102,6 @@ export class UserFormComponent {
shell: helptext.user_form_shell_tooltip,
locked: helptext.user_form_lockuser_tooltip,
sudo: helptext.user_form_sudo_tooltip,
microsoft_account: helptext.user_form_microsoft_tooltip,
smb: helptext.user_form_smb_tooltip,
};
......@@ -166,7 +164,6 @@ export class UserFormComponent {
home_mode: values.home_mode,
home: values.home,
locked: values.password_disabled ? false : values.locked,
microsoft_account: values.microsoft_account,
password_disabled: values.password_disabled,
shell: values.shell,
smb: values.smb,
......@@ -250,7 +247,6 @@ export class UserFormComponent {
groups: user.groups,
home: user.home,
locked: user.locked,
microsoft_account: user.builtin ? false : user.microsoft_account,
password_disabled: user.password_disabled,
shell: user.shell,
smb: user.smb,
......@@ -268,7 +264,6 @@ export class UserFormComponent {
this.form.get('home_mode').disable();
this.form.get('home').disable();
this.form.get('username').disable();
this.form.get('microsoft_account').disable();
}
this.setNamesInUseValidator(user.username);
......
......@@ -31,7 +31,6 @@ export const fakeUserDataSource: User[] = [{
sudo: false,
sudo_nopasswd: false,
sudo_commands: [],
microsoft_account: false,
email: 'root@root.root',
group: {
id: 41,
......@@ -53,7 +52,6 @@ export const fakeUserDataSource: User[] = [{
sudo: false,
sudo_nopasswd: false,
sudo_commands: [],
microsoft_account: false,
email: null,
group: {
id: 101,
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
......@@ -2598,7 +2598,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......@@ -3879,7 +3878,6 @@
"Members": "Členové",
"Memory": "Operační paměť",
"Method": "Metoda",
"Microsoft Account": "Účet Microsoft",
"Minimum Passive Port": "Nejnižší číslo pasivního portu",
"Minute": "Minuta",
"Mirror": "Zrcadlo",
......
......@@ -2091,7 +2091,6 @@
"Metrics": "",
"MiB": "",
"MiB. Units smaller than MiB are not allowed.": "",
"Microsoft Account": "",
"Microsoft Onedrive <a href=\"https://docs.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/authentication\" target=\"_blank\">Access Token</a>. Log in to the Microsoft account to add an access token.": "",
"Migrate applications to the new pool": "",
"Min Poll": "",
......@@ -3059,7 +3058,6 @@
"Set the share name. If left empty, share name is the list of selected <b>Path</b> entries.": "",
"Set this replication on a schedule or just once.": "",
"Set to allow FTP clients to resume interrupted transfers.": "",
"Set to allow additional username authentication methods when the user is connecting from a Windows 8 or newer operating system.": "",
"Set to allow an initiator to bypass normal access control and access any scannable target. This allows <a href=\"https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc771254(v=ws.11)\" target=\"_blank\">xcopy</a> operations which are otherwise blocked by access control.": "",
"Set to allow group to be used for Samba permissions and authentication.": "",
"Set to allow the client to mount any subdirectory within the <b>Path</b>.": "",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment