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

Merge release-532 into develop #5643

Merged
merged 3 commits into from
Feb 19, 2025
Merged

Merge release-532 into develop #5643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
740da4f
Change endpoint for onesage (#5635)
xschildw Feb 19, 2025
e9a6f7c
Missed refs to portal hostname
xschildw Feb 19, 2025
01fbe78
Merge pull request #5640 from xschildw/r532-it-3849-2
nickgros Feb 19, 2025
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: 3 additions & 3 deletions src/main/java/org/sagebionetworks/web/client/OneSageUtilsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ private String getHostForOneSage() {
switch (gwtWrapper.getHostName().toLowerCase()) {
case "staging.synapse.org":
return "https://staging.accounts.synapse.org";
case "portal-dev.dev.sagebase.org":
return "https://accounts-dev.dev.sagebase.org";
case "dev.synapse.org":
return "https://dev.accounts.synapse.org";
case "localhost":
case "127.0.0.1":
return "http://" + Window.Location.getHostName() + ":3000";
Expand All @@ -34,7 +34,7 @@ public String getAppIdForOneSage() {
switch (gwtWrapper.getHostName().toLowerCase()) {
case "staging.synapse.org":
return "staging.synapse.org";
case "portal-dev.dev.sagebase.org":
case "dev.synapse.org":
return "dev.synapse.org";
case "localhost":
case "127.0.0.1":
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/server/StackEndpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class StackEndpoints {

public static final String STAGING_SYNAPSE_ORG = "staging.synapse.org";
public static final String TST_SYNAPSE_ORG = "tst.synapse.org";
public static final String PORTAL_DEV_HOST = "portal-dev.dev.sagebase.org";
public static final String PORTAL_DEV_HOST = "dev.synapse.org";
private static Logger logger = Logger.getLogger(
StackEndpoints.class.getName()
);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/sagebionetworks/web/unitserver/StackEndpointsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public void testEndpointConstructionTst() {

@Test
public void testEndpointConstructionDev() {
String requestHostName = "portal-dev.dev.sagebase.org";
String requestHostName = "dev.synapse.org";
String expected = "https://repo-dev.dev.sagebase.org";

assertEquals(
Expand Down
Loading