Merge pull request #6089 from decentraland/release/release-20240205

Release 20240212

Author: Ludmilafantaniella

browser-interface/packages/config/index.ts

@@ -82,20 +82,6 @@ export const QS_MAX_VISIBLE_PEERS =
 export const BUILDER_SERVER_URL =
   ensureSingleString(qs.get('BUILDER_SERVER_URL')) ?? 'https://builder-api.decentraland.org/v1'
 
-const SSO_URL = ensureQueryStringUrl(qs.get('SSO_URL')) ?? 'https://id.decentraland.org'
-export function getSSOUrl() {
-  const sso = new URL(SSO_URL)
-  const ssoHost = sso.hostname.split('.').reverse()
-  const currentHost = location.hostname.split('.').reverse()
-
-  // ensures the same top level domain for the SSO
-  if (ssoHost[0] === currentHost[0] && ssoHost[1] === currentHost[1]) {
-    return SSO_URL
-  }
-
-  return null
-}
-
 /**
  * Get the root URL and ensure not to end with slash
  * @returns Root URL with pathname where the index.html is served.

browser-interface/packages/entryPoints/index.ts

@@ -1,13 +1,11 @@
-import { ETHEREUM_NETWORK, HAS_INITIAL_POSITION_MARK, getSSOUrl } from 'config/index'
+import { ETHEREUM_NETWORK, HAS_INITIAL_POSITION_MARK } from 'config/index'
 import { WebSocketProvider } from 'eth-connect'
 import { IDecentralandKernel, IEthereumProvider, KernelOptions, KernelResult, LoginState } from '@dcl/kernel-interface'
-import * as SingleSignOn from '@dcl/single-sign-on-client'
 import { getFromPersistentStorage, setPersistentStorage } from 'lib/browser/persistentStorage'
 import { gridToWorld } from 'lib/decentraland/parcels/gridToWorld'
 import { parseParcelPosition } from 'lib/decentraland/parcels/parseParcelPosition'
 import { resolveBaseUrl } from 'lib/decentraland/url/resolveBaseUrl'
 import { storeCondition } from 'lib/redux/storeCondition'
-import { defaultLogger } from 'lib/logger'
 import { initShared } from 'shared'
 import { sendHomeScene } from 'shared/atlas/actions'
 import { homePointKey } from 'shared/atlas/utils'
@@ -33,15 +31,6 @@ import { isWebGLCompatible } from './validations'
 declare const globalThis: { DecentralandKernel: IDecentralandKernel }
 globalThis.DecentralandKernel = {
   async initKernel(options: KernelOptions): Promise<KernelResult> {
-    try {
-      let sso = getSSOUrl()
-      if (sso) {
-        SingleSignOn.init(sso)
-      }
-    } catch (err) {
-      defaultLogger.error('Error initializing SingleSignOn', err)
-    }
-
     await setupBaseUrl(options)
 
     ensureValidWebGLCanvasContainer(options)

browser-interface/packages/shared/catalogs/sagas.ts

@@ -262,8 +262,17 @@ function fetchOwnedEmotes(ethAddress: string, client: CatalystClient) {
   return client.fetchOwnedEmotes(ethAddress, true)
 }
 
+export function urnWithoutToken(urn: string): string {
+  const value = urn.split(':')
+  if (value.length === 7) {
+    return value.slice(0, 6).join(':')
+  }
+  return urn
+}
+
 async function fetchWearablesByFilters(filters: WearablesRequestFilters, client: CatalystClient) {
-  return client.fetchWearables(filters)
+  const wearableIds = filters.wearableIds?.map(urnWithoutToken)
+  return client.fetchWearables({ ...filters, wearableIds })
 }
 
 async function fetchEmotesByFilters(filters: EmotesRequestFilters, client: CatalystClient) {

browser-interface/packages/shared/portableExperiences/reducer.ts

@@ -9,6 +9,7 @@ import {
   REMOVE_SCENE_PX,
   SHUTDOWN_ALL_PORTABLE_EXPERIENCES
 } from './actions'
+import { REMOVE_DESIRED_PORTABLE_EXPERIENCE, RemoveDesiredPortableExperienceAction } from '../wearablesPortableExperience/actions'
 
 const INITIAL_STATE: PortableExperiencesState = {
   deniedPortableExperiencesFromRenderer: [],
@@ -19,7 +20,7 @@ const INITIAL_STATE: PortableExperiencesState = {
 
 export function portableExperienceReducer(
   state?: PortableExperiencesState,
-  action?: PortableExperienceActions
+  action?: PortableExperienceActions | RemoveDesiredPortableExperienceAction
 ): PortableExperiencesState {
   if (!state) {
     return INITIAL_STATE
@@ -30,6 +31,14 @@ export function portableExperienceReducer(
   }
 
   switch (action.type) {
+    case REMOVE_DESIRED_PORTABLE_EXPERIENCE: {
+      return {
+        ...state,
+        deniedPortableExperiencesFromRenderer: state.deniedPortableExperiencesFromRenderer.filter(
+          ($) => $ !== action.payload.id
+        )
+      }
+    }
     case SHUTDOWN_ALL_PORTABLE_EXPERIENCES: {
       return { ...state, globalPortalExperienceShutDown: true }
     }

browser-interface/packages/shared/session/index.ts

@@ -26,7 +26,7 @@ export const deleteSession = async (userId?: string) => {
   if (userId) {
     await removeFromPersistentStorage(sessionKey(userId))
 
-    await SingleSignOn.clearIdentity(userId)
+    SingleSignOn.localStorageClearIdentity(userId)
   }
 }
 
@@ -56,7 +56,7 @@ async function getSessionWithSSOIdentity(sessions: StoredSession[]) {
 
   const session = sessions[0]
 
-  const ssoIdentity = await SingleSignOn.getIdentity(session.identity.address)
+  const ssoIdentity = SingleSignOn.localStorageGetIdentity(session.identity.address)
 
   if (!ssoIdentity || isSessionExpired({ identity: ssoIdentity })) {
     return null

browser-interface/packages/shared/session/sagas.ts

@@ -319,12 +319,12 @@ async function createAuthIdentity(requestManager: RequestManager, isGuest: boole
 
   let auth: AuthIdentity
 
-  const ssoIdentity = await SingleSignOn.getIdentity(address)
+  const ssoIdentity = SingleSignOn.localStorageGetIdentity(address)
 
   if (!ssoIdentity || isSessionExpired({ identity: ssoIdentity })) {
     auth = await Authenticator.initializeAuthChain(address, ephemeral, ephemeralLifespanMinutes, signer)
 
-    await SingleSignOn.storeIdentity(address, auth)
+    SingleSignOn.localStorageStoreIdentity(address, auth)
   } else {
     auth = ssoIdentity
   }
@@ -337,14 +337,12 @@ function* logout() {
   const network: ETHEREUM_NETWORK = yield select(getSelectedNetwork)
   if (identity && identity.address && network) {
     yield call(() => localProfilesRepo.remove(identity.address, network))
+    yield call(deleteSession, identity.address)
     globalObservable.emit('logout', { address: identity.address, network })
   }
 
   yield put(setRoomConnection(undefined))
 
-  if (identity?.address) {
-    yield call(deleteSession, identity.address)
-  }
   window.location.reload()
 }
 

browser-interface/packages/shared/wearablesPortableExperience/sagas.ts

@@ -20,6 +20,7 @@ import {
 } from './actions'
 import { waitForRealm } from 'shared/realm/waitForRealmAdapter'
 import { KeyAndHash } from '../catalogs/types'
+import { urnWithoutToken } from '../catalogs/sagas'
 
 export function* wearablesPortableExperienceSaga(): any {
   yield takeLatest(PROFILE_SUCCESS, handleSelfProfileSuccess)
@@ -29,13 +30,12 @@ export function* wearablesPortableExperienceSaga(): any {
 
 function* handleSelfProfileSuccess(action: ProfileSuccessAction): any {
   const isMyProfile: boolean = yield select(isCurrentUserId, action.payload.profile.userId)
-
   // cancel the saga if we receive a profile from a different user
   if (!isMyProfile) {
     return
   }
 
-  const newProfileWearables = action.payload.profile.avatar?.wearables || []
+  const newProfileWearables = action.payload.profile.avatar?.wearables.map(urnWithoutToken) || []
   const currentDesiredPortableExperiences: Record<string, LoadableScene | null> = yield select(
     getDesiredWearablePortableExpriences
   )
@@ -69,9 +69,9 @@ function* handleProcessWearables(action: ProcessWearablesAction) {
   const currentDesiredPortableExperiences: Record<string, LoadableScene | null> = yield select(
     getDesiredWearablePortableExpriences
   )
-
-  if (payload.wearable.id in currentDesiredPortableExperiences) {
-    yield put(addDesiredPortableExperience(payload.wearable.id, payload.wearable))
+  const wearableId = urnWithoutToken(payload.wearable.id)
+  if (wearableId in currentDesiredPortableExperiences) {
+    yield put(addDesiredPortableExperience(wearableId, payload.wearable))
   }
 }
 
@@ -150,7 +150,7 @@ export async function wearableToSceneEntity(wearable: WearableV2, defaultBaseUrl
   const metadata: Scene = sceneJson ? await jsonFetch(baseUrl + sceneJson.hash) : defaultSceneJson()
 
   return {
-    id: wearable.id,
+    id: urnWithoutToken(wearable.id),
     baseUrl,
     parentCid: 'avatar',
     entity: {

browser-interface/packages/shared/world/runtime-7/engine.ts

@@ -78,7 +78,6 @@ export function createInternalEngine(id: string, parcels: string[], isGlobalScen
 
     if (entityId >= AVATAR_RESERVED_ENTITIES.to) {
       engine.removeEntity(entity)
-      console.error(`[BOEDO] Max amount of users reached`, entityId)
       return
     }
     PlayerIdentityData.create(entity, { address: userId, isGuest: profile.isGuest })
@@ -115,7 +114,6 @@ export function createInternalEngine(id: string, parcels: string[], isGlobalScen
     const entity = avatarMap.get(userId)
 
     if (!entity) {
-      console.error(`[BOEDO] user not found !`, { userId })
       return addUser(userId)
     }
 

unity-renderer/Assets/DCLPlugins/ExperiencesViewer/Scripts/ExperiencesViewerController.cs

@@ -117,7 +117,7 @@ private void DisableOrEnablePortableExperience(string pexId, bool isPlaying)
 
                 view.ShowEnabledToast(scene?.GetSceneName());
             }
-            else
+            else if (scene != null)
             {
                 portableExperiencesBridge.SetDisabledPortableExperiences(disabledPortableExperiences.GetKeys()
                                                                                                     .Concat(new[] { pexId })

unity-renderer/Assets/DCLServices/EmotesService/Domain/IEmotesService.cs

@@ -5,6 +5,6 @@ namespace DCL.Emotes
 {
     public interface IEmotesService : IService
     {
-        UniTask<IEmoteReference> RequestEmote(EmoteBodyId emoteBodyId, CancellationToken cancellationToken);
+        UniTask<IEmoteReference> RequestEmote(EmoteBodyId emoteBodyId, CancellationToken cancellationToken, string contentUrl = null);
     }
 }