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

Jump to bottom

SWC-7081: pass the invitation token to One Sage #5525

Merged
merged 1 commit into from
Sep 20, 2024
Merged

SWC-7081: pass the invitation token to One Sage #5525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions src/main/java/org/sagebionetworks/web/client/place/users/RegisterAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
package org.sagebionetworks.web.client.place.users;

import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceTokenizer;
import com.google.gwt.place.shared.Prefix;
import org.sagebionetworks.web.client.place.ParameterizedPlace;

public class RegisterAccount extends Place {
public class RegisterAccount extends ParameterizedPlace {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to a parameterized place so we can pass both the email and the signed token to the register account page (which will be passed to One Sage)


private String token;
public static final String EMAIL_QUERY_PARAM = "email";
public static final String MEMBERSHIP_INVTN_QUERY_PARAM =
"membershipInvtnSignedToken";

public RegisterAccount(String token) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that there are cases in the codebase that point to RegisterAccount with a default token ("0"). I tested that the presenter just redirects to the OneSage registration page without any additional query params (besides the appId used to brand the One Sage site)

this.token = token;
}

public String toToken() {
return token;
super(token);
}

@Prefix("RegisterAccount")
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/org/sagebionetworks/web/client/presenter/EmailInvitationPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.sagebionetworks.web.client.jsinterop.ToastMessageOptions;
import org.sagebionetworks.web.client.place.EmailInvitation;
import org.sagebionetworks.web.client.place.LoginPlace;
import org.sagebionetworks.web.client.place.ParameterizedToken;
import org.sagebionetworks.web.client.place.Profile;
import org.sagebionetworks.web.client.place.Synapse.ProfileArea;
import org.sagebionetworks.web.client.place.users.RegisterAccount;
Expand Down Expand Up @@ -285,6 +286,12 @@ public void onLoginClick() {

@Override
public void onRegisterClick() {
placeChanger.goTo(new RegisterAccount(email));
RegisterAccount place = new RegisterAccount("");
place.putParam(
RegisterAccount.MEMBERSHIP_INVTN_QUERY_PARAM,
encodedMISignedToken
);
place.putParam(RegisterAccount.EMAIL_QUERY_PARAM, email);
placeChanger.goTo(place);
}
}
31 changes: 15 additions & 16 deletions src/main/java/org/sagebionetworks/web/client/presenter/users/RegisterAccountPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,21 @@ public void start(AcceptsOneWidget panel, EventBus eventBus) {}

@Override
public void setPlace(RegisterAccount place) {
String token = place.toToken();
if (token != null && token.contains("@")) {
// is likely an email address
Window.Location.replace(
WebConstants.ONESAGE_PRODUCTION_URL +
"/register1?email=" +
token +
"&" +
WebConstants.ONESAGE_SYNAPSE_APPID_QUERY_PARAM
);
} else {
Window.Location.replace(
WebConstants.ONESAGE_PRODUCTION_URL +
"/register1?" +
WebConstants.ONESAGE_SYNAPSE_APPID_QUERY_PARAM
);
String emailInvitationToken = place.getParam(
RegisterAccount.MEMBERSHIP_INVTN_QUERY_PARAM
);
String email = place.getParam(RegisterAccount.EMAIL_QUERY_PARAM);
StringBuilder targetUrl = new StringBuilder();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build up the target URL based on what parameters we have

targetUrl.append(WebConstants.ONESAGE_PRODUCTION_URL);
targetUrl.append("/register1?");
targetUrl.append(WebConstants.ONESAGE_SYNAPSE_APPID_QUERY_PARAM);

if (emailInvitationToken != null) {
targetUrl.append("&signedToken=" + emailInvitationToken);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is where the magic happens. One Sage already has logic to read a signed token from the query parameters and store it in Local Storage. Then on the Account Created page, it already has logic to read this token in, check if it's of this type, and even automatically joins the target team (as well as changing the link to say something like "Take me to the Team"!). This workflow functions perfectly (I just tested it), once we send over this signed token!

}
if (email != null) {
targetUrl.append("&email=" + email);
}
Window.Location.replace(targetUrl.toString());
}
}
9 changes: 8 additions & 1 deletion src/test/java/org/sagebionetworks/web/unitclient/presenter/EmailInvitationPresenterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,14 @@ public void testNotLoggedIn() {
RegisterAccount.class
);
verify(mockPlaceChanger).goTo(captor.capture());
assertEquals("[email protected]", captor.getValue().toToken());
assertEquals(
"[email protected]",
captor.getValue().getParam(RegisterAccount.EMAIL_QUERY_PARAM)
);
assertEquals(
encodedMISignedToken,
captor.getValue().getParam(RegisterAccount.MEMBERSHIP_INVTN_QUERY_PARAM)
);
}

@Test
Expand Down