From cf14306c2b3f82a81f8d56669a71633b4d4b5fce Mon Sep 17 00:00:00 2001
From: marvin-borner@live.com
Date: Mon, 16 Apr 2018 21:09:05 +0200
Subject: Main merge to user management system - files are now at /main/public/

---
 .../Database/Migrations/v400/ActivitiesTable.php   |  54 +++++
 .../src/Database/Migrations/v400/GroupsTable.php   |  82 +++++++
 .../Migrations/v400/PasswordResetsTable.php        |  57 +++++
 .../Migrations/v400/PermissionRolesTable.php       |  55 +++++
 .../Database/Migrations/v400/PermissionsTable.php  | 262 +++++++++++++++++++++
 .../Database/Migrations/v400/PersistencesTable.php |  57 +++++
 .../Database/Migrations/v400/RoleUsersTable.php    |  55 +++++
 .../src/Database/Migrations/v400/RolesTable.php    |  78 ++++++
 .../src/Database/Migrations/v400/UsersTable.php    |  69 ++++++
 .../Migrations/v400/VerificationsTable.php         |  57 +++++
 10 files changed, 826 insertions(+)
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php
 create mode 100755 main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php

(limited to 'main/app/sprinkles/account/src/Database/Migrations/v400')

diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php
new file mode 100755
index 0000000..4e55c7c
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use UserFrosting\System\Bakery\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+
+/**
+ * Sessions table migration
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class ActivitiesTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('activities')) {
+            $this->schema->create('activities', function (Blueprint $table) {
+                $table->increments('id');
+                $table->string('ip_address', 45)->nullable();
+                $table->integer('user_id')->unsigned();
+                $table->string('type', 255)->comment('An identifier used to track the type of activity.');
+                $table->timestamp('occurred_at')->nullable();
+                $table->text('description')->nullable();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                //$table->foreign('user_id')->references('id')->on('users');
+                $table->index('user_id');
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('activities');
+    }
+}
\ No newline at end of file
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php
new file mode 100755
index 0000000..c74615f
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\Sprinkle\Account\Database\Models\Group;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Groups table migration
+ * "Group" now replaces the notion of "primary group" in earlier versions of UF.  A user can belong to exactly one group.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class GroupsTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('groups')) {
+            $this->schema->create('groups', function(Blueprint $table) {
+                $table->increments('id');
+                $table->string('slug');
+                $table->string('name');
+                $table->text('description')->nullable();
+                $table->string('icon', 100)->nullable(false)->default('fa fa-user')->comment('The icon representing users in this group.');
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                $table->unique('slug');
+                $table->index('slug');
+            });
+
+            // Add default groups
+            $groups = [
+                'terran' => new Group([
+                    'slug' => 'terran',
+                    'name' => 'Terran',
+                    'description' => 'The terrans are a young species with psionic potential. The terrans of the Koprulu sector descend from the survivors of a disastrous 23rd century colonization mission from Earth.',
+                    'icon' => 'sc sc-terran'
+                ]),
+                'zerg' => new Group([
+                    'slug' => 'zerg',
+                    'name' => 'Zerg',
+                    'description' => 'Dedicated to the pursuit of genetic perfection, the zerg relentlessly hunt down and assimilate advanced species across the galaxy, incorporating useful genetic code into their own.',
+                    'icon' => 'sc sc-zerg'
+                ]),
+                'protoss' => new Group([
+                    'slug' => 'protoss',
+                    'name' => 'Protoss',
+                    'description' => 'The protoss, a.k.a. the Firstborn, are a sapient humanoid race native to Aiur. Their advanced technology complements and enhances their psionic mastery.',
+                    'icon' => 'sc sc-protoss'
+                ])
+            ];
+
+            foreach ($groups as $slug => $group) {
+                $group->save();
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('groups');
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php
new file mode 100755
index 0000000..e785ccc
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * password_resets table migration
+ * Manages requests for password resets.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class passwordResetsTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('password_resets')) {
+            $this->schema->create('password_resets', function (Blueprint $table) {
+                $table->increments('id');
+                $table->integer('user_id')->unsigned();
+                $table->string('hash');
+                $table->boolean('completed')->default(0);
+                $table->timestamp('expires_at')->nullable();
+                $table->timestamp('completed_at')->nullable();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                //$table->foreign('user_id')->references('id')->on('users');
+                $table->index('user_id');
+                $table->index('hash');
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('password_resets');
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php
new file mode 100755
index 0000000..2c2990c
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Permission_roles table migration
+ * Many-to-many mapping between permissions and roles.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class PermissionRolesTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('permission_roles')) {
+            $this->schema->create('permission_roles', function (Blueprint $table) {
+                $table->integer('permission_id')->unsigned();
+                $table->integer('role_id')->unsigned();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                $table->primary(['permission_id', 'role_id']);
+                //$table->foreign('permission_id')->references('id')->on('permissions');
+                //$table->foreign('role_id')->references('id')->on('roles');
+                $table->index('permission_id');
+                $table->index('role_id');
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('permission_roles');
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php
new file mode 100755
index 0000000..684b01a
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\Sprinkle\Account\Database\Models\Permission;
+use UserFrosting\Sprinkle\Account\Database\Models\Role;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Permissions table migration
+ * Permissions now replace the 'authorize_group' and 'authorize_user' tables.
+ * Also, they now map many-to-many to roles.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class PermissionsTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public $dependencies = [
+        '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\RolesTable',
+        '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\PermissionRolesTable'
+    ];
+
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('permissions')) {
+            $this->schema->create('permissions', function(Blueprint $table) {
+                $table->increments('id');
+                $table->string('slug')->comment('A code that references a specific action or URI that an assignee of this permission has access to.');
+                $table->string('name');
+                $table->text('conditions')->comment('The conditions under which members of this group have access to this hook.');
+                $table->text('description')->nullable();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('permissions');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function seed()
+    {
+        // Skip this if table is not empty
+        if (Permission::count() == 0) {
+
+            $defaultRoleIds = [
+                'user' => Role::where('slug', 'user')->first()->id,
+                'group-admin' => Role::where('slug', 'group-admin')->first()->id,
+                'site-admin' => Role::where('slug', 'site-admin')->first()->id
+            ];
+
+            // Add default permissions
+            $permissions = [
+                'create_group' => new Permission([
+                    'slug' => 'create_group',
+                    'name' => 'Create group',
+                    'conditions' => 'always()',
+                    'description' => 'Create a new group.'
+                ]),
+                'create_user' => new Permission([
+                    'slug' => 'create_user',
+                    'name' => 'Create user',
+                    'conditions' => 'always()',
+                    'description' => 'Create a new user in your own group and assign default roles.'
+                ]),
+                'create_user_field' => new Permission([
+                    'slug' => 'create_user_field',
+                    'name' => 'Set new user group',
+                    'conditions' => "subset(fields,['group'])",
+                    'description' => 'Set the group when creating a new user.'
+                ]),
+                'delete_group' => new Permission([
+                    'slug' => 'delete_group',
+                    'name' => 'Delete group',
+                    'conditions' => "always()",
+                    'description' => 'Delete a group.'
+                ]),
+                'delete_user' => new Permission([
+                    'slug' => 'delete_user',
+                    'name' => 'Delete user',
+                    'conditions' => "!has_role(user.id,{$defaultRoleIds['site-admin']}) && !is_master(user.id)",
+                    'description' => 'Delete users who are not Site Administrators.'
+                ]),
+                'update_account_settings' => new Permission([
+                    'slug' => 'update_account_settings',
+                    'name' => 'Edit user',
+                    'conditions' => 'always()',
+                    'description' => 'Edit your own account settings.'
+                ]),
+                'update_group_field' => new Permission([
+                    'slug' => 'update_group_field',
+                    'name' => 'Edit group',
+                    'conditions' => 'always()',
+                    'description' => 'Edit basic properties of any group.'
+                ]),
+                'update_user_field' => new Permission([
+                    'slug' => 'update_user_field',
+                    'name' => 'Edit user',
+                    'conditions' => "!has_role(user.id,{$defaultRoleIds['site-admin']}) && subset(fields,['name','email','locale','group','flag_enabled','flag_verified','password'])",
+                    'description' => 'Edit users who are not Site Administrators.'
+                ]),
+                'update_user_field_group' => new Permission([
+                    'slug' => 'update_user_field',
+                    'name' => 'Edit group user',
+                    'conditions' => "equals_num(self.group_id,user.group_id) && !is_master(user.id) && !has_role(user.id,{$defaultRoleIds['site-admin']}) && (!has_role(user.id,{$defaultRoleIds['group-admin']}) || equals_num(self.id,user.id)) && subset(fields,['name','email','locale','flag_enabled','flag_verified','password'])",
+                    'description' => 'Edit users in your own group who are not Site or Group Administrators, except yourself.'
+                ]),
+                'uri_account_settings' => new Permission([
+                    'slug' => 'uri_account_settings',
+                    'name' => 'Account settings page',
+                    'conditions' => 'always()',
+                    'description' => 'View the account settings page.'
+                ]),
+                'uri_activities' => new Permission([
+                    'slug' => 'uri_activities',
+                    'name' => 'Activity monitor',
+                    'conditions' => 'always()',
+                    'description' => 'View a list of all activities for all users.'
+                ]),
+                'uri_dashboard' => new Permission([
+                    'slug' => 'uri_dashboard',
+                    'name' => 'Admin dashboard',
+                    'conditions' => 'always()',
+                    'description' => 'View the administrative dashboard.'
+                ]),
+                'uri_group' => new Permission([
+                    'slug' => 'uri_group',
+                    'name' => 'View group',
+                    'conditions' => 'always()',
+                    'description' => 'View the group page of any group.'
+                ]),
+                'uri_group_own' => new Permission([
+                    'slug' => 'uri_group',
+                    'name' => 'View own group',
+                    'conditions' => 'equals_num(self.group_id,group.id)',
+                    'description' => 'View the group page of your own group.'
+                ]),
+                'uri_groups' => new Permission([
+                    'slug' => 'uri_groups',
+                    'name' => 'Group management page',
+                    'conditions' => 'always()',
+                    'description' => 'View a page containing a list of groups.'
+                ]),
+                'uri_user' => new Permission([
+                    'slug' => 'uri_user',
+                    'name' => 'View user',
+                    'conditions' => 'always()',
+                    'description' => 'View the user page of any user.'
+                ]),
+                'uri_user_in_group' => new Permission([
+                    'slug' => 'uri_user',
+                    'name' => 'View user',
+                    'conditions' => "equals_num(self.group_id,user.group_id) && !is_master(user.id) && !has_role(user.id,{$defaultRoleIds['site-admin']}) && (!has_role(user.id,{$defaultRoleIds['group-admin']}) || equals_num(self.id,user.id))",
+                    'description' => 'View the user page of any user in your group, except the master user and Site and Group Administrators (except yourself).'
+                ]),
+                'uri_users' => new Permission([
+                    'slug' => 'uri_users',
+                    'name' => 'User management page',
+                    'conditions' => 'always()',
+                    'description' => 'View a page containing a table of users.'
+                ]),
+                'view_group_field' => new Permission([
+                    'slug' => 'view_group_field',
+                    'name' => 'View group',
+                    'conditions' => "in(property,['name','icon','slug','description','users'])",
+                    'description' => 'View certain properties of any group.'
+                ]),
+                'view_group_field_own' => new Permission([
+                    'slug' => 'view_group_field',
+                    'name' => 'View group',
+                    'conditions' => "equals_num(self.group_id,group.id) && in(property,['name','icon','slug','description','users'])",
+                    'description' => 'View certain properties of your own group.'
+                ]),
+                'view_user_field' => new Permission([
+                    'slug' => 'view_user_field',
+                    'name' => 'View user',
+                    'conditions' => "in(property,['user_name','name','email','locale','theme','roles','group','activities'])",
+                    'description' => 'View certain properties of any user.'
+                ]),
+                'view_user_field_group' => new Permission([
+                    'slug' => 'view_user_field',
+                    'name' => 'View user',
+                    'conditions' => "equals_num(self.group_id,user.group_id) && !is_master(user.id) && !has_role(user.id,{$defaultRoleIds['site-admin']}) && (!has_role(user.id,{$defaultRoleIds['group-admin']}) || equals_num(self.id,user.id)) && in(property,['user_name','name','email','locale','roles','group','activities'])",
+                    'description' => 'View certain properties of any user in your own group, except the master user and Site and Group Administrators (except yourself).'
+                ])
+            ];
+
+            foreach ($permissions as $slug => $permission) {
+                $permission->save();
+            }
+
+            // Add default mappings to permissions
+            $roleUser = Role::where('slug', 'user')->first();
+            if ($roleUser) {
+                $roleUser->permissions()->sync([
+                    $permissions['update_account_settings']->id,
+                    $permissions['uri_account_settings']->id,
+                    $permissions['uri_dashboard']->id
+                ]);
+            }
+
+            $roleSiteAdmin = Role::where('slug', 'site-admin')->first();
+            if ($roleSiteAdmin) {
+                $roleSiteAdmin->permissions()->sync([
+                    $permissions['create_group']->id,
+                    $permissions['create_user']->id,
+                    $permissions['create_user_field']->id,
+                    $permissions['delete_group']->id,
+                    $permissions['delete_user']->id,
+                    $permissions['update_user_field']->id,
+                    $permissions['update_group_field']->id,
+                    $permissions['uri_activities']->id,
+                    $permissions['uri_group']->id,
+                    $permissions['uri_groups']->id,
+                    $permissions['uri_user']->id,
+                    $permissions['uri_users']->id,
+                    $permissions['view_group_field']->id,
+                    $permissions['view_user_field']->id
+                ]);
+            }
+
+            $roleGroupAdmin = Role::where('slug', 'group-admin')->first();
+            if ($roleGroupAdmin) {
+                $roleGroupAdmin->permissions()->sync([
+                    $permissions['create_user']->id,
+                    $permissions['update_user_field_group']->id,
+                    $permissions['uri_group_own']->id,
+                    $permissions['uri_user_in_group']->id,
+                    $permissions['view_group_field_own']->id,
+                    $permissions['view_user_field_group']->id
+                ]);
+            }
+        }
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php
new file mode 100755
index 0000000..b96e327
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Persistences table migration
+ * Many-to-many mapping between roles and users.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class PersistencesTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('persistences')) {
+            $this->schema->create('persistences', function (Blueprint $table) {
+                $table->increments('id');
+                $table->integer('user_id')->unsigned();
+                $table->string('token', 40);
+                $table->string('persistent_token', 40);
+                $table->timestamp('expires_at')->nullable();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                //$table->foreign('user_id')->references('id')->on('users');
+                $table->index('user_id');
+                $table->index('token');
+                $table->index('persistent_token');
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('persistences');
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php
new file mode 100755
index 0000000..7f3648b
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Role_users table migration
+ * Many-to-many mapping between roles and users.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class RoleUsersTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('role_users')) {
+            $this->schema->create('role_users', function (Blueprint $table) {
+                $table->integer('user_id')->unsigned();
+                $table->integer('role_id')->unsigned();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                $table->primary(['user_id', 'role_id']);
+                //$table->foreign('user_id')->references('id')->on('users');
+                //$table->foreign('role_id')->references('id')->on('roles');
+                $table->index('user_id');
+                $table->index('role_id');
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('role_users');
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php
new file mode 100755
index 0000000..9cef494
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\Sprinkle\Account\Database\Models\Role;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Roles table migration
+ * Roles replace "groups" in UF 0.3.x.  Users acquire permissions through roles.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class RolesTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('roles')) {
+            $this->schema->create('roles', function (Blueprint $table) {
+                $table->increments('id');
+                $table->string('slug');
+                $table->string('name');
+                $table->text('description')->nullable();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                $table->unique('slug');
+                $table->index('slug');
+            });
+
+            // Add default roles
+            $roles = [
+                'user' => new Role([
+                    'slug' => 'user',
+                    'name' => 'User',
+                    'description' => 'This role provides basic user functionality.'
+                ]),
+                'site-admin' => new Role([
+                    'slug' => 'site-admin',
+                    'name' => 'Site Administrator',
+                    'description' => 'This role is meant for "site administrators", who can basically do anything except create, edit, or delete other administrators.'
+                ]),
+                'group-admin' => new Role([
+                    'slug' => 'group-admin',
+                    'name' => 'Group Administrator',
+                    'description' => 'This role is meant for "group administrators", who can basically do anything with users in their own group, except other administrators of that group.'
+                ])
+            ];
+
+            foreach ($roles as $slug => $role) {
+                $role->save();
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('roles');
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php
new file mode 100755
index 0000000..a65eeed
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Users table migration
+ * Removed the 'display_name', 'title', 'secret_token', and 'flag_password_reset' fields, and added first and last name and 'last_activity_id'.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class UsersTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('users')) {
+            $this->schema->create('users', function (Blueprint $table) {
+                $table->increments('id');
+                $table->string('user_name', 50);
+                $table->string('email', 254);
+                $table->string('first_name', 20);
+                $table->string('last_name', 30);
+                $table->string('locale', 10)->default('en_US')->comment('The language and locale to use for this user.');
+                $table->string('theme', 100)->nullable()->comment("The user theme.");
+                $table->integer('group_id')->unsigned()->default(1)->comment("The id of the user group.");
+                $table->boolean('flag_verified')->default(1)->comment("Set to 1 if the user has verified their account via email, 0 otherwise.");
+                $table->boolean('flag_enabled')->default(1)->comment("Set to 1 if the user account is currently enabled, 0 otherwise.  Disabled accounts cannot be logged in to, but they retain all of their data and settings.");
+                $table->integer('last_activity_id')->unsigned()->nullable()->comment("The id of the last activity performed by this user.");
+                $table->string('password', 255);
+                $table->softDeletes();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                //$table->foreign('group_id')->references('id')->on('groups');
+                //$table->foreign('last_activity_id')->references('id')->on('activities');
+                $table->unique('user_name');
+                $table->index('user_name');
+                $table->unique('email');
+                $table->index('email');
+                $table->index('group_id');
+                $table->index('last_activity_id');
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('users');
+    }
+}
diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php
new file mode 100755
index 0000000..fa54da6
--- /dev/null
+++ b/main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+use UserFrosting\System\Bakery\Migration;
+
+/**
+ * Verifications table migration
+ * Manages requests for email account verification.
+ * Version 4.0.0
+ *
+ * See https://laravel.com/docs/5.4/migrations#tables
+ * @extends Migration
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class VerificationsTable extends Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up()
+    {
+        if (!$this->schema->hasTable('verifications')) {
+            $this->schema->create('verifications', function (Blueprint $table) {
+                $table->increments('id');
+                $table->integer('user_id')->unsigned();
+                $table->string('hash');
+                $table->boolean('completed')->default(0);
+                $table->timestamp('expires_at')->nullable();
+                $table->timestamp('completed_at')->nullable();
+                $table->timestamps();
+
+                $table->engine = 'InnoDB';
+                $table->collation = 'utf8_unicode_ci';
+                $table->charset = 'utf8';
+                //$table->foreign('user_id')->references('id')->on('users');
+                $table->index('user_id');
+                $table->index('hash');
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function down()
+    {
+        $this->schema->drop('verifications');
+    }
+}
-- 
cgit v1.2.3