@@ -10,7 +10,7 @@ import { In, IsNull } from 'typeorm';
10
10
import { RequestContext } from '../../api/common/request-context' ;
11
11
import { RelationPaths } from '../../api/index' ;
12
12
import { EntityNotFoundError , InternalServerError , UserInputError } from '../../common/error/errors' ;
13
- import { idsAreEqual , normalizeEmailAddress } from '../../common/index' ;
13
+ import { assertFound , idsAreEqual , normalizeEmailAddress } from '../../common/index' ;
14
14
import { ListQueryOptions } from '../../common/types/common-types' ;
15
15
import { ConfigService } from '../../config' ;
16
16
import { TransactionalConnection } from '../../connection/transactional-connection' ;
@@ -317,10 +317,10 @@ export class AdministratorService {
317
317
superadminCredentials . identifier ,
318
318
superadminCredentials . password ,
319
319
) ;
320
- const createdAdministrator = await this . connection
321
- . getRepository ( ctx , Administrator )
322
- . save ( administrator ) ;
323
- await this . assignRole ( ctx , createdAdministrator . id , superAdminRole . id ) ;
320
+ const { id } = await this . connection . getRepository ( ctx , Administrator ) . save ( administrator ) ;
321
+ const createdAdministrator = await assertFound ( this . findOne ( ctx , id ) ) ;
322
+ createdAdministrator . user . roles . push ( superAdminRole ) ;
323
+ await this . connection . getRepository ( ctx , User ) . save ( createdAdministrator . user , { reload : false } ) ;
324
324
} else {
325
325
const superAdministrator = await this . connection . rawConnection
326
326
. getRepository ( Administrator )
0 commit comments