mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	fix: emailservice now just returns if email was configured
This commit is contained in:
		
							parent
							
								
									7cb7e4a193
								
							
						
					
					
						commit
						97d77d84cc
					
				@ -99,6 +99,7 @@ class FeatureToggleStore {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async getProjectId(name) {
 | 
					    async getProjectId(name) {
 | 
				
			||||||
 | 
					        if (name) {
 | 
				
			||||||
            return this.db
 | 
					            return this.db
 | 
				
			||||||
                .first(['project'])
 | 
					                .first(['project'])
 | 
				
			||||||
                .from(TABLE)
 | 
					                .from(TABLE)
 | 
				
			||||||
@ -109,6 +110,8 @@ class FeatureToggleStore {
 | 
				
			|||||||
                    return undefined;
 | 
					                    return undefined;
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					        return undefined;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async hasFeature(name) {
 | 
					    async hasFeature(name) {
 | 
				
			||||||
        return this.db
 | 
					        return this.db
 | 
				
			||||||
 | 
				
			|||||||
@ -108,9 +108,8 @@ export default class UserAdminController extends Controller {
 | 
				
			|||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            const emailConfigured = this.emailService.configured();
 | 
					            const emailConfigured = this.emailService.configured();
 | 
				
			||||||
            let sentMetaData = null;
 | 
					 | 
				
			||||||
            if (emailConfigured) {
 | 
					            if (emailConfigured) {
 | 
				
			||||||
                sentMetaData = await this.emailService.sendGettingStartedMail(
 | 
					                await this.emailService.sendGettingStartedMail(
 | 
				
			||||||
                    createdUser.name,
 | 
					                    createdUser.name,
 | 
				
			||||||
                    createdUser.email,
 | 
					                    createdUser.email,
 | 
				
			||||||
                    inviteLink.toString(),
 | 
					                    inviteLink.toString(),
 | 
				
			||||||
@ -121,13 +120,10 @@ export default class UserAdminController extends Controller {
 | 
				
			|||||||
                );
 | 
					                );
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            const emailSent =
 | 
					 | 
				
			||||||
                sentMetaData?.response.includes(MAIL_ACCEPTED) || false;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            res.status(201).send({
 | 
					            res.status(201).send({
 | 
				
			||||||
                ...createdUser,
 | 
					                ...createdUser,
 | 
				
			||||||
                inviteLink,
 | 
					                inviteLink,
 | 
				
			||||||
                emailSent,
 | 
					                emailSent: emailConfigured,
 | 
				
			||||||
                rootRole,
 | 
					                rootRole,
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
        } catch (e) {
 | 
					        } catch (e) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user