Merged in feat/basic-user (pull request #3135)

feat(SW-3610): Get basic user from api

* feat(SW-3610): Get basic user from api

* .

* Optional profileid


Approved-by: Anton Gunnarsson

packages/trpc/lib/routers/user/query/index.ts

@@ -83,7 +83,7 @@ export const userQueryRouter = router({
     if (!isValidSession(ctx.session)) {
       return null
     }
-    const user = await ctx.getScandicUser()
+    const user = await ctx.getScandicBasicUser()
 
     if (!user) {
       return null

packages/trpc/lib/routers/user/query/userTrackingInfo.ts

@@ -3,8 +3,7 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
 import { safeProtectedProcedure } from "../../../procedures"
 import { isValidSession } from "../../../utils/session"
 import { getEuroBonusProfileData } from "../../partners/sas/getEuroBonusProfile"
-import { getFriendsMembership } from "../helpers"
-import { getVerifiedUser } from "../utils/getVerifiedUser"
+import { getBasicUser } from "../utils/getBasicUser"
 
 import type { LoginType } from "@scandic-hotels/common/constants/loginType"
 import type { Session } from "next-auth"
@@ -48,9 +47,9 @@ async function getScandicFriendsUserTrackingData(session: Session | null) {
   }
 
   try {
-    const verifiedUserData = await getVerifiedUser({ token: session.token })
+    const verifiedUserData = await getBasicUser({ token: session.token })
 
-    if (!verifiedUserData || !verifiedUserData.loyalty) {
+    if (!verifiedUserData) {
       metricsUserTrackingInfo.success({
         reason: "invalid user data",
         data: notLoggedInUserTrackingData,
@@ -58,14 +57,12 @@ async function getScandicFriendsUserTrackingData(session: Session | null) {
       return notLoggedInUserTrackingData
     }
 
-    const membership = getFriendsMembership(verifiedUserData.loyalty)
-
     const loggedInUserTrackingData: TrackingUserData = {
       loginStatus: "logged in",
       loginType: session.token.loginType as LoginType,
       memberId: verifiedUserData.profileId,
-      membershipNumber: membership?.membershipNumber,
-      memberLevel: membership?.membershipLevel,
+      membershipNumber: verifiedUserData.membershipNumber,
+      memberLevel: verifiedUserData?.tier,
       loginAction: "login success",
       memberType,
     }
@@ -126,19 +123,17 @@ async function getSasEurobonusUserTrackingData(
 async function getScandicFriendsDataHelper(scandicUserToken: string | null) {
   if (!scandicUserToken) return null
 
-  const verifiedUserData = await getVerifiedUser({
+  const verifiedUserData = await getBasicUser({
     token: { access_token: scandicUserToken },
   })
 
-  if (!verifiedUserData || !verifiedUserData.loyalty) {
+  if (!verifiedUserData) {
     return null
   }
 
-  const membership = getFriendsMembership(verifiedUserData.loyalty)
-
   return {
     memberId: verifiedUserData.profileId,
-    membershipNumber: membership?.membershipNumber,
-    memberLevel: membership?.membershipLevel,
+    membershipNumber: verifiedUserData.membershipNumber,
+    memberLevel: verifiedUserData.tier,
   }
 }