Commit Graph

17 Commits

Author SHA1 Message Date
Linus Flood
93c481fea8 Merged in feat/loy-403-seamless (pull request #3164)
feat(LOY-403): removed seamless login/logout

* feat(LOY-403): removed seamless login/logout


Approved-by: Joakim Jäderberg
2025-11-17 09:58:15 +00:00
emma.zettervall
b72f4c71e3 Merged in feat/book-245-preferred-lang-redirect (pull request #2861)
Feat/book 245 preferred lang redirect

* added cookie to save preferredLang and middleware to route accordingly

* Cleaned up code, added noValidLang.ts middleware

* cleaned a little more

* Added headers in languageRedirect and set language cookie maxAge to 1 year


Approved-by: Linus Flood
2025-09-26 08:00:25 +00:00
Linus Flood
e2544f9f89 Merged in feat/sw-3192-no-user (pull request #2680)
feat(SW-3192): Checks if user exists, otherwise logout and show error

* feat(SW-3192): Checks if user exists, otherwise logout and show error
2025-08-22 09:47:54 +00:00
Joakim Jäderberg
daf765f3d5 Merged in feature/wrap-logging (pull request #2511)
Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood
2025-07-03 12:37:04 +00:00
Anton Gunnarsson
002d093af4 Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389)
feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package


Approved-by: Linus Flood
2025-06-26 07:53:01 +00:00
Anton Gunnarsson
846fd904a6 Merged in feat/sw-2859-set-up-shared-trpc-package (pull request #2319)
feat(SW-2859): Create trpc package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Clean up tests

* Create trpc package and move initialization

* Move errors and a few procedures

* Move telemetry to common package

* Move tokenManager to common package

* Add Sentry to procedures

* Clean up procedures

* Fix self-referencing imports

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* Fix lang imports


Approved-by: Linus Flood
2025-06-18 12:14:20 +00:00
Chuma Mcphoy (We Ahead)
2101b79db1 Merged in feat/LOY-230-Microsoft-Entra-ID-Auth (pull request #2113)
Feat(LOY-230): DTMC Routes with Entra ID Auth & Error Page Handling

* feat(LOY-230): Link Scandic Friends and Azure accounts

* fix(LOY-230): remove employee id param setting

* fix(LOY-230): return token in jwt callback for auth.dtmc.ts


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-06-18 10:22:04 +00:00
Linus Flood
573d9a6c0f Merged in fix/date-query-params (pull request #2213)
fix: date query params lowercase redirect middleware

* fix: date query params lowercase redirect middleware


Approved-by: Joakim Jäderberg
2025-05-26 08:11:10 +00:00
Erik Tiekstra
2b302d1a5f feat(SW-2885): Added support for 'bookingcode' as bookingCode param
Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-05-23 07:12:29 +00:00
Linus Flood
0845b979cd Merged in feat/sw-2740-invalidUrl-middleware (pull request #2087)
feat/sw-2740 return 404 if url contains bad chars

* feat/sw-2740 return 404 if url contains bad chars


Approved-by: Michael Zetterberg
Approved-by: Joakim Jäderberg
2025-05-14 08:17:03 +00:00
Arvid Norlin
c22cd62d21 feat: add trailingSlash middleware 2025-05-13 11:34:26 +00:00
Hrishikesh Vaipurkar
53b630b6d8 Merged in feat/SW-2308-family-friends-booking-rest (pull request #1916)
feat: SW-2308 FnF code restriction added

* feat: SW-2308 FnF code restriction added

* feat: 2308 Optimized code


Approved-by: Niclas Edenvin
2025-05-02 14:22:05 +00:00
Arvid Norlin
6cf01e8990 Merged in fix/redirect-content-types (pull request #1855)
Fix/redirect content types

* feat(SW-2429): Removed [contentType]>[uid] and use app router based structure for content types

* feat(SW-2429): Added breadcrumbs to follow contenttype folder structure

* fix(SW-2112): reenabling redirect middleware since working with new content-type routing strategy


Approved-by: Michael Zetterberg
2025-04-28 07:02:15 +00:00
Linus Flood
2648b17744 Merged in fix/redirect-service-revert (pull request #1818)
hotfix: uncomment new stuff that broke destination page

* hotfix: uncomment new stuff that broke destination page


Approved-by: Michael Zetterberg
Approved-by: Joakim Jäderberg
2025-04-16 10:09:54 +00:00
Arvid Norlin
33065be565 Merged in feat/SW-2111 (pull request #1761)
feat(SW-2111): add initial scandic-redirect

* feat(SW-2111): add initial scandic-redirect

* feat(SW-2112): add scandic-redirect call to middleware

* chore: add redirect jsons per lang

* fix: handle incorrect contentTypes

* fix: handle lang

* refactor: add json streaming

* refactor: wrap redirect call in cacheOrGet

* refactor: review


Approved-by: Michael Zetterberg
2025-04-16 06:29:32 +00:00
Linus Flood
1689039c39 Merged in fix/sitemap-route (pull request #1801)
Fix: sitemap - now the route works

* Fix: sitemap - now the route works


Approved-by: Joakim Jäderberg
2025-04-15 07:53:11 +00:00
Anton Gunnarsson
80100e7631 Merged in monorepo-step-1 (pull request #1080)
Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00