Release 0.2.5

backend/.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        // linting
+        "dbaeumer.vscode-eslint",
+        // formatting
+        "rvest.vs-code-prettier-eslint",
+    ]
+}

backend/.vscode/settings.json

@@ -1,4 +1,10 @@
 {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
+    "typescript.tsdk": "node_modules\\typescript\\lib",
+    "[typescript]": {
+        "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+    },
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+    },
+    "editor.formatOnSave": true,
   }

backend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "backend",
-    "version": "0.2.3",
+    "version": "0.2.4",
     "description": "",
     "author": "",
     "private": true,

backend/src/auth/bnet-oauth2.strategy.ts

@@ -2,6 +2,7 @@ import { HttpService } from "@nestjs/axios";
 import { HttpException, Injectable, Logger } from "@nestjs/common";
 import { PassportStrategy } from "@nestjs/passport";
 import { Strategy } from "passport-oauth2";
+import { lastValueFrom } from "rxjs";
 import { User } from "src/entities/user.entity";
 import { UsersService } from "src/users/users.service";
 
@@ -27,13 +28,13 @@ export class BNetOauth2Strategy extends PassportStrategy(Strategy, "bnet") {
             // To be able to read the data contained in the access token (user id, battletag),
             // we need to call their /oauth/userinfo endpoint.
             this.logger.log("Received access token from battlenet oauth. Getting user info.");
-            const res = await this.httpService
-                .get("https://eu.battle.net/oauth/userinfo", {
+            const res = await lastValueFrom(
+                this.httpService.get("https://eu.battle.net/oauth/userinfo", {
                     headers: {
                         Authorization: `Bearer ${accessToken}`,
                     },
-                })
-                .toPromise();
+                }),
+            );
 
             const userInfo = res.data as { id: number; battletag: string };
             // If the token had an issue, we might get a response with a 200 status code
@@ -45,7 +46,10 @@ export class BNetOauth2Strategy extends PassportStrategy(Strategy, "bnet") {
                     500,
                 );
             }
-            this.logger.log("Successfully received user info from battlenet:\n" + JSON.stringify(userInfo, null, 4));
+            this.logger.log(
+                "Successfully received user info from battlenet:\n" +
+                    JSON.stringify(userInfo, null, 4),
+            );
 
             return await this.usersService.findOrCreate(userInfo);
         } catch (exception) {

backend/src/commons/validation-helper.ts

@@ -12,6 +12,7 @@ export class ValidationHelper {
         RaiderRole.Melee,
         RaiderRole.Ranged,
     ];
+    private static readonly HEALER_RANGED: RaiderRole[] = [RaiderRole.Healer, RaiderRole.Ranged];
     private static readonly TANK_MELEE: RaiderRole[] = [RaiderRole.Tank, RaiderRole.Melee];
     private static readonly MELEE_RANGED: RaiderRole[] = [RaiderRole.Melee, RaiderRole.Ranged];
 
@@ -27,6 +28,7 @@ export class ValidationHelper {
             case "Demon Hunter":
                 return this.TANK_MELEE.includes(role);
             case "Priest":
+                return this.HEALER_RANGED.includes(role);
             case "Shaman":
                 return this.HEALER_MELEE_RANGED.includes(role);
             case "Rogue":

backend/src/raiders/utils/raid-lockout-helper.ts

@@ -11,14 +11,14 @@ export class RaidLockoutHelper {
         characterRaids: CharacterRaids,
         currentRaidTier: RaidTierConfiguration,
     ): RaidLockout {
-        const currentExpansion = characterRaids.expansions.find(
+        const currentExpansion = characterRaids.expansions?.find(
             (expansion) => expansion.expansion.id === currentRaidTier.expansionId,
         );
         if (!currentExpansion) {
             return undefined;
         }
 
-        const currentRaidTierLockout = currentExpansion.instances.find(
+        const currentRaidTierLockout = currentExpansion.instances?.find(
             (instance) => instance.instance.id === currentRaidTier.raidTierId,
         );
         if (!currentRaidTierLockout) {

backend/src/search/search.service.ts

@@ -33,7 +33,7 @@ export class SearchService {
     constructor(private httpService: HttpService) {}
 
     async search(region: RegionName, characterName: string): Promise<SearchResultDto[]> {
-        const endpoint = `https://raider.io/api/search?term=${characterName}`;
+        const endpoint = `https://raider.io/api/search?term=${encodeURIComponent(characterName)}`;
 
         const searchResults = (await (
             await lastValueFrom(this.httpService.get(endpoint))

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   caddy:
-    image: raidsimp-frontend:0.2.3
+    image: raidsimp-frontend:0.2.4
     restart: always
     ports:
       - "80:80"
@@ -16,7 +16,7 @@ services:
         max-file: "10"
 
   backend:
-    image: raidsimp-backend:0.2.3
+    image: raidsimp-backend:0.2.4
     restart: always
     ports:
       - "127.0.0.1:3000:3000"

frontend/.env

@@ -1,4 +1,4 @@
 PORT=3001
 REACT_APP_BASE_URL=http://localhost:3000
-DISABLE_ESLINT_PLUGIN=true
+DISABLE_ESLINT_PLUGIN=false
 SKIP_PREFLIGHT_CHECK=true

frontend/.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        // linting
+        "dbaeumer.vscode-eslint",
+        // formatting
+        "rvest.vs-code-prettier-eslint",
+    ]
+}

frontend/.vscode/settings.json

@@ -1,3 +1,10 @@
 {
-    "typescript.tsdk": "node_modules\\typescript\\lib"
+    "typescript.tsdk": "node_modules\\typescript\\lib",
+    "[typescript]": {
+        "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+    },
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+    },
+    "editor.formatOnSave": true,
 }