fix: account invites with correct acc types (#920)

Author: ronyboi

src/assets/email/AccountInvitation.mjml

@@ -0,0 +1,60 @@
+<mjml>
+  <mj-head>
+    <mj-title>We've got your application!</mj-title>
+    <mj-font name="Hind" href="http://fonts.googleapis.com/css?family=Hind:400" />
+  </mj-head>
+  <mj-body background-color="#F9F9F9">
+    <mj-include path="assets/email/Header.mjml" />
+    <!-- START BODY -->
+    <mj-section background-color="#FFFFFF" border="5px solid #E9E9E9">
+      <mj-column>
+        <mj-spacer />
+        <mj-text font-family="Hind" line-height="150%" font-size="14px" color="#4D4D4D">
+          Hey there! 👋
+        </mj-text>
+
+        <mj-text font-family="Hind" line-height="150%" font-size="14px" color="#4D4D4D">
+        You've been invited to create an account on our <a href="https://app.mchacks.ca/"
+        style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">sponsor
+        dashboard</a>. On the sponsor dashboard you can find important
+        information about check-in, mentoring, judging, workshops, Discord, and
+        the schedule for the weekend. On the sponsor dashboard you will be able
+        to look up hacker applications and information. Additionally, if you
+        have resume access you will be able to download hacker resumes through
+        the dashboard.
+        </mj-text>
+
+        <mj-text font-family="Hind" line-height="150%" font-size="14px" color="#4D4D4D">
+          Sponsor check-in starts at 6:00 pm on Saturday, January 28th on the
+            McHacks Discord server and opening ceremonies will begin at 7:00 pm. Be
+            sure to get set up on the McHacks Discord server at <a
+                href="https://discord.gg/XVSdW9pc"
+                style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">https://discord.gg/XVSdW9pc</a>
+            and contact your coordinator to set up your server roles.
+        </mj-text>
+
+        <mj-text font-family="Hind" line-height="150%" font-size="14px" color="#4D4D4D">
+        Get access to the sponsor dashboard by clicking on the button below.
+        </mj-text>
+
+        <mj-spacer />
+        <mj-button href="{{{ link }}}" font-family="Hind" background-color="#F2463A" color="white" border-radius="40px">
+          Create your account
+        </mj-button>
+        <mj-spacer />
+
+        <mj-text font-family="Hind" line-height="150%" font-size="14px" color="#4D4D4D">
+        If you have any questions, feel free to reach out to your coordinator.
+        </mj-text>
+
+        <mj-text font-family="Hind" line-height="150%" font-size="14px" color="#4D4D4D">
+          McHacks Team
+          <br />
+          <a href="https://mchacks.ca" style="color: #F2463A; text-decoration: none;">mchacks.ca</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <!-- END BODY -->
+    <mj-include path="assets/email/Footer.mjml" />
+  </mj-body>
+</mjml>

src/constants/authorization-level.constant.ts

@@ -1,8 +1,8 @@
 export enum AuthorizationLevel {
-  Staff = "Staff",
-  Sponsor = "Sponsor",
-  Volunteer = "Volunteer",
-  Hacker = "Hacker",
-  Account = "Account",
-  None = "None",
+    Staff = "Staff",
+    Sponsor = "Sponsor",
+    Volunteer = "Volunteer",
+    Hacker = "Hacker",
+    Account = "Account",
+    None = "None"
 }

src/constants/error.constant.ts

@@ -13,7 +13,7 @@ const SPONSOR_ID_409_MESSAGE = "Conflict with sponsor accountId link";
 const VOLUNTEER_ID_409_MESSAGE = "Conflict with volunteer accountId link";
 const HACKER_ID_409_MESSAGE = "Conflict with hacker accountId link";
 const TEAM_MEMBER_409_MESSAGE =
-  "Conflict with team member being in another team";
+    "Conflict with team member being in another team";
 const TEAM_NAME_409_MESSAGE = "Conflict with team name already in use";
 const HACKER_STATUS_409_MESSAGE = "Conflict with hacker status";
 const TEAM_SIZE_409_MESSAGE = "Team full";
@@ -24,7 +24,7 @@ const VALIDATION_422_MESSAGE = "Validation failed";
 const ACCOUNT_DUPLICATE_422_MESSAGE = "Account already exists";
 const ROLE_DUPLICATE_422_MESSAGE = "Role already exists";
 const SETTINGS_422_MESSAGE =
-  "openTime must be before closeTime, and closeTime must be before confirmTime";
+    "openTime must be before closeTime, and closeTime must be before confirmTime";
 
 const ACCOUNT_TOKEN_401_MESSAGE = "Invalid token for account";
 const AUTH_401_MESSAGE = "Invalid Authentication";
@@ -49,46 +49,46 @@ const ROLE_CREATE_500_MESSAGE = "Error while creating role";
 const TRAVEL_CREATE_500_MESSAGE = "Error while creating travel";
 
 export {
-  ACCOUNT_404_MESSAGE,
-  HACKER_404_MESSAGE,
-  TEAM_404_MESSAGE,
-  RESUME_404_MESSAGE,
-  ACCOUNT_TYPE_409_MESSAGE,
-  ACCOUNT_EMAIL_409_MESSAGE,
-  SPONSOR_ID_409_MESSAGE,
-  VOLUNTEER_ID_409_MESSAGE,
-  TEAM_MEMBER_409_MESSAGE,
-  TEAM_MEMBER_422_MESSAGE,
-  VALIDATION_422_MESSAGE,
-  ACCOUNT_TOKEN_401_MESSAGE,
-  AUTH_401_MESSAGE,
-  AUTH_403_MESSAGE,
-  ACCOUNT_403_MESSAGE,
-  TEAM_UPDATE_500_MESSAGE,
-  HACKER_UPDATE_500_MESSAGE,
-  HACKER_ID_409_MESSAGE,
-  ACCOUNT_UPDATE_500_MESSAGE,
-  HACKER_CREATE_500_MESSAGE,
-  SPONSOR_404_MESSAGE,
-  SPONSOR_CREATE_500_MESSAGE,
-  TEAM_CREATE_500_MESSAGE,
-  VOLUNTEER_CREATE_500_MESSAGE,
-  EMAIL_500_MESSAGE,
-  GENERIC_500_MESSAGE,
-  ACCOUNT_DUPLICATE_422_MESSAGE,
-  LOGIN_500_MESSAGE,
-  HACKER_STATUS_409_MESSAGE,
-  TEAM_SIZE_409_MESSAGE,
-  ROLE_DUPLICATE_422_MESSAGE,
-  SETTINGS_422_MESSAGE,
-  ROLE_CREATE_500_MESSAGE,
-  TEAM_NAME_409_MESSAGE,
-  TEAM_JOIN_SAME_409_MESSAGE,
-  TEAM_READ_500_MESSAGE,
-  VOLUNTEER_404_MESSAGE,
-  SPONSOR_UPDATE_500_MESSAGE,
-  SETTINGS_404_MESSAGE,
-  SETTINGS_403_MESSAGE,
-  TRAVEL_404_MESSAGE,
-  TRAVEL_CREATE_500_MESSAGE,
+    ACCOUNT_404_MESSAGE,
+    HACKER_404_MESSAGE,
+    TEAM_404_MESSAGE,
+    RESUME_404_MESSAGE,
+    ACCOUNT_TYPE_409_MESSAGE,
+    ACCOUNT_EMAIL_409_MESSAGE,
+    SPONSOR_ID_409_MESSAGE,
+    VOLUNTEER_ID_409_MESSAGE,
+    TEAM_MEMBER_409_MESSAGE,
+    TEAM_MEMBER_422_MESSAGE,
+    VALIDATION_422_MESSAGE,
+    ACCOUNT_TOKEN_401_MESSAGE,
+    AUTH_401_MESSAGE,
+    AUTH_403_MESSAGE,
+    ACCOUNT_403_MESSAGE,
+    TEAM_UPDATE_500_MESSAGE,
+    HACKER_UPDATE_500_MESSAGE,
+    HACKER_ID_409_MESSAGE,
+    ACCOUNT_UPDATE_500_MESSAGE,
+    HACKER_CREATE_500_MESSAGE,
+    SPONSOR_404_MESSAGE,
+    SPONSOR_CREATE_500_MESSAGE,
+    TEAM_CREATE_500_MESSAGE,
+    VOLUNTEER_CREATE_500_MESSAGE,
+    EMAIL_500_MESSAGE,
+    GENERIC_500_MESSAGE,
+    ACCOUNT_DUPLICATE_422_MESSAGE,
+    LOGIN_500_MESSAGE,
+    HACKER_STATUS_409_MESSAGE,
+    TEAM_SIZE_409_MESSAGE,
+    ROLE_DUPLICATE_422_MESSAGE,
+    SETTINGS_422_MESSAGE,
+    ROLE_CREATE_500_MESSAGE,
+    TEAM_NAME_409_MESSAGE,
+    TEAM_JOIN_SAME_409_MESSAGE,
+    TEAM_READ_500_MESSAGE,
+    VOLUNTEER_404_MESSAGE,
+    SPONSOR_UPDATE_500_MESSAGE,
+    SETTINGS_404_MESSAGE,
+    SETTINGS_403_MESSAGE,
+    TRAVEL_404_MESSAGE,
+    TRAVEL_CREATE_500_MESSAGE
 };

src/controllers/account.controller.ts

@@ -29,6 +29,7 @@ import { Validator } from "@middlewares/validator.middleware";
 import AccountConfirmation from "@models/account-confirmation-token.model";
 import * as jwt from "jsonwebtoken";
 import { InvitationService } from "@app/services/invitation.service";
+import Invitation from "@app/models/invitation.model";
 
 @autoInjectable()
 @Controller("/account")
@@ -56,20 +57,25 @@ export class AccountController {
         );
 
         if (inviter) {
-            const invitation = await this.invitationService.save({email, accountType, inviter});
+            const invitation = await this.invitationService.save({
+                email,
+                accountType,
+                inviter
+            });
             await this.mailer.send(
                 {
                     to: invitation.email,
-                    subject: "Account Confirmation Instructions",
+                    subject: "Account Creation Instructions",
                     html: join(
                         __dirname,
-                        "../assets/email/AccountConfirmation.mjml"
+                        "../assets/email/AccountInvitation.mjml"
                     )
                 },
                 {
-                    link: this.accountConfirmationService.generateLink(
-                        "confirm",
-                        this.invitationService.generateToken(invitation)
+                    link: this.invitationService.generateLink(
+                        "account/create",
+                        this.invitationService.generateToken(invitation),
+                        accountType
                     )
                 },
                 (error?: any) => {
@@ -86,7 +92,7 @@ export class AccountController {
             });
         } else {
             return response.status(404).json({
-                message: ErrorConstants.ACCOUNT_404_MESSAGE,
+                message: ErrorConstants.ACCOUNT_404_MESSAGE
             });
         }
     }
@@ -186,33 +192,32 @@ export class AccountController {
     async create(
         @Response() response: ExpressResponse,
         @Body() account: Account,
-        @Headers("X-Invite-Token") token?: string
+        // @Params("token") token?: string,
+        // @Params("accountType") accType?: string,
+        @Headers("token") token?: string
     ) {
         if (token) {
-            const data = jwt.verify(
-                token,
-                process.env.JWT_CONFIRM_ACC_SECRET!
-            ) as {
-                identifier: number;
+            const data = jwt.verify(token, process.env.JWT_INVITE_SECRET!) as {
+                invitation: Invitation;
             };
 
-            const result = await this.accountConfirmationService.findByIdentifier(
-                data.identifier
+            const result = await this.invitationService.findByIdentifier(
+                data.email
             );
 
             if (result) {
                 account.confirmed = true;
                 account.accountType = result.accountType;
 
-                this.accountConfirmationService.delete(result.identifier);
+                this.invitationService.delete(data.email);
             }
         }
 
         const result: Account = await this.accountService.save(account);
 
         if (result) {
             const model = await this.accountConfirmationService.save({
-                accountType: GeneralConstants.HACKER,
+                accountType: result.accountType,
                 email: result.email,
                 confirmationType: GeneralConstants.CONFIRMATION_TYPE_ORGANIC,
                 account: result

src/controllers/search.controller.ts

@@ -25,7 +25,10 @@ export class SearchController {
         @Query("model") model: string,
         @Query("q") filters: string
     ) {
-        const result = await this.searchService.executeQuery(model, JSON.parse(filters));
+        const result = await this.searchService.executeQuery(
+            model,
+            JSON.parse(filters)
+        );
 
         response.status(200).send({
             message:

src/controllers/setting.controller.ts

@@ -21,7 +21,7 @@ import { Validator } from "@app/middlewares/validator.middleware";
 @autoInjectable()
 @Controller("/settings")
 export class SettingController {
-    constructor(private readonly settingService: SettingService) { }
+    constructor(private readonly settingService: SettingService) {}
 
     @Get("/")
     async getAll(@Response() response: ExpressResponse) {
@@ -55,17 +55,17 @@ export class SettingController {
 
         return result
             ? response.status(200).send({
-                message: SuccessConstants.SETTINGS_POST,
-                data: result
-            })
+                  message: SuccessConstants.SETTINGS_POST,
+                  data: result
+              })
             : response.status(422).send({
-                message: ErrorConstants.SETTINGS_422_MESSAGE
-            });
+                  message: ErrorConstants.SETTINGS_422_MESSAGE
+              });
     }
 
     @Patch("", [
         EnsureAuthenticated,
-        EnsureAuthorization([AuthorizationLevel.Staff]),
+        EnsureAuthorization([AuthorizationLevel.Staff])
     ])
     async update(
         @Response() response: ExpressResponse,
@@ -74,7 +74,7 @@ export class SettingController {
         await this.settingService.update(settings);
         return response.status(200).json({
             message: SuccessConstants.SETTINGS_PATCH
-        })
+        });
     }
 
     @Patch("/:identifier", [
@@ -91,14 +91,14 @@ export class SettingController {
 
         return result
             ? response.status(200).json({
-                message: SuccessConstants.SETTINGS_PATCH,
-                data: result
-            })
+                  message: SuccessConstants.SETTINGS_PATCH,
+                  data: result
+              })
             : response.status(404).json({
-                message: ErrorConstants.SETTINGS_404_MESSAGE,
-                data: {
-                    identifier: identifier
-                }
-            });
+                  message: ErrorConstants.SETTINGS_404_MESSAGE,
+                  data: {
+                      identifier: identifier
+                  }
+              });
     }
 }