From 55049fceb978f2e20b13800b77775377428de386 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvomacka@redhat.com>
Date: Jun 30 2016 11:42:58 +0000
Subject: Add authentication identificator to host page


Also move strings which are connected with authentication indicators to authtype dict.
This place is more general than have them in service dict. It's nicer when these strings are
not used only on service page.

Part of: https://fedorahosted.org/freeipa/ticket/5872

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>

---

diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index 677da96..ba8d0f2 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -109,6 +109,26 @@ return {
                             flags: ['w_if_no_aci']
                         },
                         {
+                            $type: 'custom_checkboxes',
+                            label: '@i18n:authtype.auth_indicators',
+                            name: 'krbprincipalauthind',
+                            add_dialog_title: '@i18n:authtype.custom_auth_ind_title',
+                            add_field_label: '@i18n:authtype.auth_indicator',
+                            options: [
+                                {
+                                    label: '@i18n:authtype.otp',
+                                    value: 'otp'
+                                },
+                                {
+                                    label: '@i18n:authtype.type_radius',
+                                    value: 'radius'
+                                }
+                            ],
+                            tooltip: {
+                                title: '@mc-opt:host_add:krbprincipalauthind:doc'
+                            }
+                        },
+                        {
                             name: 'ipakrbokasdelegate',
                             $type: 'checkbox',
                             acl_param: 'krbticketflags',
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 8060d69..32a6f1c 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -49,6 +49,9 @@
                         "show_results": "Show Results"
                     },
                     "authtype": {
+                        "auth_indicators": "Authentication indicators",
+                        "auth_indicator": "Authentication indicator",
+                        "custom_auth_ind_title": "Add Custom Authentication Indicator",
                         "config_tooltip": "<p>Implicit method (password) will be used if no method is chosen.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>",
                         "otp": "OTP",
                         "type_otp": "Two factor authentication (password + OTP)",
@@ -543,10 +546,7 @@
                             "label_singular": "Server Role",
                         },
                         "service": {
-                            "auth_indicators": "Authentication indicators",
-                            "auth_indicator": "Authentication indicator",
                             "certificate": "Service Certificate",
-                            "custom_auth_ind_title": "Add Custom Authentication Indicator",
                             "delete_key_unprovision": "Delete Key, Unprovision",
                             "details": "Service Settings",
                             "host": "Host Name",
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 204c153..5d17d6e 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -190,7 +190,10 @@ class i18n_messages(Command):
             "show_results": _("Show Results"),
         },
         "authtype": {
+            "auth_indicators": _("Authentication indicators"),
+            "auth_indicator": _("Authentication indicator"),
             "config_tooltip": _("<p>Implicit method (password) will be used if no method is chosen.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>"),
+            "custom_auth_ind_title": _("Add Custom Authentication Indicator"),
             "otp": _("OTP"),
             "type_otp": _("Two factor authentication (password + OTP)"),
             "type_password": _("Password"),
@@ -688,10 +691,7 @@ class i18n_messages(Command):
                 "label_singular": _("Server Role"),
             },
             "service": {
-                "auth_indicators": _("Authentication indicators"),
-                "auth_indicator": _("Authentication indicator"),
                 "certificate": _("Service Certificate"),
-                "custom_auth_ind_title": _("Add Custom Authentication Indicator"),
                 "delete_key_unprovision": _("Delete Key, Unprovision"),
                 "details": _("Service Settings"),
                 "host": _("Host Name"),