Implemented permission settings for Roles.

core/autoform.h

@@ -52,6 +52,10 @@ public:
         m_validators.append(validator);
     }
 
+protected:
+    virtual void bindOtherToUi() {}
+    virtual bool bindOtherToData() { return true; }
+
 private:
     QSharedPointer<T> m_entity;
     QList<QWidget*> m_bindWidgets;
@@ -63,6 +67,7 @@ private:
             const char* prop = widget->metaObject()->userProperty().name();
             widget->setProperty(prop, ((QObject*)m_entity.data())->property(widget->objectName().toStdString().c_str()));
         }
+        bindOtherToUi();
     }
 
     bool bindToData() {
@@ -78,7 +83,7 @@ private:
             ((QObject*)m_entity.data())->setProperty(widget->objectName().toStdString().c_str(), widget->property(prop));
         }
 
-        return true;
+        return bindOtherToData();
     }
 
 public slots:

core/autotablemodel.h

@@ -119,7 +119,8 @@ public:
 
     void addRow(QSharedPointer<T> data)
     {
-        beginInsertRows(QModelIndex(), rowCount() - 1, rowCount() - 1);
+        int index = rowCount() == 0 ? 0 : rowCount() - 1;
+        beginInsertRows(QModelIndex(), index, index);
         insertRow(rowCount());
         m_list.append(data);
         endInsertRows();

core/context.cpp

@@ -13,6 +13,7 @@
 #include "coreplugin.h"
 #include "users/users.h"
 #include "roles/roles.h"
+#include "permissionservice.h"
 
 Context &Context::instance()
 {
@@ -76,6 +77,8 @@ void Context::openDb(const QString &path)
     m_db = new odb::sqlite::database(path.toStdString());
     m_settings->setValue("db/path", path);
     m_dbOpened = true;
+
+    checkPermissions();
 }
 
 void Context::destroy()
@@ -96,6 +99,11 @@ void Context::destroy()
     m_plugins.clear();
 }
 
+QStringList Context::defaultPerms()
+{
+    return QStringList() << PERM_READ << PERM_ADD << PERM_EDIT << PERM_DELETE;
+}
+
 Context::Context()
 {
     m_db = NULL;
@@ -105,29 +113,32 @@ Context::Context()
 
 void Context::checkDb(const QString &path)
 {
-    QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
-    db.setDatabaseName(path);
-    db.open();
-    QSqlQuery q(db);
-    QString verSql = "SELECT pluginId, schemaVersion FROM system";
-    QString createSysSql = "CREATE TABLE \"system\" (\"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, \"pluginId\" TEXT NULL, \"schemaVersion\" TEXT NULL)";
-
-    if (q.exec(verSql))
     {
-        QMap<QString, int> schemas;
+        QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "check");
-        while (q.next())
+        db.setDatabaseName(path);
+        db.open();
+        QSqlQuery q(db);
+        QString verSql = "SELECT pluginId, schemaVersion FROM system";
+        QString createSysSql = "CREATE TABLE \"system\" (\"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, \"pluginId\" TEXT NULL, \"schemaVersion\" TEXT NULL)";
+
+        if (q.exec(verSql))
         {
-            schemas[q.value("pluginId").toString()] = q.value("schemaVersion").toInt();
+            QMap<QString, int> schemas;
+            while (q.next())
+            {
+                schemas[q.value("pluginId").toString()] = q.value("schemaVersion").toInt();
+            }
+            checkSchema(db, schemas);
+        }
+        else
+        {
+            q.exec(createSysSql);
+            checkSchema(db, QMap<QString, int>());
         }
-        checkSchema(db, schemas);
-    }
-    else
-    {
-        q.exec(createSysSql);
-        checkSchema(db, QMap<QString, int>());
-    }
 
-    db.close();
+        db.close();
+    }
+    QSqlDatabase::removeDatabase("check");
 }
 
 void Context::checkSchema(const QSqlDatabase &db, const QMap<QString, int> &schemaMap)
@@ -197,3 +208,20 @@ void Context::createSchema(IPlugin *plugin, const QSqlDatabase &db, const QMap<Q
         }
     }
 }
+
+void Context::checkPermissions()
+{
+    PermissionService permService;
+    foreach (IPlugin *plugin, m_plugins) {
+        foreach (QString perm, defaultPerms()) {
+            QSharedPointer<Permission> p = permService.forNameAndPlugin(perm, plugin->pluginId());
+            if (p.isNull())
+            {
+                QSharedPointer<Permission> nPerm(new Permission);
+                nPerm->setPermissionName(perm);
+                nPerm->setPluginId(plugin->pluginId());
+                permService.save(nPerm);
+            }
+        }
+    }
+}

core/context.h

@@ -13,6 +13,7 @@
 #include "transaction.h"
 
 #include <odb/database.hxx>
+#include <odb/session.hxx>
 
 class IPlugin;
 
@@ -28,6 +29,7 @@ public:
     QSettings *settings() { return m_settings; }
     bool dbOpened() { return m_dbOpened; }
     void destroy();
+    QStringList defaultPerms();
 
 private:
     Context();
@@ -35,6 +37,7 @@ private:
     odb::database *m_db;
     QSettings *m_settings;
     bool m_dbOpened;
+    odb::session m_session;
 
     QStringList m_solved;
 
@@ -42,6 +45,7 @@ private:
     void checkSchema(const QSqlDatabase &db, const QMap<QString, int> &schemaMap);
     void solveDep(IPlugin *plugin, const QSqlDatabase &db, const QMap<QString, int> &schemaMap);
     void createSchema(IPlugin *plugin, const QSqlDatabase &db, const QMap<QString, int> &schemaMap);
+    void checkPermissions();
 };
 
 #endif // CONTEXT_H

core/core.pro

@@ -32,7 +32,8 @@ SOURCES += \
     roles/rolestablemodel.cpp \
     roles/roles.cpp \
     roles/rolesui.cpp \
-    roles/rolesform.cpp
+    roles/rolesform.cpp \
+    permissionservice.cpp
 
 HEADERS += core.h\
         core_global.h \
@@ -64,7 +65,8 @@ HEADERS += core.h\
     roles/rolestablemodel.h \
     roles/roles.h \
     roles/rolesui.h \
-    roles/rolesform.h
+    roles/rolesform.h \
+    permissionservice.h
 
 unix {
     target.path = /usr/lib

core/data/permission.cpp

@@ -68,6 +68,11 @@ void Permission::setListRoles(const QList<QWeakPointer<Role> > &listRoles)
     m_listRoles = listRoles;
 }
 
+void Permission::addRole(QSharedPointer<Role> role)
+{
+    m_listRoles.append(role);
+}
+
 
 
 

core/data/permission.h

@@ -9,6 +9,7 @@
 #include <QWeakPointer>
 #include <QDateTime>
 #include <odb/core.hxx>
+#include <odb/qt/list.hxx>
 
 #pragma db object
 class Permission : public QObject
@@ -43,6 +44,8 @@ public:
     QList<QWeakPointer<Role> > listRoles() const;
     void setListRoles(const QList<QWeakPointer<Role> > &listRoles);
 
+    void addRole(QSharedPointer<Role> role);
+
 private:
     friend class odb::access;
 
@@ -54,7 +57,7 @@ private:
     QDateTime m_createDate;
     bool m_active;
 #pragma db value_not_null inverse(m_listPermissions)
-    QList<QWeakPointer<Role> > m_listRoles;
+    QOdbList<QWeakPointer<Role> > m_listRoles;
 
 };
 

core/data/role.cpp

@@ -68,6 +68,16 @@ void Role::setListPermissions(const QList<QSharedPointer<Permission> > &listPerm
     m_listPermissions = listPermissions;
 }
 
+void Role::addPermission(QSharedPointer<Permission> perm)
+{
+    m_listPermissions.append(perm);
+}
+
+void Role::clearPermissions()
+{
+    m_listPermissions.clear();
+}
+
 
 
 

core/data/role.h

@@ -9,6 +9,7 @@
 #include <QWeakPointer>
 #include <QDateTime>
 #include <odb/core.hxx>
+#include <odb/qt/list.hxx>
 
 #pragma db object
 class Role : public QObject
@@ -42,6 +43,9 @@ public:
     QList<QSharedPointer<Permission> > listPermissions() const;
     void setListPermissions(const QList<QSharedPointer<Permission> > &listPermissions);
 
+    void addPermission(QSharedPointer<Permission> perm);
+    void clearPermissions();
+
 private:
     friend class odb::access;
 
@@ -53,11 +57,8 @@ private:
     bool m_active;
 #pragma db value_not_null inverse(m_listRoles)
     QList<QWeakPointer<User> > m_listUsers;
-#pragma db value_not_null unordered
+#pragma db value_not_null
-    QList<QSharedPointer<Permission> > m_listPermissions;
+    QOdbList<QSharedPointer<Permission> > m_listPermissions;
-
-
-
 };
 
 #endif // ROLE_H

core/define.h

@@ -3,5 +3,11 @@
 
 #define ALL(arr) arr.begin(), arr.end()
 
+// default rights
+#define PERM_READ   "READ"
+#define PERM_ADD    "ADD"
+#define PERM_EDIT   "EDIT"
+#define PERM_DELETE "DELETE"
+
 #endif // DEFINE_H
 

core/metaData.json

@@ -12,62 +12,63 @@
     "schemaVersion" : 1,
     "sql" : [
         "CREATE TABLE \"User\" (
-          \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-          \"login\" TEXT NULL,
+  \"login\" TEXT NULL,
-          \"password\" TEXT NULL,
+  \"password\" TEXT NULL,
-          \"name\" TEXT NULL,
+  \"name\" TEXT NULL,
-          \"lastModDate\" TEXT NULL,
+  \"lastModDate\" TEXT NULL,
-          \"createDate\" TEXT NULL,
+  \"createDate\" TEXT NULL,
-          \"active\" INTEGER NOT NULL,
+  \"active\" INTEGER NOT NULL,
-          \"isAdmin\" INTEGER NOT NULL);
+  \"isAdmin\" INTEGER NOT NULL);
 
-        CREATE TABLE \"User_listRoles\" (
+CREATE TABLE \"User_listRoles\" (
-          \"object_id\" INTEGER NOT NULL,
+  \"object_id\" INTEGER NOT NULL,
-          \"value\" INTEGER NOT NULL,
+  \"value\" INTEGER NOT NULL,
-          CONSTRAINT \"object_id_fk\"
+  CONSTRAINT \"object_id_fk\"
-            FOREIGN KEY (\"object_id\")
+    FOREIGN KEY (\"object_id\")
-            REFERENCES \"User\" (\"id\")
+    REFERENCES \"User\" (\"id\")
-            ON DELETE CASCADE,
+    ON DELETE CASCADE,
-          CONSTRAINT \"value_fk\"
+  CONSTRAINT \"value_fk\"
-            FOREIGN KEY (\"value\")
+    FOREIGN KEY (\"value\")
-            REFERENCES \"Role\" (\"id\")
+    REFERENCES \"Role\" (\"id\")
-            DEFERRABLE INITIALLY DEFERRED);
+    DEFERRABLE INITIALLY DEFERRED);
 
-        CREATE INDEX \"User_listRoles_object_id_i\"
+CREATE INDEX \"User_listRoles_object_id_i\"
-          ON \"User_listRoles\" (\"object_id\");
+  ON \"User_listRoles\" (\"object_id\");
 
-        CREATE TABLE \"Role\" (
+CREATE TABLE \"Role\" (
-          \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-          \"name\" TEXT NULL,
+  \"name\" TEXT NULL,
-          \"lastModDate\" TEXT NULL,
+  \"lastModDate\" TEXT NULL,
-          \"createDate\" TEXT NULL,
+  \"createDate\" TEXT NULL,
-          \"active\" INTEGER NOT NULL);
+  \"active\" INTEGER NOT NULL);
 
-        CREATE TABLE \"Role_listPermissions\" (
+CREATE TABLE \"Role_listPermissions\" (
-          \"object_id\" INTEGER NOT NULL,
+  \"object_id\" INTEGER NOT NULL,
-          \"value\" INTEGER NOT NULL,
+  \"index\" INTEGER NOT NULL,
-          CONSTRAINT \"object_id_fk\"
+  \"value\" INTEGER NOT NULL,
-            FOREIGN KEY (\"object_id\")
+  CONSTRAINT \"object_id_fk\"
-            REFERENCES \"Role\" (\"id\")
+    FOREIGN KEY (\"object_id\")
-            ON DELETE CASCADE,
+    REFERENCES \"Role\" (\"id\")
-          CONSTRAINT \"value_fk\"
+    ON DELETE CASCADE,
-            FOREIGN KEY (\"value\")
+  CONSTRAINT \"value_fk\"
-            REFERENCES \"Permission\" (\"id\")
+    FOREIGN KEY (\"value\")
-            DEFERRABLE INITIALLY DEFERRED);
+    REFERENCES \"Permission\" (\"id\")
+    DEFERRABLE INITIALLY DEFERRED);
 
-        CREATE INDEX \"Role_listPermissions_object_id_i\"
+CREATE INDEX \"Role_listPermissions_object_id_i\"
-          ON \"Role_listPermissions\" (\"object_id\");
+  ON \"Role_listPermissions\" (\"object_id\");
 
-        CREATE TABLE \"Permission\" (
+CREATE INDEX \"Role_listPermissions_index_i\"
-          \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  ON \"Role_listPermissions\" (\"index\");
-          \"pluginId\" TEXT NULL,
-          \"permissionName\" TEXT NULL,
-          \"lastModDate\" TEXT NULL,
-          \"createDate\" TEXT NULL,
-          \"active\" INTEGER NOT NULL);"
 
-
+CREATE TABLE \"Permission\" (
-    ],
+  \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  \"pluginId\" TEXT NULL,
+  \"permissionName\" TEXT NULL,
+  \"lastModDate\" TEXT NULL,
+  \"createDate\" TEXT NULL,
+  \"active\" INTEGER NOT NULL);"   ],
     "dependencies" : []
     }
 }

core/permissionservice.cpp

@@ -0,0 +1,38 @@
+#include "permissionservice.h"
+
+PermissionService::PermissionService()
+{
+}
+
+PermissionService::~PermissionService()
+{
+}
+
+QList<QSharedPointer<Permission> > PermissionService::forPlugin(const QString &pluginId)
+{
+    Transaction tr;
+    odb::database *db = Context::instance().db();
+    permQuery q(permQuery::pluginId == pluginId);
+    permResult result = db->query<Permission>(q);
+
+    QList<QSharedPointer<Permission> > ret;
+    for (permResult::iterator it = result.begin(); it != result.end(); it++)
+    {
+        ret.append(it.load());
+    }
+
+    tr.commit();
+    return ret;
+}
+
+QSharedPointer<Permission> PermissionService::forNameAndPlugin(const QString &name, const QString &pluginId)
+{
+    Transaction tr;
+    odb::database *db = Context::instance().db();
+    permQuery q(permQuery::pluginId == pluginId && permQuery::permissionName == name);
+    QSharedPointer<Permission> p = db->query_one<Permission>(q);
+
+    tr.commit();
+    return p;
+}
+

core/permissionservice.h

@@ -0,0 +1,30 @@
+#ifndef PERMISSIONSERVICE_H
+#define PERMISSIONSERVICE_H
+
+#include "service.h"
+#include "permission.h"
+#include "core-odb.hxx"
+#include "core_global.h"
+#include <odb/core.hxx>
+#include <odb/database.hxx>
+#include <odb/query.hxx>
+#include <odb/result.hxx>
+
+#include <QList>
+#include <QSharedPointer>
+#include <QString>
+
+typedef odb::query<Permission> permQuery;
+typedef odb::result<Permission> permResult;
+
+class CORESHARED_EXPORT PermissionService : public Service<Permission>
+{
+public:
+    PermissionService();
+    ~PermissionService();
+
+    QList<QSharedPointer<Permission> > forPlugin(const QString &pluginId);
+    QSharedPointer<Permission> forNameAndPlugin(const QString &name, const QString &pluginId);
+};
+
+#endif // PERMISSIONSERVICE_H

core/roles/rolesform.cpp

@@ -1,5 +1,9 @@
 #include "rolesform.h"
 #include "ui_rolesform.h"
+#include "iplugin.h"
+#include "permissionservice.h"
+
+#include <QTreeWidgetItem>
 
 RolesForm::RolesForm(QWidget *parent) :
     AutoForm<Role>(parent),
@@ -15,3 +19,53 @@ RolesForm::~RolesForm()
 {
     delete ui;
 }
+
+void RolesForm::bindOtherToUi()
+{
+    ui->treePerms->clear();
+    QList<QSharedPointer<Permission> > perms = entity()->listPermissions();
+
+    foreach (IPlugin *plugin, Context::instance().plugins()) {
+        if (plugin->pluginId() != "CORE")
+        {
+            QTreeWidgetItem *item = new QTreeWidgetItem();
+            item->setText(0, plugin->pluginName());
+            item->setData(0, Qt::UserRole, plugin->pluginId());
+
+            foreach (QString perm, Context::instance().defaultPerms()) {
+                QTreeWidgetItem *permItem = new QTreeWidgetItem();
+                permItem->setText(0, tr(perm.toStdString().c_str()));
+                permItem->setData(0, Qt::UserRole, perm);
+                QList<QSharedPointer<Permission> >::iterator it = std::find_if(ALL(perms), [&perm, plugin](QSharedPointer<Permission> p){ return p->permissionName() == perm
+                        && p->pluginId() == plugin->pluginId(); });
+                permItem->setCheckState(0, it != perms.end() ? Qt::Checked : Qt::Unchecked);
+                item->addChild(permItem);
+            }
+            ui->treePerms->addTopLevelItem(item);
+        }
+    }
+}
+
+bool RolesForm::bindOtherToData()
+{
+    PermissionService permService;
+
+    entity()->clearPermissions();
+    for (int i = 0; i < ui->treePerms->topLevelItemCount(); i++)
+    {
+        QTreeWidgetItem *item = ui->treePerms->topLevelItem(i);
+
+        for (int j = 0; j < item->childCount(); j++)
+        {
+            QTreeWidgetItem *permItem = item->child(j);
+            if (permItem->checkState(0) == Qt::Checked)
+            {
+                QSharedPointer<Permission> perm = permService.forNameAndPlugin(permItem->data(0, Qt::UserRole).toString(), item->data(0, Qt::UserRole).toString());
+                perm->addRole(entity());
+                entity()->addPermission(perm);
+            }
+        }
+    }
+
+    return true;
+}

core/roles/rolesform.h

@@ -20,6 +20,11 @@ public:
 
 private:
     Ui::RolesForm *ui;
+
+    // AutoForm interface
+protected:
+    virtual void bindOtherToUi() override;
+    virtual bool bindOtherToData() override;
 };
 
 #endif // ROLESFORM_H

core/roles/rolesform.ui

@@ -7,13 +7,16 @@
     <x>0</x>
     <y>0</y>
     <width>542</width>
-    <height>388</height>
+    <height>270</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
@@ -24,13 +27,32 @@
    <item row="0" column="1">
     <widget class="QLineEdit" name="name"/>
    </item>
-   <item row="1" column="0">
+   <item row="3" column="0">
     <widget class="QCheckBox" name="active">
      <property name="text">
       <string>Active</string>
      </property>
     </widget>
    </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QTreeWidget" name="treePerms">
+     <attribute name="headerVisible">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Permissions:</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>