Fix review comments

Author: adityatoshniwal

docs/en_US/user_management.rst

@@ -102,7 +102,7 @@ dialog where you can fill in details for the new role.
 
 Provide information about the new pgAdmin role in the row:
 
-* Use the *Role Name* field to specify a unique name for the role.
+* Use the *Name* field to specify a unique name for the role.
 * Use the *Description* field to provide a brief description of the role.
 
 To delete a role, click the trash icon to the left of the row and confirm deletion
@@ -162,10 +162,11 @@ email and password. role and active will be optional fields.
 
     /path/to/python /path/to/setup.py add-user user1@gmail.com password
 
-    # to specify a role, admin and non-admin users:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
     /path/to/python /path/to/setup.py add-user user1@gmail.com password --admin
-    /path/to/python /path/to/setup.py add-user user1@gmail.com password --nonadmin
+    /path/to/python /path/to/setup.py add-user user1@gmail.com password --role Users
 
     # to specify user's status
 
@@ -186,10 +187,11 @@ followed by email, password and authentication source. email, role and status wi
 
     /path/to/python /path/to/setup.py add-external-user ldapuser ldap --email user1@gmail.com
 
-    # to specify a role, admin and non-admin user:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
     /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --admin
-    /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --nonadmin
+    /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --role Users
 
     # to specify user's status
 
@@ -206,10 +208,11 @@ email address. password, role and active are updatable fields.
 
     /path/to/python /path/to/setup.py update-user user1@gmail.com --password new-password
 
-    # to specify a role, admin and non-admin user:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --admin
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --nonadmin
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --admin
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role Users
 
     # to specify user's status
 
@@ -226,17 +229,18 @@ followed by username and auth source. email, password, role and active are updat
 
     # to change email address:
 
-    /path/to/python /path/to/setup.py update-external-user ldap ldapuser --email newemail@gmail.com
+    /path/to/python /path/to/setup.py update-external-user ldapuser --auth-source ldap --email newemail@gmail.com
 
-    # to specify a role, admin and non-admin user:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --admin
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --nonadmin
+    /path/to/python /path/to/setup.py update-external-user user1@gmail.com password --role --admin
+    /path/to/python /path/to/setup.py update-external-user user1@gmail.com password --role --role Users
 
     # to change user's status
 
-   /path/to/python /path/to/setup.py update-user ldap ldapuser --active
-   /path/to/python /path/to/setup.py update-user ldap ldapuser --inactive
+   /path/to/python /path/to/setup.py update-user ldapuser --auth-source ldap --active
+   /path/to/python /path/to/setup.py update-user ldapuser --auth-source ldap --inactive
 
 Delete User
 ***********

web/migrations/versions/1f0eddc8fc79_.py

@@ -39,10 +39,10 @@ def upgrade():
     meta.reflect(op.get_bind(), only=('role',))
     role_table = sa.Table('role', meta)
 
-    from pgadmin.tools.user_management.PgPermissions import AllPermissionTypes
+    from pgadmin.tools.user_management.PgAdminPermissions import AllPermissionTypes
     op.execute(
         role_table.update().where(role_table.c.name == 'User')
-        .values(permissions=",".join(AllPermissionTypes.__dict__.keys())))
+        .values(permissions=",".join(AllPermissionTypes.list())))
 
 
 def downgrade():

web/pgadmin/__init__.py

@@ -350,7 +350,7 @@ def get_locale():
         (gettext("Incorrect username or password."), "error")
     app.config['SECURITY_PASSWORD_LENGTH_MIN'] = config.PASSWORD_LENGTH_MIN
     app.config['SECURITY_MSG_UNAUTHORIZED'] = \
-        (gettext("You do not have permission to this resource."), "error")
+        (gettext("Unauthorised access, permission denied."), "error")
 
     # Create database connection object and mailer
     db.init_app(app)

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -24,7 +24,7 @@
 from pgadmin.utils.crypto import encrypt, decrypt, pqencryptpassword
 from pgadmin.utils.menu import MenuItem
 from pgadmin.tools.sqleditor.utils.query_history import QueryHistory
-from pgadmin.tools.user_management.PgPermissions import AllPermissionTypes
+from pgadmin.tools.user_management.PgAdminPermissions import AllPermissionTypes
 
 import config
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js

@@ -10,6 +10,7 @@
 import PGSchema from './schema.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../static/js/privilege.ui';
 import { getNodeListByName } from '../../../../../../static/js/node_ajax';
+import { AllPermissionTypes } from '../../../../../../static/js/constants';
 
 define('pgadmin.node.schema', [
   'sources/gettext', 'sources/url_for',
@@ -64,7 +65,8 @@ define('pgadmin.node.schema', [
         },{
           name: 'generate_erd', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'generate_erd',
-          priority: 5, label: gettext('ERD For Schema')
+          priority: 5, label: gettext('ERD For Schema'),
+          permission: AllPermissionTypes.TOOLS_ERD_TOOL,
         }]);
       },
       can_create_schema: function(node) {

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js

@@ -9,6 +9,7 @@
 import { getNodeTableSchema } from './table.ui';
 import _ from 'lodash';
 import getApiInstance from '../../../../../../../../static/js/api_instance';
+import { AllPermissionTypes } from '../../../../../../../static/js/constants';
 
 define('pgadmin.node.table', [
   'pgadmin.tables.js/enable_disable_triggers',
@@ -127,7 +128,8 @@ define('pgadmin.node.table', [
           priority: 5, label: gettext('ERD For Table'),
           enable: (_, item) => {
             return !('catalog' in pgAdmin.Browser.tree.getTreeNodeHierarchy(item));
-          }
+          },
+          permission: AllPermissionTypes.TOOLS_ERD_TOOL,
         }
         ]);
         pgBrowser.Events.on(

web/pgadmin/browser/server_groups/servers/databases/static/js/database.js

@@ -14,6 +14,7 @@ import DatabaseSchema from './database.ui';
 import { showServerPassword } from '../../../../../../static/js/Dialogs/index';
 import _ from 'lodash';
 import getApiInstance, { parseApiError } from '../../../../../../static/js/api_instance';
+import { AllPermissionTypes } from '../../../../../static/js/constants';
 
 define('pgadmin.node.database', [
   'sources/gettext', 'sources/url_for',
@@ -122,7 +123,8 @@ define('pgadmin.node.database', [
           priority: 5, label: gettext('ERD For Database'),
           enable: (node) => {
             return node.allowConn;
-          }
+          },
+          permission: AllPermissionTypes.TOOLS_ERD_TOOL,
         }]);
 
         _.bindAll(this, 'connection_lost');

web/pgadmin/browser/server_groups/servers/static/js/server.js

@@ -12,6 +12,7 @@ import ServerSchema from './server.ui';
 import { showServerPassword, showChangeServerPassword, showNamedRestorePoint } from '../../../../../static/js/Dialogs/index';
 import _ from 'lodash';
 import getApiInstance, { parseApiError } from '../../../../../static/js/api_instance';
+import { AllPermissionTypes } from '../../../../static/js/constants';
 
 define('pgadmin.node.server', [
   'sources/gettext', 'sources/url_for',
@@ -81,7 +82,7 @@ define('pgadmin.node.server', [
           name: 'create_server_on_sg', node: 'server_group', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
           category: 'register', priority: 1, label: gettext('Server...'),
-          data: {action: 'create'}, enable: 'canCreate', permission: 'object_register_server'
+          data: {action: 'create'}, enable: 'canCreate', permission: AllPermissionTypes.OBJECT_REGISTER_SERVER
         },{
           name: 'disconnect_all_servers', node: 'server_group', module: this,
           applies: ['object','context'], callback: 'disconnect_all_servers',
@@ -91,7 +92,7 @@ define('pgadmin.node.server', [
           name: 'create_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
           category: 'register', priority: 3, label: gettext('Server...'),
-          data: {action: 'create'}, enable: 'canCreate', permission: 'object_register_server'
+          data: {action: 'create'}, enable: 'canCreate', permission: AllPermissionTypes.OBJECT_REGISTER_SERVER
         },{
           name: 'connect_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'connect_server',
@@ -167,7 +168,7 @@ define('pgadmin.node.server', [
           name: 'copy_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
           label: gettext('Copy Server...'), data: {action: 'copy'},
-          priority: 4,
+          priority: 4, permission: AllPermissionTypes.OBJECT_REGISTER_SERVER,
         }]);
 
         _.bindAll(this, 'connection_lost');

web/pgadmin/browser/static/js/collection.js

@@ -7,6 +7,7 @@
 //
 //////////////////////////////////////////////////////////////
 import _ from 'lodash';
+import { AllPermissionTypes } from './constants';
 
 define([
   'sources/gettext', 'sources/pgadmin',
@@ -53,13 +54,15 @@ define([
               name: 'show_query_tool', node: this.type, module: this,
               applies: ['context'], callback: 'show_query_tool',
               priority: 998, label: gettext('Query Tool'),
+              permission: AllPermissionTypes.TOOLS_QUERY_TOOL,
             }]);
 
             // show search objects same as query tool
             pgAdmin.Browser.add_menus([{
               name: 'search_objects', node: this.type, module: this,
               applies: ['context'], callback: 'show_search_objects',
               priority: 997, label: gettext('Search Objects...'),
+              permission: AllPermissionTypes.TOOLS_SEARCH_OBJECTS,
             }]);
 
             // show psql tool same as query tool.
@@ -68,6 +71,7 @@ define([
                 name: 'show_psql_tool', node: this.type, module: this,
                 applies: ['context'], callback: 'show_psql_tool',
                 priority: 998, label: gettext('PSQL Tool'),
+                permission: AllPermissionTypes.TOOLS_PSQL_TOOL,
               }]);
             }
           }

web/pgadmin/browser/static/js/constants.js

@@ -116,3 +116,21 @@ export const WEEKDAYS = [
   ];
 
 export const PGAGENT_MONTHDAYS = [...MONTHDAYS].concat([{label: gettext('Last day'), value: 'Last Day'}]);
+
+export const AllPermissionTypes = {
+  OBJECT_REGISTER_SERVER: 'object_register_server',
+  TOOLS_ERD_TOOL: 'tools_erd_tool',
+  TOOLS_QUERY_TOOL: 'tools_query_tool',
+  TOOLS_DEBUGGER: 'tools_debugger',
+  TOOLS_PSQL_TOOL: 'tools_psql_tool',
+  TOOLS_BACKUP: 'tools_backup',
+  TOOLS_RESTORE: 'tools_restore',
+  TOOLS_IMPORT_EXPORT_DATA: 'tools_import_export_data',
+  TOOLS_IMPORT_EXPORT_SERVERS: 'tools_import_export_servers',
+  TOOLS_SEARCH_OBJECTS: 'tools_search_objects',
+  TOOLS_MAINTENANCE: 'tools_maintenance',
+  TOOLS_SCHEMA_DIFF: 'tools_schema_diff',
+  TOOLS_GRANT_WIZARD: 'tools_grant_wizard',
+  STORAGE_ADD_FOLDER: 'storage_add_folder',
+  STORAGE_REMOVE_FOLDER: 'storage_remove_folder'
+};