@solidxai/core 0.1.17-beta.0 → 0.1.17-beta.2

package/dist/services/authentication.service.js

@@ -43,7 +43,6 @@ const metadata_validation_service_1 = require("./metadata-validation.service");
 const user_service_1 = require("./user.service");
 const sms_factory_1 = require("../factories/sms.factory");
 const whatsapp_factory_1 = require("../factories/whatsapp.factory");
-const solid_registry_1 = require("../helpers/solid-registry");
 var LoginProvider;
 (function (LoginProvider) {
     LoginProvider["LOCAL"] = "local";
@@ -71,7 +70,7 @@ const SIGNUP_POLICY = {
     },
 };
 let AuthenticationService = AuthenticationService_1 = class AuthenticationService {
-    constructor(userService, userRepository, hashingService, jwtService, activeSessionStorage, accessTokenDenylist, refreshTokenIdsStorage, httpService, mailServiceFactory, smsFactory, whatsAppFactory, eventEmitter, settingService, roleMetadataService, userActivityHistoryService, ssoCodeStorage, metadataValidationService, dataSource, solidRegistry) {
+    constructor(userService, userRepository, hashingService, jwtService, activeSessionStorage, accessTokenDenylist, refreshTokenIdsStorage, httpService, mailServiceFactory, smsFactory, whatsAppFactory, eventEmitter, settingService, roleMetadataService, userActivityHistoryService, ssoCodeStorage, metadataValidationService, dataSource) {
         this.userService = userService;
         this.userRepository = userRepository;
         this.hashingService = hashingService;
@@ -90,7 +89,6 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         this.ssoCodeStorage = ssoCodeStorage;
         this.metadataValidationService = metadataValidationService;
         this.dataSource = dataSource;
-        this.solidRegistry = solidRegistry;
         this.logger = new common_1.Logger(AuthenticationService_1.name);
     }
     async getCompanyLogo() {
@@ -175,9 +173,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         }
         switch (source) {
             case RolesSource.Provider:
-                return (this.solidRegistry
-                    .getExtensionUserCreationProvider()
-                    ?.roles(dto) ?? []);
+                return this.userService.resolveProviderRoles(dto);
             case RolesSource.Caller:
                 return dto.roles ?? [];
             case RolesSource.Default:
@@ -406,7 +402,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             throw new common_1.ConflictException(error_messages_1.ERROR_MESSAGES.USER_ALREADY_EXISTS);
         }
         try {
-            const user = await this.upsertUserWithRegistrationVerificationTokens(existingUser, signUpDto, validationSource);
+            const user = await this.resolveUserForOtpRegistration(existingUser, signUpDto, validationSource);
             await this.notifyUserOnOtpInitiateRegistration(user, validationSource);
         }
         catch (err) {
@@ -439,19 +435,16 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     resolvePasswordlessValidationSource() {
         return this.settingService.getConfigValue("passwordlessRegistrationValidateWhat");
     }
-    async upsertUserWithRegistrationVerificationTokens(existingUser, signUpDto, validationSource) {
+    async resolveUserForOtpRegistration(existingUser, signUpDto, validationSource) {
         if ((0, class_validator_1.isEmpty)(existingUser)) {
             const roles = this.resolveSignupRoles(signUpDto, SIGNUP_POLICY[signup_intent_enum_1.SignupIntent.SelfRegistration].rolesSource);
             const { entity: user, repo } = await this.createUser(signUpDto);
             user.active = false;
             await this.assignRegistrationOtp(validationSource, user);
             await repo.save(user);
-            if (roles.length) {
-                await this.userService.addRolesToUser(user.username, roles);
-            }
-            else {
-                await this.userService.addRoleToUser(user.username, this.settingService.getConfigValue("defaultRole"));
-            }
+            const defaultRole = this.settingService.getConfigValue("defaultRole");
+            const effectiveRoles = roles.length ? roles : [defaultRole].filter(Boolean);
+            await this.userService.initializeRolesForNewUser(effectiveRoles, user);
             return user;
         }
         const user = existingUser;
@@ -1679,8 +1672,7 @@ exports.AuthenticationService = AuthenticationService = AuthenticationService_1
         user_activity_history_service_1.UserActivityHistoryService,
         sso_code_storage_service_1.SsoCodeStorageService,
         metadata_validation_service_1.MetadataValidationService,
-        typeorm_2.DataSource,
-        solid_registry_1.SolidRegistry])
+        typeorm_2.DataSource])
 ], AuthenticationService);
 function parseUniqueConstraintError(detail) {
     const match = detail.match(/Key \(([^)]+)\)=\(([^)]+)\) already exists\./);