Add fields for admin panel access and workspace version (#10451)
Prepare for better version upgrade system + split admin panel into two permissions + fix GraphQL generation detection --------- Co-authored-by: ehconitin <nitinkoche03@gmail.com>
This commit is contained in:
@ -22,6 +22,7 @@ export const seedUsers = async (
|
||||
'email',
|
||||
'passwordHash',
|
||||
'canImpersonate',
|
||||
'canAccessFullAdminPanel',
|
||||
])
|
||||
.orIgnore()
|
||||
.values([
|
||||
@ -33,6 +34,7 @@ export const seedUsers = async (
|
||||
passwordHash:
|
||||
'$2b$10$66d.6DuQExxnrfI9rMqOg.U1XIYpagr6Lv05uoWLYbYmtK0HDIvS6', // Applecar2025
|
||||
canImpersonate: true,
|
||||
canAccessFullAdminPanel: true,
|
||||
},
|
||||
{
|
||||
id: DEV_SEED_USER_IDS.JONY,
|
||||
@ -42,6 +44,7 @@ export const seedUsers = async (
|
||||
passwordHash:
|
||||
'$2b$10$66d.6DuQExxnrfI9rMqOg.U1XIYpagr6Lv05uoWLYbYmtK0HDIvS6', // Applecar2025
|
||||
canImpersonate: true,
|
||||
canAccessFullAdminPanel: true,
|
||||
},
|
||||
{
|
||||
id: DEV_SEED_USER_IDS.PHIL,
|
||||
@ -51,6 +54,7 @@ export const seedUsers = async (
|
||||
passwordHash:
|
||||
'$2b$10$66d.6DuQExxnrfI9rMqOg.U1XIYpagr6Lv05uoWLYbYmtK0HDIvS6', // Applecar2025
|
||||
canImpersonate: true,
|
||||
canAccessFullAdminPanel: true,
|
||||
},
|
||||
])
|
||||
.execute();
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
export class AddAccessToFullAdminAndWorkspaceVersion1740415309924
|
||||
implements MigrationInterface
|
||||
{
|
||||
name = 'AddAccessToFullAdminAndWorkspaceVersion1740415309924';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "core"."user" ADD "canAccessFullAdminPanel" boolean NOT NULL DEFAULT false`,
|
||||
);
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "core"."workspace" ADD "version" character varying`,
|
||||
);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "core"."workspace" DROP COLUMN "version"`,
|
||||
);
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "core"."user" DROP COLUMN "canAccessFullAdminPanel"`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -207,6 +207,7 @@ export class SignInUpService {
|
||||
const userToCreate = this.userRepository.create({
|
||||
...newUser,
|
||||
defaultAvatarUrl: imagePath,
|
||||
canAccessFullAdminPanel: false,
|
||||
canImpersonate: false,
|
||||
} as Partial<User>);
|
||||
|
||||
@ -289,6 +290,7 @@ export class SignInUpService {
|
||||
const user: PartialUserWithPicture = {
|
||||
...partialUserWithPicture,
|
||||
canImpersonate: false,
|
||||
canAccessFullAdminPanel: false,
|
||||
};
|
||||
|
||||
if (!user.email) {
|
||||
@ -303,6 +305,7 @@ export class SignInUpService {
|
||||
|
||||
// if the workspace doesn't exist it means it's the first user of the workspace
|
||||
user.canImpersonate = true;
|
||||
user.canAccessFullAdminPanel = true;
|
||||
|
||||
// let the creation of the first workspace
|
||||
if (workspacesCount > 0) {
|
||||
|
||||
@ -69,6 +69,10 @@ export class User {
|
||||
@Column({ default: false })
|
||||
canImpersonate: boolean;
|
||||
|
||||
@Field()
|
||||
@Column({ default: false })
|
||||
canAccessFullAdminPanel: boolean;
|
||||
|
||||
@Field()
|
||||
@CreateDateColumn({ type: 'timestamptz' })
|
||||
createdAt: Date;
|
||||
|
||||
@ -15,12 +15,12 @@ import {
|
||||
|
||||
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
|
||||
import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
|
||||
import { ApprovedAccessDomain } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.entity';
|
||||
import { FeatureFlag } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
|
||||
import { KeyValuePair } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';
|
||||
import { PostgresCredentials } from 'src/engine/core-modules/postgres-credentials/postgres-credentials.entity';
|
||||
import { WorkspaceSSOIdentityProvider } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
|
||||
import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
|
||||
import { ApprovedAccessDomain } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.entity';
|
||||
|
||||
registerEnumType(WorkspaceActivationStatus, {
|
||||
name: 'WorkspaceActivationStatus',
|
||||
@ -150,4 +150,8 @@ export class Workspace {
|
||||
@Field()
|
||||
@Column({ default: false })
|
||||
isCustomDomainEnabled: boolean;
|
||||
|
||||
@Field(() => String, { nullable: true })
|
||||
@Column({ type: 'varchar', nullable: true })
|
||||
version: string | null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user