diff --git a/access_restriction_by_ip/README.rst b/access_restriction_by_ip/README.rst new file mode 100644 index 000000000..ba99dd860 --- /dev/null +++ b/access_restriction_by_ip/README.rst @@ -0,0 +1,19 @@ +Access Restriction By IP V15 +============================ + +This module will restrict users access to his account from the specified IP only. If user access his +account from non-specified IP, login will be restricted and a warning message will be displayed in +login page. + +If no IP is specified for a user, then there will not be restriction by IP. He can access from any IP. + + +Credits +======= +Cybrosys Techno Solutions + +Author +------ +* Niyas Raphy +* V14 Muhammad P +* V15 Nikhil Ravi diff --git a/access_restriction_by_ip/__init__.py b/access_restriction_by_ip/__init__.py new file mode 100644 index 000000000..8ca207817 --- /dev/null +++ b/access_restriction_by_ip/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2017-TODAY Cybrosys Technologies(). +# Author: Niyas Raphy() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +from . import controllers +from . import models + + diff --git a/access_restriction_by_ip/__manifest__.py b/access_restriction_by_ip/__manifest__.py new file mode 100644 index 000000000..08c14e97b --- /dev/null +++ b/access_restriction_by_ip/__manifest__.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2021-TODAY Cybrosys Technologies(). +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +{ + 'name': 'Access Restriction By IP', + 'summary': """User Can Access His Account Only From Specified IP Address""", + 'version': '15.0.1.0.0', + 'description': """User Can Access His Account Only From Specified IP Address""", + 'live_test_url': 'https://youtu.be/nn6dAL6eKPc', + 'author': 'Cybrosys Techno Solutions', + 'company': 'Cybrosys Techno Solutions', + 'website': 'https://www.cybrosys.com', + 'category': 'Tools', + 'depends': ['base', 'mail'], + 'license': 'AGPL-3', + 'data': [ + 'security/ir.model.access.csv', + 'views/allowed_ips_view.xml', + ], + 'images': ['static/description/banner.png'], + 'installable': True, + 'auto_install': False, +} + diff --git a/access_restriction_by_ip/controllers/__init__.py b/access_restriction_by_ip/controllers/__init__.py new file mode 100644 index 000000000..1939c6696 --- /dev/null +++ b/access_restriction_by_ip/controllers/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2017-TODAY Cybrosys Technologies(). +# Author: Niyas Raphy() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +from . import main + diff --git a/access_restriction_by_ip/controllers/main.py b/access_restriction_by_ip/controllers/main.py new file mode 100644 index 000000000..e0a79908c --- /dev/null +++ b/access_restriction_by_ip/controllers/main.py @@ -0,0 +1,89 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2020-TODAY Cybrosys Technologies(). +# Author: Niyas Raphy() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +from odoo.addons.web.controllers import main +from odoo.http import request +from odoo.exceptions import Warning +import odoo +import odoo.modules.registry +from odoo.tools.translate import _ +from odoo import http + + +class Home(main.Home): + + @http.route('/web/login', type='http', auth="public") + def web_login(self, redirect=None, **kw): + main.ensure_db() + request.params['login_success'] = False + if request.httprequest.method == 'GET' and redirect and request.session.uid: + return request.redirect(redirect) + + if not request.uid: + request.uid = odoo.SUPERUSER_ID + + values = request.params.copy() + try: + values['databases'] = http.db_list() + except odoo.exceptions.AccessDenied: + values['databases'] = None + if request.httprequest.method == 'POST': + old_uid = request.uid + ip_address = request.httprequest.environ['REMOTE_ADDR'] + if request.params['login']: + user_rec = request.env['res.users'].sudo().search( + [('login', '=', request.params['login'])]) + if user_rec.allowed_ips: + ip_list = [] + for rec in user_rec.allowed_ips: + ip_list.append(rec.ip_address) + if ip_address in ip_list: + try: + uid = request.session.authenticate( + request.session.db, + request.params[ + 'login'], + request.params[ + 'password']) + request.params['login_success'] = True + return request.redirect( + self._login_redirect(uid, redirect=redirect)) + except odoo.exceptions.AccessDenied as e: + request.uid = old_uid + if e.args == odoo.exceptions.AccessDenied().args: + values['error'] = _("Wrong login/password") + else: + request.uid = old_uid + values['error'] = _("Not allowed to login from this IP") + else: + try: + uid = request.session.authenticate(request.session.db, + request.params[ + 'login'], + request.params[ + 'password']) + request.params['login_success'] = True + return request.redirect( + self._login_redirect(uid, redirect=redirect)) + except odoo.exceptions.AccessDenied as e: + request.uid = old_uid + if e.args == odoo.exceptions.AccessDenied().args: + values['error'] = _("Wrong login/password") + + return request.render('web.login', values) diff --git a/access_restriction_by_ip/doc/RELEASE_NOTES.md b/access_restriction_by_ip/doc/RELEASE_NOTES.md new file mode 100644 index 000000000..2eed8cb06 --- /dev/null +++ b/access_restriction_by_ip/doc/RELEASE_NOTES.md @@ -0,0 +1,5 @@ +## Module + +#### 12.12.2021 +#### Version 15.0.1.0.0 +#### ADD Initial Commit for access_restriction_by_ip \ No newline at end of file diff --git a/access_restriction_by_ip/models/__init__.py b/access_restriction_by_ip/models/__init__.py new file mode 100644 index 000000000..ca519c454 --- /dev/null +++ b/access_restriction_by_ip/models/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2017-TODAY Cybrosys Technologies(). +# Author: Niyas Raphy() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +from . import allowed_ips + + diff --git a/access_restriction_by_ip/models/allowed_ips.py b/access_restriction_by_ip/models/allowed_ips.py new file mode 100644 index 000000000..105e2a2f3 --- /dev/null +++ b/access_restriction_by_ip/models/allowed_ips.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2017-TODAY Cybrosys Technologies(). +# Author: Niyas Raphy() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +from odoo import models, fields + + +class ResUsersInherit(models.Model): + _inherit = 'res.users' + + allowed_ips = fields.One2many('allowed.ips', 'users_ip', string='IP') + + +class AllowedIPs(models.Model): + _name = 'allowed.ips' + + users_ip = fields.Many2one('res.users', string='IP') + ip_address = fields.Char(string='Allowed IP') diff --git a/access_restriction_by_ip/security/ir.model.access.csv b/access_restriction_by_ip/security/ir.model.access.csv new file mode 100644 index 000000000..225f726ab --- /dev/null +++ b/access_restriction_by_ip/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_allowed_ips,access.allowed.ips,access_restriction_by_ip.model_allowed_ips,base.group_user,1,1,1,1 diff --git a/access_restriction_by_ip/static/description/assets/icons/check.png b/access_restriction_by_ip/static/description/assets/icons/check.png new file mode 100644 index 000000000..c8e85f51d Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/check.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/chevron.png b/access_restriction_by_ip/static/description/assets/icons/chevron.png new file mode 100644 index 000000000..2089293d6 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/chevron.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/cogs.png b/access_restriction_by_ip/static/description/assets/icons/cogs.png new file mode 100644 index 000000000..95d0bad62 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/cogs.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/consultation.png b/access_restriction_by_ip/static/description/assets/icons/consultation.png new file mode 100644 index 000000000..8319d4baa Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/consultation.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/ecom-black.png b/access_restriction_by_ip/static/description/assets/icons/ecom-black.png new file mode 100644 index 000000000..a9385ff13 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/ecom-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/education-black.png b/access_restriction_by_ip/static/description/assets/icons/education-black.png new file mode 100644 index 000000000..3eb09b27b Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/education-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/hotel-black.png b/access_restriction_by_ip/static/description/assets/icons/hotel-black.png new file mode 100644 index 000000000..130f613be Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/hotel-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/license.png b/access_restriction_by_ip/static/description/assets/icons/license.png new file mode 100644 index 000000000..a5869797e Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/license.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/lifebuoy.png b/access_restriction_by_ip/static/description/assets/icons/lifebuoy.png new file mode 100644 index 000000000..658d56ccc Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/lifebuoy.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/logo.png b/access_restriction_by_ip/static/description/assets/icons/logo.png new file mode 100644 index 000000000..478462d3e Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/logo.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/manufacturing-black.png b/access_restriction_by_ip/static/description/assets/icons/manufacturing-black.png new file mode 100644 index 000000000..697eb0e9f Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/manufacturing-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/pos-black.png b/access_restriction_by_ip/static/description/assets/icons/pos-black.png new file mode 100644 index 000000000..97c0f90c1 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/pos-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/puzzle.png b/access_restriction_by_ip/static/description/assets/icons/puzzle.png new file mode 100644 index 000000000..65cf854e7 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/puzzle.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/restaurant-black.png b/access_restriction_by_ip/static/description/assets/icons/restaurant-black.png new file mode 100644 index 000000000..4a35eb939 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/restaurant-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/service-black.png b/access_restriction_by_ip/static/description/assets/icons/service-black.png new file mode 100644 index 000000000..301ab51cb Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/service-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/trading-black.png b/access_restriction_by_ip/static/description/assets/icons/trading-black.png new file mode 100644 index 000000000..9398ba2f1 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/trading-black.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/training.png b/access_restriction_by_ip/static/description/assets/icons/training.png new file mode 100644 index 000000000..884ca024d Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/training.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/update.png b/access_restriction_by_ip/static/description/assets/icons/update.png new file mode 100644 index 000000000..ecbc5a01a Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/update.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/user.png b/access_restriction_by_ip/static/description/assets/icons/user.png new file mode 100644 index 000000000..6ffb23d9f Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/user.png differ diff --git a/access_restriction_by_ip/static/description/assets/icons/wrench.png b/access_restriction_by_ip/static/description/assets/icons/wrench.png new file mode 100644 index 000000000..6c04dea0f Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/icons/wrench.png differ diff --git a/access_restriction_by_ip/static/description/assets/modules/approval_image.png b/access_restriction_by_ip/static/description/assets/modules/approval_image.png new file mode 100644 index 000000000..84fe94e80 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/modules/approval_image.png differ diff --git a/access_restriction_by_ip/static/description/assets/modules/budget_image.png b/access_restriction_by_ip/static/description/assets/modules/budget_image.png new file mode 100644 index 000000000..fe6aa6fe4 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/modules/budget_image.png differ diff --git a/access_restriction_by_ip/static/description/assets/modules/export_image.png b/access_restriction_by_ip/static/description/assets/modules/export_image.png new file mode 100644 index 000000000..4e4ea0e51 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/modules/export_image.png differ diff --git a/access_restriction_by_ip/static/description/assets/modules/magento_image.png b/access_restriction_by_ip/static/description/assets/modules/magento_image.png new file mode 100644 index 000000000..39de0820f Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/modules/magento_image.png differ diff --git a/access_restriction_by_ip/static/description/assets/modules/pos_image.png b/access_restriction_by_ip/static/description/assets/modules/pos_image.png new file mode 100644 index 000000000..c5932894b Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/modules/pos_image.png differ diff --git a/access_restriction_by_ip/static/description/assets/modules/shopify_image.png b/access_restriction_by_ip/static/description/assets/modules/shopify_image.png new file mode 100644 index 000000000..c6d92c16d Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/modules/shopify_image.png differ diff --git a/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip-youtube.png b/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip-youtube.png new file mode 100644 index 000000000..d03af71cf Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip-youtube.png differ diff --git a/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip_1.png b/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip_1.png new file mode 100644 index 000000000..87e6b3b14 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip_1.png differ diff --git a/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip_2.png b/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip_2.png new file mode 100644 index 000000000..8fafd843a Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/screenshots/access_restriction_by_ip_2.png differ diff --git a/access_restriction_by_ip/static/description/assets/screenshots/hero.png b/access_restriction_by_ip/static/description/assets/screenshots/hero.png new file mode 100644 index 000000000..530c1a5e6 Binary files /dev/null and b/access_restriction_by_ip/static/description/assets/screenshots/hero.png differ diff --git a/access_restriction_by_ip/static/description/banner.png b/access_restriction_by_ip/static/description/banner.png new file mode 100644 index 000000000..707e2b7ed Binary files /dev/null and b/access_restriction_by_ip/static/description/banner.png differ diff --git a/access_restriction_by_ip/static/description/icon.png b/access_restriction_by_ip/static/description/icon.png new file mode 100644 index 000000000..b3e2b651c Binary files /dev/null and b/access_restriction_by_ip/static/description/icon.png differ diff --git a/access_restriction_by_ip/static/description/index.html b/access_restriction_by_ip/static/description/index.html new file mode 100644 index 000000000..5930e3a01 --- /dev/null +++ b/access_restriction_by_ip/static/description/index.html @@ -0,0 +1,645 @@ + +
+
+
+
+ +
+
+
+ Community +
+
+ Enterprise +
+ +
+
+
+
+ +
+
+
+

+ Access Restriction By IP

+

+ User can access his account only from specified IP's +

+ +
+
+ + + + +
+
+

+ Overview +

+
+ +
+

+ This module will restrict the users access to his account from specified IP address only +

+ +
+
+ + +
+
+

+ Features +

+
+ +
+
+ +
+
+

+ Admin Access

+

+ Administrator can set a IP or a group of IP address for each users.

+
+
+ +
+
+ +
+
+

+ User Restriction

+

+ Users can access their account only from the specified IP's.

+
+
+ +
+
+ +
+
+

+ Restricted Login

+

+ Accessing system from a non-specified IP will restrict the user login.

+
+
+ +
+
+ +
+
+

+ Warning

+

+ A warning message will be displayed.

+
+
+ +
+
+ +
+
+

+ Userwise IP

+

+ If no IP is set to user means there is not any restriction by IP. IP Address for each users can be set from users form view

+
+
+ +
+ +
+
+

+ Screenshots +

+
+
+

+ Setting IP address for User

+

+ Setting IP address for user from users form view

+

+ User will be able to access his account only from this IP's

+ +
+ +
+

+ User accessing his account

+

+ On accessing account from a non specified IP. +

+ +
+ +
+ +
+
+

+ Video +

+
+
+
+ Cybrosys Cover Video +
+
+
+ + +
+
+

Suggested Products

+
+ + +
+
+ + + +
+
+
+

Our Services

+
+
+ +
+
+ +
+
+ Odoo + Customization
+
+ +
+
+ +
+
+ Odoo + Implementation
+
+ +
+
+ +
+
+ Odoo + Support
+
+ + +
+
+ +
+
+ Hire + Odoo + Developer
+
+ +
+
+ +
+
+ Odoo + Integration
+
+ +
+
+ +
+
+ Odoo + Migration
+
+ + +
+
+ +
+
+ Odoo + Consultancy
+
+ +
+
+ +
+
+ Odoo + Implementation
+
+ +
+
+ +
+
+ Odoo + Licensing Consultancy
+
+
+
+ + + +
+
+
+

Our Industries

+
+
+ +
+
+ +
+ Trading +
+

+ Easily procure + and + sell your products

+
+
+ +
+
+ +
+ POS +
+

+ Easy + configuration + and convivial experience

+
+
+ +
+
+ +
+ Education +
+

+ A platform for + educational management

+
+
+ +
+
+ +
+ Manufacturing +
+

+ Plan, track and + schedule your operations

+
+
+ +
+
+ +
+ E-commerce & Website +
+

+ Mobile + friendly, + awe-inspiring product pages

+
+
+ +
+
+ +
+ Service Management +
+

+ Keep track of + services and invoice

+
+
+ +
+
+ +
+ Restaurant +
+

+ Run your bar or + restaurant methodically

+
+
+ +
+
+ +
+ Hotel Management +
+

+ An + all-inclusive + hotel management application

+
+
+ +
+
+ + + + + +
+
+
+

Need Help?

+
+
+
+ + +
+ +
+ +
+ +
+ WhatsApp +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ + +
\ No newline at end of file diff --git a/access_restriction_by_ip/views/allowed_ips_view.xml b/access_restriction_by_ip/views/allowed_ips_view.xml new file mode 100644 index 000000000..a5a528fb1 --- /dev/null +++ b/access_restriction_by_ip/views/allowed_ips_view.xml @@ -0,0 +1,21 @@ + + + + + res.users + res.users + + + + + + + + + + + + + + +