WIP - additional fixes for multitenant
This commit is contained in:
@@ -180,8 +180,9 @@ export class TenantProvisioningService {
|
||||
|
||||
try {
|
||||
// Create default roles
|
||||
const [adminRoleId] = await tenantKnex('roles').insert({
|
||||
id: tenantKnex.raw('(UUID())'),
|
||||
const adminRoleId = crypto.randomUUID();
|
||||
await tenantKnex('roles').insert({
|
||||
id: adminRoleId,
|
||||
name: 'Admin',
|
||||
guardName: 'api',
|
||||
description: 'Full system administrator access',
|
||||
@@ -189,8 +190,9 @@ export class TenantProvisioningService {
|
||||
updated_at: tenantKnex.fn.now(),
|
||||
});
|
||||
|
||||
const [userRoleId] = await tenantKnex('roles').insert({
|
||||
id: tenantKnex.raw('(UUID())'),
|
||||
const userRoleId = crypto.randomUUID();
|
||||
await tenantKnex('roles').insert({
|
||||
id: userRoleId,
|
||||
name: 'User',
|
||||
guardName: 'api',
|
||||
description: 'Standard user access',
|
||||
@@ -212,7 +214,7 @@ export class TenantProvisioningService {
|
||||
|
||||
for (const perm of permissions) {
|
||||
await tenantKnex('permissions').insert({
|
||||
id: tenantKnex.raw('(UUID())'),
|
||||
id: crypto.randomUUID(),
|
||||
name: perm.name,
|
||||
guardName: 'api',
|
||||
description: perm.description,
|
||||
@@ -225,7 +227,7 @@ export class TenantProvisioningService {
|
||||
const allPermissions = await tenantKnex('permissions').select('id');
|
||||
for (const perm of allPermissions) {
|
||||
await tenantKnex('role_permissions').insert({
|
||||
id: tenantKnex.raw('(UUID())'),
|
||||
id: crypto.randomUUID(),
|
||||
roleId: adminRoleId,
|
||||
permissionId: perm.id,
|
||||
created_at: tenantKnex.fn.now(),
|
||||
@@ -239,7 +241,7 @@ export class TenantProvisioningService {
|
||||
.select('id');
|
||||
for (const perm of userPermissions) {
|
||||
await tenantKnex('role_permissions').insert({
|
||||
id: tenantKnex.raw('(UUID())'),
|
||||
id: crypto.randomUUID(),
|
||||
roleId: userRoleId,
|
||||
permissionId: perm.id,
|
||||
created_at: tenantKnex.fn.now(),
|
||||
|
||||
Reference in New Issue
Block a user