it-projects-llc · Enigma228322 · Mar 31, 2020 · Apr 9, 2020 · Apr 23, 2020 · Apr 24, 2020
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
@@ -1,2 +1,4 @@
 queue https://github.com/OCA/queue.git
 OCA_web https://github.com/OCA/web.git
+OCA_server_auth https://github.com/OCA/server-auth
+access_addons https://github.com/itpp-labs/access-addons
diff --git a/saas/__manifest__.py b/saas/__manifest__.py
@@ -1,14 +1,15 @@
 # Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
 # Copyright 2018-2019 Denis Mudarisov <https://it-projects.info/team/mudarisov>
 # Copyright 2019 Anvar Kildebekov <https://it-projects.info/team/kildebekov>
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": """SaaS Base""",
     "summary": """Base module for master SaaS instance""",
     "category": "SaaS",
     # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=13.0",
     "images": [],
-    "version": "13.0.2.4.3",
+    "version": "13.0.3.0.0",
     "application": False,
 
     "author": "IT-Projects LLC, Ivan Yelizariev",

diff --git a/saas/controllers/main.py b/saas/controllers/main.py
@@ -12,5 +12,7 @@ class SaasController(odoo.http.Controller):
     def auth_to_build(self, build_id=None, **kwargs):
         if not build_id:
             return False
-        build_url = request.env['saas.db'].browse(build_id).get_url() + '/auth_quick/login?build_login=admin'
+        build = request.env['saas.db'].browse(build_id)
+        _, _, build_admin_id = build.xmlid_lookup("base.user_admin")
+        build_url = request.env['saas.db'].browse(build_id).get_url() + '/auth_quick/login?build_user_id={}'.format(build_admin_id)
         return build_redirection(build_url)
diff --git a/saas/data/ir_cron_data.xml b/saas/data/ir_cron_data.xml
@@ -1,4 +1,5 @@
 <!-- Copyright 2019 Denis Mudarisov <https://it-projects.info/team/trojikman>
+     Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).-->
 <odoo noupdate="1">
         <record id="preparing_template_next_cron" model="ir.cron">
@@ -13,4 +14,17 @@
             <field name="state">code</field>
             <field name="code">model.preparing_template_next()</field>
         </record>
+
+        <record id="refresh_saas_db_data" model="ir.cron">
+            <field name="name">SaaS: refresh data from build database</field>
+            <field name="model_id" ref="saas.model_saas_db"/>
+            <field name="active" eval="True" />
+            <field name="user_id" ref="base.user_root" />
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field name="doall">1</field>
+            <field name="state">code</field>
+            <field name="code">model.search([('type','=','build'),('state','=','done')]).refresh_data()</field>
+        </record>
 </odoo>
diff --git a/saas/data/saas_operator_data.xml b/saas/data/saas_operator_data.xml
@@ -4,7 +4,7 @@
     <record id="local_operator" model="saas.operator">
         <field name="name">Same Instance</field>
         <field name="type">local</field>
-        <field name="db_url_template">http://{db_name}.{db_id}.127.0.0.1.nip.io</field>
+        <field name="db_url_template">http://{db_name}.127.0.0.1.nip.io</field>
         <field name="db_name_template">fast_build_{unique_id}</field>
         <!-- It works when db-filter=^%d$ -->
         <field name="global_url" eval="'http://' + obj().env.cr.dbname + '.127.0.0.1.nip.io:8069'" model="saas.operator"/>

diff --git a/saas/doc/changelog.rst b/saas/doc/changelog.rst
@@ -1,3 +1,16 @@
+`3.0.0`
+-------
+
+- **Improvement:** mandatory modules can be redefined in dependent modules
+- **New:** added "Refresh" in build view to get data from build database
+- **Fix:** random_ready_operator does not throw exceptions if no operators are ready
+- **Fix:** no extra rigths required to read build's URL
+- **Improvement:** Removed {db_id} variable for generating database name
+- **Improvement:** Added helper methods `execute_kw` and `xmlid_lookup` on `saas.db` model
+- **Fix:** attempt to update global_url on draft builds
+- **Improvement:** Added option to deploy database on draft builds
+- **Fix:** "Connect to the Build" button now works even if admin user on build was renamed
+
 `2.4.3`
 -------
 

diff --git a/saas/models/saas_db.py b/saas/models/saas_db.py
@@ -1,5 +1,6 @@
 # Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
 # Copyright 2019 Denis Mudarisov <https://it-projects.info/team/trojikman>
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 from odoo import models, fields
 from odoo.addons.queue_job.job import job
@@ -44,7 +45,7 @@ def drop_db(self):
     def get_url(self):
         # TODO: need possibility to use custom domain
         self.ensure_one()
-        return self.operator_id.get_db_url(self)
+        return self.sudo().operator_id.get_db_url(self)
 
     def action_get_build_access(self):
         auth_url = '/saas/auth-to-build/' + str(self.id)
@@ -53,3 +54,32 @@ def action_get_build_access(self):
             'target': 'new',
             'url': auth_url,
         }
+
+    def write(self, vals):
+        res = super(SAASDB, self).write(vals)
+        if not self.env.context.get("writing_from_refresh_data"):  # Do not run "refresh_data", if already running it
+            self.refresh_data()
+        return res
+
+    def refresh_data(self, should_read_from_build=True, should_write_to_build=True):
+        self.flush()
+        for record in self.filtered(lambda record: (record.type, record.state) == ("build", "done")).with_context(writing_from_refresh_data=True):
+            if should_read_from_build:
+                vals = record.read_values_from_build()
+                if vals:
+                    record.write(vals)
+
+            if should_write_to_build:
+                record.write_values_to_build()
+
+    def write_values_to_build(self):
+        pass
+
+    def read_values_from_build(self):
+        return {}
+
+    def execute_kw(self, model, method, *args, **kwargs):
+        return self.operator_id.build_execute_kw(self, model, method, args, kwargs)
+
+    def xmlid_lookup(self, xmlid):
+        return self.execute_kw("ir.model.data", "xmlid_lookup", xmlid)
diff --git a/saas/models/saas_operator.py b/saas/models/saas_operator.py
@@ -10,8 +10,6 @@
 from odoo.addons.queue_job.job import job
 from odoo.http import _request_stack
 
-MANDATORY_MODULES = ['auth_quick']
-
 
 class SAASOperator(models.Model):
     _name = 'saas.operator'
@@ -25,10 +23,13 @@ class SAASOperator(models.Model):
     global_url = fields.Char('Master URL (Server-to-Server)', required=True, help='URL for server-to-server communication ')
     # host = fields.Char()
     # port = fields.Char()
-    db_url_template = fields.Char('DB URLs', help='Avaialble variables: {db_id}, {db_name}')
+    db_url_template = fields.Char('DB URLs', help='Avaialble variables: {db_name}')
     db_name_template = fields.Char('DB Names', required=True, help='Avaialble variables: {unique_id}')
     template_operator_ids = fields.One2many('saas.template.operator', 'operator_id')
 
+    def get_mandatory_modules(self):
+        return ["auth_quick"]
+
     def _create_db(self, template_db, db_name, demo, lang='en_US'):
         """Synchronous db creation"""
         if self.type == 'local':
@@ -66,7 +67,7 @@ def _drop_db(self, db_name):
     def install_modules(self, template_id, template_operator_id):
         self.ensure_one()
         modules = [module.name for module in template_id.template_module_ids]
-        modules = [('name', 'in', MANDATORY_MODULES + modules)]
+        modules = [('name', 'in', self.get_mandatory_modules() + modules)]
         if self.type == 'local':
             db = sql_db.db_connect(template_operator_id.operator_db_name)
             with api.Environment.manage(), db.cursor() as cr:
@@ -110,7 +111,7 @@ def post_init(self, template_id, template_operator_id):
     def get_db_url(self, db):
         # TODO: use mako for url templating
         self.ensure_one()
-        return self.db_url_template.format(db_id=db.id, db_name=db.name)
+        return self.db_url_template.format(db_name=db.name)
 
     def generate_db_name(self):
         self.ensure_one()
@@ -164,7 +165,7 @@ def _update_global_url(self, url):
             'model_id': 1,
             'code': code,
         }
-        for build in builds:
+        for build in builds.filtered(lambda build: build.state == "done"):
             action_ids = self.build_execute_kw(build, 'ir.actions.server', 'create', [action])
             self.build_execute_kw(build, 'ir.actions.server', 'run', [action_ids])
 

diff --git a/saas/models/saas_template.py b/saas/models/saas_template.py
@@ -194,19 +194,30 @@ def prepare_name(self, db_name):
         self.ensure_one()
         return slugify(db_name)
 
-    def create_db(self, key_values=None, db_name=None, with_delay=True):
+    def create_db(self, key_values=None, db_name=None, with_delay=True, draft_build_id=None):
         self.ensure_one()
         if not key_values:
             key_values = {}
-        if not db_name:
-            db_name = self.operator_id.generate_db_name()
+
+        self.flush()
+        assert not (draft_build_id and db_name), "Both db_name and draft_build_id are given"
+
+        if draft_build_id:
+            build = self.env["saas.db"].browse(draft_build_id)
+            assert build.state == "draft", "Given build is not draft"
+            assert build.operator_id == self.operator_id, "Given build uses other operator"
+
         else:
-            db_name = self.prepare_name(db_name)
-        build = self.env['saas.db'].create({
-            'name': db_name,
-            'operator_id': self.operator_id.id,
-            'type': 'build',
-        })
+            if not db_name:
+                db_name = self.operator_id.generate_db_name()
+            else:
+                db_name = self.prepare_name(db_name)
+
+            build = self.env['saas.db'].create({
+                'name': db_name,
+                'operator_id': self.operator_id.id,
+                'type': 'build',
+            })
 
         self.env['saas.log'].log_db_creating(build, self.operator_db_id)
         if with_delay:
@@ -226,4 +237,6 @@ def create_db(self, key_values=None, db_name=None, with_delay=True):
 
     def random_ready_operator(self):
         ready_operators = self.filtered(lambda r: r.state == 'done')
+        if not ready_operators:
+            return ready_operators
         return random.choice(ready_operators)
diff --git a/saas/views/saas_db_views.xml b/saas/views/saas_db_views.xml
@@ -21,6 +21,7 @@
             <form>
                 <header>
                     <button name="action_get_build_access" type="object" string="Connect to the Build" attrs="{'invisible':[('state', '!=', 'done')]}" class="oe_read_only" />
+                    <button name="refresh_data" type="object" string="Refresh" attrs="{'invisible':[('state', '!=', 'done')]}" class="oe_read_only" />
                     <field name="state" widget="statusbar" nolabel="1"/>
                 </header>
                 <sheet>

diff --git a/saas_access_apps/README.rst b/saas_access_apps/README.rst
@@ -0,0 +1,47 @@
+.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+   :target: https://www.gnu.org/licenses/agpl
+   :alt: License: AGPL-3
+
+==============================
+ SaaS: Control access to Apps
+==============================
+
+This module disallows anyone to install apps on build and shows installed apps.
+
+Credits
+=======
+
+Contributors
+------------
+* `Eugene Molotov <https://it-projects.info/team/em230418>`__:
+
+Sponsors
+--------
+* `IT-Projects LLC <https://it-projects.info>`__
+
+Maintainers
+-----------
+* `IT-Projects LLC <https://it-projects.info>`__
+
+      To get a guaranteed support
+      you are kindly requested to purchase the module
+      at `odoo apps store <https://apps.odoo.com/apps/modules/13.0/saas_access_apps/>`__.
+
+      Thank you for understanding!
+
+      `IT-Projects Team <https://www.it-projects.info/team>`__
+
+Further information
+===================
+
+Demo: http://runbot.it-projects.info/demo/saas-addons/13.0
+
+HTML Description: https://apps.odoo.com/apps/modules/13.0/saas_access_apps/
+
+Usage instructions: `<doc/index.rst>`_
+
+Changelog: `<doc/changelog.rst>`_
+
+Notifications on updates: `via Atom <https://github.com/it-projects-llc/saas-addons/commits/13.0/saas_access_apps.atom>`_, `by Email <https://blogtrottr.com/?subscribe=https://github.com/it-projects-llc/saas-addons/commits/13.0/saas_access_apps.atom>`_
+
+Tested on Odoo 12.0 6a57ad66b8374966ba7011e34cec20f6344f4f6d
diff --git a/saas_access_apps/__init__.py b/saas_access_apps/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/saas_access_apps/__manifest__.py b/saas_access_apps/__manifest__.py
@@ -0,0 +1,39 @@
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": """SaaS: Control access to Apps""",
+    "summary": """This module disallows anyone to install apps on build and shows installed apps.""",
+    "category": "Hidden",
+    # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=13.0",
+    "images": [],
+    "version": "13.0.1.0.0",
+    "application": False,
+    "author": "IT-Projects LLC, Eugene Molotov",
+    "support": "[email protected]",
+    "website": "https://apps.odoo.com/apps/modules/13.0/saas_access_apps/",
+    "license": "AGPL-3",
+    # "price": 9.00,
+    # "currency": "EUR",
+    "depends": ["saas"],
+    "external_dependencies": {"python": [], "bin": []},
+    "data": ["views/saas_db.xml"],
+    "demo": [],
+    "qweb": [],
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "uninstall_hook": None,
+    "auto_install": False,
+    "installable": True,
+    # "demo_title": "SaaS: access apps (master)",
+    # "demo_addons": [
+    # ],
+    # "demo_addons_hidden": [
+    # ],
+    # "demo_url": "DEMO-URL",
+    # "demo_summary": "SHORT DESC",
+    # "demo_images": [
+    #    "images/MAIN_IMAGE",
+    # ]
+}
diff --git a/saas_access_apps/doc/changelog.rst b/saas_access_apps/doc/changelog.rst
@@ -0,0 +1,4 @@
+`1.0.0`
+-------
+
+- **Init version**
diff --git a/saas_access_apps/doc/index.rst b/saas_access_apps/doc/index.rst
@@ -0,0 +1,19 @@
+====================================
+ SaaS: Disable User To Install Apps
+====================================
+
+Installation
+============
+
+* `Install <https://odoo-development.readthedocs.io/en/latest/odoo/usage/install-module.html>`__ this module in a usual way
+
+Usage
+=====
+
+* Open menu ``[[ SaaS ]] >> Builds``
+* Click on any build with state `Ready`
+* Click on ``[Refresh]``
+* RESULT: in field "Installed Apps" you will see installed apps on build
+* Click on ``[Connect to the Build]```. You will be logged in as admin
+* Click on main menu
+* RESULT: you won't see Apps in main menu
diff --git a/saas_access_apps/models/__init__.py b/saas_access_apps/models/__init__.py
@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import saas_operator
+from . import saas_db