Skip to content

Commit

Permalink
Merge pull request #608 from Real-Dev-Squad/develop
Browse files Browse the repository at this point in the history 
Dev to Main sync
  • Loading branch information
@iamitprakash
iamitprakash authored Aug 24, 2024
2 parents 7d1f47c + c85be5a commit 3ca27ff
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 79 deletions.
2 changes: 1 addition & 1 deletion app/components/new-signup/input.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{#if @dev}}
Next
{{else}}
{{if (eq @currentStep 'username') 'Submit' 'Next'}}
{{if (eq @currentStep 'lastName') 'Submit' 'Next'}}
{{/if}}
</Button>
</div>
Expand Down
1 change: 1 addition & 0 deletions app/constants/new-signup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const LABEL_TEXT = {
export const ERROR_MESSAGES = {
userName: 'username already taken!',
others: 'something went wrong',
usernameGeneration: 'Username cannot be generated',
};

export const CHECK_BOX_DATA = [
Expand Down
139 changes: 81 additions & 58 deletions app/controllers/new-signup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ import { GOTO_URL } from '../constants/url';
import { NEW_SIGNUP_FLOW } from '../constants/analytics';
import { ERROR_MESSAGES, NEW_SIGNUP_STEPS } from '../constants/new-signup';
import checkUserName from '../utils/check-username';
import ENV from 'website-my/config/environment';
import { toastNotificationTimeoutOptions } from '../constants/toast-notification';

export default class NewSignUpController extends Controller {
@service analytics;
@service featureFlag;
@service toast;

queryParams = ['currentStep', 'dev'];

Expand Down Expand Up @@ -41,6 +44,42 @@ export default class NewSignUpController extends Controller {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.USER_GETTING_STARTED);
}

async generateUsername(firstname, lastname) {
if (typeof firstname !== 'string' || typeof lastname !== 'string') {
throw new Error('Invalid input: firstname and lastname must be strings');
}
try {
const sanitizedFirstname = firstname.toLowerCase();
const sanitizedLastname = lastname.toLowerCase();

const response = await fetch(
`${ENV.BASE_API_URL}/users/username?dev=true&firstname=${sanitizedFirstname}&lastname=${sanitizedLastname}`,
{
method: 'GET',
headers: {
'Content-Type': 'application/json',
},
credentials: 'include',
}
);
const user = await response.json();

if (user && user.username) {
return user;
}
throw new Error(
'Username generation failed: Invalid response from server'
);
} catch (err) {
this.toast.error(
ERROR_MESSAGES.usernameGeneration,
'error!',
toastNotificationTimeoutOptions
);
throw new Error(ERROR_MESSAGES.usernameGeneration);
}
}

@action changeStepToThree() {
this.currentStep = this.THIRD_STEP;
this.analytics.trackEvent(NEW_SIGNUP_FLOW.USER_FIRST_NAME);
Expand Down Expand Up @@ -91,69 +130,53 @@ export default class NewSignUpController extends Controller {
}

@action async signup() {
const signupDetails = {
first_name: this.signupDetails.firstName,
last_name: this.signupDetails.lastName,
username: this.signupDetails.username,
};
const roles = {};
Object.entries(this.signupDetails.roles).forEach(([key, value]) => {
if (value === true) {
roles[key] = value;
}
});

this.isLoading = true;
try {
let user;
this.isLoading = true;
if (!this.isDevMode)
user = await this.generateUsername(
this.signupDetails.firstName,
this.signupDetails.lastName
);
const signupDetails = {
first_name: this.signupDetails.firstName,
last_name: this.signupDetails.lastName,
username: this.isDevMode ? this.signupDetails.username : user.username,
};
const roles = {};
Object.entries(this.signupDetails.roles).forEach(([key, value]) => {
if (value === true) {
roles[key] = value;
}
});

const isUsernameAvailable = await checkUserName(signupDetails.username);
if (!isUsernameAvailable) {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.USERNAME_NOT_AVAILABLE);
this.isLoading = false;
this.isButtonDisabled = false;
return (this.error = ERROR_MESSAGES.userName);
}
const isUsernameAvailable = await checkUserName(signupDetails.username);
if (!isUsernameAvailable) {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.USERNAME_NOT_AVAILABLE);
this.isLoading = false;
this.isButtonDisabled = false;
return (this.error = ERROR_MESSAGES.userName);
}

if (this.isDevMode) {
try {
const res = await newRegisterUser(signupDetails, roles);
if (res.status === 204) {
this.analytics.identifyUser();
this.analytics.trackEvent(NEW_SIGNUP_FLOW.USER_REGISTERED);
this.currentStep = this.LAST_STEP;
} else {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.UNABLE_TO_SIGNUP);
this.error = ERROR_MESSAGES.others;
this.isButtonDisabled = false;
}
} catch (error) {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.UNABLE_TO_REGISTER);
const res = this.isDevMode
? await newRegisterUser(signupDetails, roles)
: await registerUser(signupDetails);
if (res.status === 204) {
this.analytics.identifyUser();
this.analytics.trackEvent(NEW_SIGNUP_FLOW.USER_REGISTERED);
this.currentStep = this.LAST_STEP;
} else {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.UNABLE_TO_SIGNUP);
this.error = ERROR_MESSAGES.others;
this.isButtonDisabled = false;
} finally {
this.isLoading = false;
}
} else {
//this will get removed after removing feature flag
registerUser(signupDetails)
.then((res) => {
if (res.status === 204) {
this.analytics.identifyUser();
this.analytics.trackEvent(NEW_SIGNUP_FLOW.USER_REGISTERED);
this.currentStep = this.LAST_STEP;
} else {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.UNABLE_TO_SIGNUP);
this.error = ERROR_MESSAGES.others;
this.isButtonDisabled = false;
}
})
.catch(() => {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.UNABLE_TO_REGISTER);
this.error = ERROR_MESSAGES.others;
this.isButtonDisabled = false;
})
.finally(() => {
this.isLoading = false;
});
} catch (error) {
this.analytics.trackEvent(NEW_SIGNUP_FLOW.UNABLE_TO_REGISTER);
console.log(error);
this.error = error?.message || ERROR_MESSAGES.others;
this.isButtonDisabled = false;
} finally {
this.isLoading = false;
}
}
}
6 changes: 3 additions & 3 deletions app/templates/discord.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Spinner />
</div>
{{else}}
{{#if (or @model.userData.discordId (eq this.linkStatus 'linked'))}}
{{#if (and @model.userData.discordId (eq @model.userData.roles.archived false))}}
<div class='discord__success'>
<p class='success__text'>Your Discord account has been successfully
linked.</p>
Expand All @@ -20,7 +20,7 @@
<div class='discord__error'>
<p class='error__text'>Something went wrong. Please try again.</p>
</div>
{{else if (eq this.linkStatus 'not-linked')}}
{{else}}
<header class='header horizontal-flex w-100' data-test-header>
<img
src='RDSLogo.png'
Expand Down Expand Up @@ -130,4 +130,4 @@
{{/if}}
{{/if}}
{{/if}}
</section>
</section>
26 changes: 13 additions & 13 deletions app/templates/new-signup.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,13 @@
{{/if}}

{{#if (eq this.currentStep this.THIRD_STEP)}}
<NewSignup::Input
@onClick={{this.changeStepToFour}}
@currentStep={{this.currentStep}}
@onChange={{this.handleInputChange}}
@isButtonDisabled={{this.isButtonDisabled}}
@isLoading={{this.isLoading}}
/>
{{/if}}

{{#if (eq this.currentStep this.FOURTH_STEP)}}
{{#if this.isDevMode}}
<NewSignup::Input
@onClick={{this.changeStepToFive}}
@onClick={{this.changeStepToFour}}
@currentStep={{this.currentStep}}
@dev={{this.isDevMode}}
@onChange={{this.handleInputChange}}
@isButtonDisabled={{this.isButtonDisabled}}
@isLoading={{this.isLoading}}
@error={{this.error}}
/>
{{else}}
<NewSignup::Input
Expand All @@ -51,6 +39,18 @@
{{/if}}

{{#if this.isDevMode}}
{{#if (eq this.currentStep this.FOURTH_STEP)}}
<NewSignup::Input
@onClick={{this.changeStepToFive}}
@currentStep={{this.currentStep}}
@dev={{this.isDevMode}}
@onChange={{this.handleInputChange}}
@isButtonDisabled={{this.isButtonDisabled}}
@isLoading={{this.isLoading}}
@error={{this.error}}
/>
{{/if}}

{{#if (eq this.currentStep this.FIFTH_STEP)}}
<NewSignup::Checkbox
@onClick={{this.register}}
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/components/new-signup/input-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ module('Integration | Component | new-sign-up/form', function (hooks) {
assert.dom('[data-test-btn="signup"]').hasAnyText();
});

test('button should have text Submit if the current step is username', async function (assert) {
test('button should have text Submit if the current step is lastName', async function (assert) {
assert.expect(2);
this.setProperties({
onClick: function () {
this.currentStep = this.LAST_STEP;
},
currentStep: 'username',
currentStep: 'lastName',
});

await render(hbs`
Expand All @@ -107,13 +107,13 @@ module('Integration | Component | new-sign-up/form', function (hooks) {
assert.dom('[data-test-btn="signup"]').hasText('Submit');
});

test('button should have text Submit if the current step is username and if dev is set to false', async function (assert) {
test('button should have text Submit if the current step is lastName and if dev is set to false', async function (assert) {
assert.expect(2);
this.setProperties({
onClick: function () {
this.currentStep = this.LAST_STEP;
},
currentStep: 'username',
currentStep: 'lastName',
dev: false,
});

Expand Down

0 comments on commit 3ca27ff

Please sign in to comment.