Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: setting correct base url from about lambdas #6032

Merged
merged 9 commits into from
Dec 29, 2023
Merged

test: setting correct base url from about lambdas #6032

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7af6018
Setting baseURL from about/lambdas
dalkia Dec 28, 2023
8baef2b
Update browser-interface/packages/shared/apis/host/Runtime.ts
dalkia Dec 29, 2023
43c825b
Update browser-interface/packages/shared/apis/host/EnvironmentAPI.ts
dalkia Dec 29, 2023
28cbd3e
Update EnvironmentAPI.ts
dalkia Dec 29, 2023
4824833
Update EnvironmentAPI.ts
dalkia Dec 29, 2023
cb8f215
Update Runtime.ts
dalkia Dec 29, 2023
6cc245b
Update Runtime.ts
dalkia Dec 29, 2023
d177aab
Update Runtime.ts
dalkia Dec 29, 2023
24b9045
Merge branch 'dev' into test/setting-correct-base-url
dalkia Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion browser-interface/packages/shared/apis/host/EnvironmentAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ export function getDecentralandTime() {

export function toEnvironmentRealmType(realm: IRealmAdapter, island: string | undefined): EnvironmentRealm {
const serverName = realmToConnectionString(realm)
const hostname = new URL(realm.baseUrl).hostname
let hostname = new URL(realm.baseUrl).hostname

if(realm.about.configurations?.realmName == 'main' && realm.about.lambdas?.publicUrl !== undefined){
dalkia marked this conversation as resolved.
Show resolved Hide resolved
hostname = new URL(realm.about.lambdas?.publicUrl).hostname
}
return {
protocol: realm.about.comms?.protocol || 'v3',
// domain explicitly expects the URL with the protocol
Expand Down
6 changes: 5 additions & 1 deletion browser-interface/packages/shared/apis/host/Runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ export function registerRuntimeServiceServerImplementation(port: RpcServerPort<P
if (!realmAdapter) {
return {}
}
const baseUrl = urlWithProtocol(new URL(realmAdapter.baseUrl).hostname)
let baseUrl = urlWithProtocol(new URL(realmAdapter.baseUrl).hostname)

if(realmAdapter.about.configurations?.realmName == 'main' && realmAdapter.about.lambdas?.publicUrl !== undefined){
dalkia marked this conversation as resolved.
Show resolved Hide resolved
baseUrl = new URL(realmAdapter.about.lambdas?.publicUrl).hostname
}

return {
realmInfo: {
baseUrl,
Expand Down