fix: Use sso local functions (#6055)

* fix: Use sso local functions

* fix: Delete session before emiting logout

Author: fzavalia

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/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()
 }