Merge remote-tracking branch 'other/dev'

Author: aapolaakkio

.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
     "**/node_modules/**",
     "**/dist/**",
     "**/build/**",
+    "**/coverage/**",
     ".eslintrc.js",
     "jest.config.js",
     "*.svg",

CHANGELOG.md

@@ -1,74 +1,144 @@
 # Changelog
 
+## 2.0.0-rc.2
+
+**Bug fixes and improvements:**
+
+- Fixed answer options from non-default languages not being valid for signups
+- Fixed answer options getting desynced between languages when changing question types
+- The event editor no longer shows a non-functional "Create signup" button when there are no quotas
+
+## 2.0.0-rc.1
+
+**Breaking changes:**
+
+- **API:** Improved event validation errors, some HTTP status codes changed
+
+**Features:**
+
+- Added a button to copy events
+
+**Bug fixes and improvements:**
+
+- Include event info in signup creation audit logs
+- Fix event editor crashing for events with no language version in the app's default language
+
 ## 2.0.0-alpha46
 
+**Bug fixes and improvements:**
+
 - Avoid another error for older servers in `getLocalizedEvent`
 
 ## 2.0.0-alpha45
 
-- **Breaking (ilmomasiina-client):** Replaced `getLocalizedQuotaForEditSignup` with `getLocalizedSignup`
+**Breaking changes:**
+
+- **ilmomasiina-client:** Replaced `getLocalizedQuotaForEditSignup` with `getLocalizedSignup`
+
+**Bug fixes and improvements:**
+
 - Fix localization of current quota in signup editor
 - Avoid errors for older servers in `getLocalizedEvent`
 
 ## 2.0.0-alpha44
 
+**Features:**
+
 - Also build ESM versions of public packages
 
 ## 2.0.0-alpha43
 
+**Bug fixes and improvements:**
+
 - Minor typing improvements
 
 ## 2.0.0-alpha42
 
-- **BREAKING:** Restructuring moved all customization to the `@tietokilta/ilmomasiina-frontend` package.
-- **Breaking (ilmomasiina-components):** Replaced the `@tietokilta/ilmomasiina-components` package with
+**Breaking changes:**
+
+- **Customization:** Restructuring moved all customization to the `@tietokilta/ilmomasiina-frontend` package.
+- **ilmomasiina-components:** Replaced the `@tietokilta/ilmomasiina-components` package with
   `ilmomasiina-client`, which gets rid of shared React components and only provides API helpers, React hooks for state
   and API, and locale strings
-- **Feature:** Added comprehensive multi-language support to events; API is backwards compatible and older clients will
+
+**Features:**
+
+- Added comprehensive multi-language support to events; API is backwards compatible and older clients will
   see the default language of events
+
+**Bug fixes and improvements:**
+
 - Localization fixes
 - Updated dependencies
 - Development environment improvements
 
 ## 2.0.0-alpha41
 
+**Bug fixes and improvements:**
+
 - Fix issue that caused failure in rendering the CreateEvent page
 
-## 2.0.0.-alpha40
+## 2.0.0-alpha40
+
+**Bug fixes and improvements:**
 
 - Fix issue that caused the backend to lock up on concurrent signups
 
 ## 2.0.0-alpha39
 
-- **Feature:** Admins can now create and edit signups via the Signups tab
-- **Feature:** Admins can now view signups grouped by quota
-- Quota information is now consistently hidden when signups are disabled for an event
+**Features:**
+
+- Admins can now create and edit signups via the Signups tab
+- Admins can now view signups grouped by quota
 - Signup creation is now audit logged to mitigate spamming
+
+**Bug fixes and improvements:**
+
+- Quota information is now consistently hidden when signups are disabled for an event
 - Minor layout and styling improvements to frontend
 
 ## 2.0.0-alpha38
 
+**Bug fixes and improvements:**
+
 - Fix answers sticking around when updating a signup
 
 ## 2.0.0-alpha37
 
-- **BREAKING:** Past events are now accessed using the `maxAge` parameter instead of `since`
+**Breaking changes:**
+
+- **API:** Past events are now accessed using the `maxAge` parameter instead of `since`
+
+**Features:**
+
 - The cutoff for old event viewing by regular users is now configurable via `HIDE_EVENT_AFTER_DAYS`
-- Further bug fixes to past events
 - Add API for admins to create and edit signups
 
+**Bug fixes and improvements:**
+
+- Further bug fixes to past events
+
 ## 2.0.0-alpha36
 
+**Bug fixes and improvements:**
+
 - Bug fixes to past events
 
 ## 2.0.0-alpha35
 
+**Bug fixes and improvements:**
+
 - Bug fixes to past events
 
 ## 2.0.0-alpha34
 
-- **BREAKING:** Add logo to Header - make sure to change or disable it on your instance
-- **BREAKING:** Add dark mode variants of favicons - make sure to update yours
+**Breaking changes:**
+
+- **Customization:** Add logo to Header - make sure to change or disable it on your instance
+- **Customization:** Add dark mode variants of favicons - make sure to update yours
+
+**Features:**
+
 - The remaining time to confirm or edit a signup is now shown on the signup form
 - Signups can now be edited for `SIGNUP_CONFIRM_MINS` minutes after creation, even if created just before an event's
   signup closes, if configured with `SIGNUP_CONFIRM_AFTER_CLOSE` (recommended).
@@ -78,80 +148,118 @@
 
 ## 2.0.0-alpha33
 
+**Bug fixes and improvements:**
+
 - Fixed radio/checkbox field layout when answers are invalid
 
 ## 2.0.0-alpha32
 
+**Bug fixes and improvements:**
+
 - Editor fields no longer incorrectly cause errors when cleared
 - Underlines on links are now only used in select places when enabled
 
 ## 2.0.0-alpha31
 
-- **Feature:** The event editor now gives per-field validation feedback and limits e.g. field lengths
-- **Feature:** Events can now be previewed from the event editor
-- **Feature:** Past events are now shown in a separate list for admins
-- **Feature:** The event editor now allows setting a price for events (only a string, no special handling)
+**Features:**
+
+- The event editor now gives per-field validation feedback and limits e.g. field lengths
+- Events can now be previewed from the event editor
+- Past events are now shown in a separate list for admins
+- The event editor now allows setting a price for events (only a string, no special handling)
+- The signup closure date is now shown in various places after signup closes
+
+**Bug fixes and improvements:**
+
 - Links are now easier to see with dark theme colors
 - Signup start/end time and signup publicity are now part of "basic details" in the event editor
-- The signup closure date is now shown in various places after signup closes
 - Quota name is no longer shown in signup lists when there's only one quota
 - Quota size fields now have placeholders to indicate what empty means
 - TypeBox schemas now use Composite instead of Intersect for cleaner schemas
 
 ## 2.0.0-alpha30
 
-- **BREAKING:** Changed default brand colors in email templates
+**Breaking changes:**
+
+- **Customization:** Changed default brand colors in email templates
 
 ## 2.0.0-alpha29
 
-- **Feature:** Added user-friendly validation of signup fields
-- **Feature:** Admin tokens now renew automatically, significantly reducing expired session errors
+**Features:**
+
+- Added user-friendly validation of signup fields
+- Admin tokens now renew automatically, significantly reducing expired session errors
 
 ## 2.0.0-alpha28
 
-- **Feature:** Queue positions are now shown in signup confirmation emails
+**Features:**
+
+- Queue positions are now shown in signup confirmation emails
 
 ## 2.0.0-alpha27
 
+**Bug fixes and improvements:**
+
 - Fixed a bug in external integrations
 
 ## 2.0.0-alpha26
 
+**Bug fixes and improvements:**
+
 - Improved integration options for external sites
 - Removed Moment.js from the frontend
 - Formatted source code with Prettier
 
 ## 2.0.0-alpha25
 
+**Bug fixes and improvements:**
+
 - Fixed a bug where deleted events would still keep their slugs reserved
 
 ## 2.0.0-alpha24
 
+**Bug fixes and improvements:**
+
 - Fixed a bug that broke events when questions were created with options
 
 ## 2.0.0-alpha23
 
+**Bug fixes and improvements:**
+
 - Fixed open quota size field
 
 ## 2.0.0-alpha22
 
+**Bug fixes and improvements:**
+
 - Fixed a CI bug
 
 ## 2.0.0-alpha21
 
+**Bug fixes and improvements:**
+
 - Fixed unlimited size quotas not working
 
 ## 2.0.0-alpha20
 
+**Bug fixes and improvements:**
+
 - Fixed a CI bug
 
 ## 2.0.0-alpha19
 
+**Bug fixes and improvements:**
+
 - Fixed a bug where signups couldn't be saved without an email field
 
 ## 2.0.0-alpha18
 
-- **BREAKING:** Changed default brand colors in frontend & components
+**Breaking changes:**
+
+- **Customization:** Changed default brand colors in frontend & components
+
+**Bug fixes and improvements:**
+
 - Significant performance optimizations
 - Multiple bug fixes
 - Dependency upgrades, code quality and development improvements

README.md

@@ -8,11 +8,8 @@ Ilmomasiina is easy to [install](docs/installation.md) in various environments a
 is freely available for all organizations to use.
 [Migrating](docs/migration.md) from the Athene-made version is also supported.
 
-The latest reviewed development version is in the `dev` branch. You may want to check
-current PRs for somewhat stable feature additions.
-
-**Please note that the code is currently in alpha phase and may still have bugs.**
-Major features for 2.0 are mostly done and we expect to reach a stable beta in spring 2024.
+Releases are made as Git tags and follow semantic versioning.
+The latest reviewed development version is in the `dev` branch.
 
 ## Installation
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilmomasiina",
-  "version": "2.0.0-alpha46",
+  "version": "2.0.0-rc.2",
   "private": true,
   "license": "MIT",
   "engines": {

packages/ilmomasiina-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tietokilta/ilmomasiina-backend",
-  "version": "2.0.0-alpha46",
+  "version": "2.0.0-rc.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -15,9 +15,10 @@
     "stop:prod": "pm2 stop 0",
     "monit:prod": "pm2 monit",
     "build": "tsc --build tsconfig.build.json",
-    "clean": "rimraf dist",
+    "clean": "rimraf dist coverage",
     "typecheck": "tsc --build tsconfig.build.json",
     "test": "vitest",
+    "test:coverage": "vitest run --coverage",
     "filldb": "ts-node -r tsconfig-paths/register --project tsconfig.json test/fillDatabase.ts"
   },
   "betterScripts": {
@@ -92,6 +93,7 @@
     "@types/node-cron": "^3.0.11",
     "@types/nodemailer": "^6.4.17",
     "@types/nodemailer-mailgun-transport": "^1.4.6",
+    "@vitest/coverage-v8": "^1.4.0",
     "rimraf": "^5.0.10",
     "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0",

packages/ilmomasiina-backend/src/app.ts

@@ -121,10 +121,9 @@ export default async function initApp(): Promise<FastifyInstance> {
     },
   });
 
-  server.register(setupRoutes, {
-    prefix: "/api",
-    adminSession: new AdminAuthSession(config.feathersAuthSecret),
-  });
+  server.decorate("adminSession", new AdminAuthSession(config.feathersAuthSecret));
+
+  server.register(setupRoutes, { prefix: "/api" });
 
   if (config.nodeEnv !== "test") {
     // Every minute, remove signups that haven't been confirmed fast enough
@@ -145,6 +144,7 @@ export default async function initApp(): Promise<FastifyInstance> {
 
 declare module "fastify" {
   interface FastifyInstance {
+    adminSession: AdminAuthSession;
     /** If set to false, GET /api/events raises an error.
      * This is "cached" in the application instance to avoid an unnecessary database query.
      */

packages/ilmomasiina-backend/src/auditlog/index.ts

@@ -34,7 +34,7 @@ function eventLogger(ipAddress: string, user?: () => string | null) {
         eventId: event?.id || signup?.quota?.event?.id || null,
         eventName: event?.title || signup?.quota?.event?.title || null,
         signupId: signup?.id || null,
-        signupName: signup ? `${signup.firstName} ${signup.lastName}` : null,
+        signupName: signup?.firstName != null ? `${signup.firstName} ${signup.lastName}` : null,
         extra: extra ? JSON.stringify(extra) : null,
         ipAddress,
       },

packages/ilmomasiina-backend/src/authentication/adminAuthSession.ts

@@ -3,6 +3,7 @@ import { FastifyRequest } from "fastify";
 
 import type { UserID, UserSchema } from "@tietokilta/ilmomasiina-models";
 import config from "../config";
+import { User } from "../models/user";
 import { BadSession } from "./errors";
 
 export interface AdminTokenData {
@@ -33,8 +34,8 @@ export default class AdminAuthSession {
    *
    * @param userData admin user information to be included into the token
    */
-  createSession(userData: AdminTokenData): string {
-    return this.sign(userData);
+  createSession(user: User): string {
+    return this.sign({ user: user.id, email: user.email });
   }
 
   /**