synapse-react-client 3.1.24 → 3.1.26

package/dist/utils/SynapseClient.js

@@ -1,32 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeUserFavorite = exports.addUserFavorite = exports.getUserFavorites = exports.getEntityWiki = exports.getEntityBundleV2 = exports.deleteEntity = exports.updateEntity = exports.getEntityHeader = exports.getEntityHeaders = exports.getEntityHeadersByIds = exports.getEntity = exports.getBulkFiles = exports.getFiles = exports.lookupChildEntity = exports.getEntityChildren = exports.getUserProfiles = exports.getEvaluations = exports.getGroupHeadersBatch = exports.postUserGroupHeadersWithAlias = exports.getUserGroupHeaders = exports.updateMyUserProfile = exports.getMyUserBundle = exports.getUserBundle = exports.getUserProfileById = exports.getUserProfile = exports.createProject = exports.createEntity = exports.oAuthSessionRequest = exports.oAuthUrlRequest = exports.login = exports.getFullQueryTableResults = exports.getQueryTableResults = exports.getQueryTableAsyncJobResults = exports.getAsyncResultBodyFromJobId = exports.getAsyncResultFromJobId = exports.getFileHandleByIdURL = exports.getActualFileHandleByIdURL = exports.getFileHandleById = exports.getDownloadFromTableRequest = exports.getVersion = exports.doPut = exports.doDelete = exports.doGet = exports.doPost = exports.allowNotFoundError = exports.delay = exports.getRootURL = exports.SYNAPSE_STORAGE_LOCATION_ID = exports.ACCESS_TOKEN_COOKIE_KEY = exports.IS_OUTSIDE_SYNAPSE_ORG = void 0;
-exports.deleteOAuthClient = exports.createOAuthClient = exports.getOAuth2 = exports.getOAuth2Client = exports.hasUserAuthorizedOAuthClient = exports.getOAuth2RequestDescription = exports.getEvaluationSubmissions = exports.deleteEvaluationRound = exports.updateEvaluationRound = exports.createEvaluationRound = exports.getEvaluationRoundsList = exports.getEvaluationRound = exports.deleteEvaluation = exports.createEvaluation = exports.updateEvaluation = exports.getEvaluation = exports.getEvaluationPermissions = exports.submitToEvaluation = exports.createACL = exports.addFilesToDownloadListV2 = exports.createManifestFromDownloadListV2 = exports.createPackageFromDownloadListV2 = exports.addFileToDownloadListV2 = exports.getFileResult = exports.getFileHandleContent = exports.getFileHandleContentFromID = exports.startMultipartUpload = exports.checkUploadComplete = exports.uploadFile = exports.signOut = exports.detectSSOCode = exports.getPrincipalAliasRequest = exports.getUseUtcTimeFromCookie = exports.getAccessTokenFromCookie = exports.setAccessTokenCookie = exports.isInSynapseExperimentalMode = exports.getPresignedUrlForWikiAttachment = exports.getWikiAttachmentsFromEvaluation = exports.getWikiAttachmentsFromEntity = exports.getWikiPageKeyForAccessRequirement = exports.getWikiPageKeyForEntity = exports.getIsUserMemberOfTeam = exports.bindInvitationToAuthenticatedUser = exports.getInviteeVerificationSignedToken = exports.getMembershipInvitation = exports.addTeamMemberAsAuthenticatedUserOrAdmin = exports.addTeamMemberWithToken = exports.getTeamMembers = exports.getUserTeamList = exports.getUserChallenges = void 0;
-exports.updateDataAccessRequest = exports.getDataAccessRequestForUpdate = exports.getResearchProject = exports.updateResearchProject = exports.removeItemFromDownloadListV2 = exports.getDownloadListActionsRequired = exports.getDownloadListStatistics = exports.getAvailableFilesToDownload = exports.clearDownloadListV2 = exports.searchEntities = exports.getEntityVersions = exports.getEntityPath = exports.getUserProjects = exports.getMyProjects = exports.deletePersonalAccessToken = exports.getPersonalAccessTokenRecords = exports.createPersonalAccessToken = exports.getTransformSqlWithFacetsRequest = exports.updateTable = exports.deleteDownloadList = exports.deleteDownloadListFiles = exports.getAllOfPaginatedService = exports.getDownloadOrder = exports.getDownloadList = exports.postAccessApproval = exports.getAccessApproval = exports.createLockAccessRequirement = exports.getAllAccessRequirements = exports.getAccessRequirementStatus = exports.searchAccessRequirements = exports.getAccessRequirementAcl = exports.getAccessRequirementById = exports.getAccessRequirement = exports.getRestrictionInformation = exports.getProjectStatistics = exports.rejectFormData = exports.acceptFormData = exports.listFormDataAsFormAdmin = exports.listFormData = exports.submitFormData = exports.deleteFormData = exports.updateFormData = exports.createFormData = exports.updateFormACL = exports.getFormACL = exports.createFormGroup = exports.consentToOAuth2Request = exports.getAuthenticatedOn = exports.createOAuthClientSecret = exports.updateOAuthClient = void 0;
-exports.getProfilePicPreviewPresignedUrl = exports.getActivityForEntity = exports.getApprovedSubmissionInfo = exports.searchAccessSubmission = exports.searchAccessApprovals = exports.getForumThread = exports.forumSearch = exports.getModerators = exports.restoreThread = exports.deleteThread = exports.putThreadMessage = exports.putThreadTitle = exports.postThread = exports.getThreadMessageUrl = exports.getThread = exports.unPinThread = exports.pinThread = exports.getReplyMessageUrl = exports.getReplies = exports.deleteReply = exports.putReply = exports.postReply = exports.getReply = exports.updateNotificationEmail = exports.deleteEmail = exports.addEmailAddressStep2 = exports.addEmailAddressStep1 = exports.resetPassword = exports.changePasswordWithToken = exports.changePasswordWithCurrentPassword = exports.createProfileVerificationSubmission = exports.signSynapseTermsOfUse = exports.unbindOAuthProviderToAccount = exports.bindOAuthProviderToAccount = exports.oAuthRegisterAccountStep2 = exports.registerAccountStep2 = exports.registerAccountStep1 = exports.isAliasAvailable = exports.getNotificationEmail = exports.updateEntityJson = exports.getEntityJson = exports.hasAccessToEntity = exports.getValidationSchema = exports.getSchema = exports.getSchemaValidationResults = exports.getSchemaBinding = exports.updateSubmissionStatus = exports.getSubmissionById = exports.cancelDataAccessRequest = exports.submitDataAccessRequest = void 0;
-exports.getDOIAssociation = exports.getDefaultUploadDestination = exports.postSubscriptionList = exports.deleteSubscription = exports.postSubscription = exports.getSubscribers = exports.getSubscription = exports.getSynapseTeamGeoData = exports.getAllSynapseUserGeoData = exports.getGoogleMapsApiKey = exports.postCertifiedUserTestResponse = exports.getCertifyQuiz = exports.purgeFromTrashCan = exports.restoreFromTrashCan = exports.getItemsInTrashCan = void 0;
+exports.getUserFavorites = exports.getEntityWiki = exports.getEntityBundleV2 = exports.deleteEntity = exports.updateEntity = exports.getEntityHeader = exports.getEntityHeaders = exports.getEntityHeadersByIds = exports.getEntity = exports.getBulkFiles = exports.getFiles = exports.lookupChildEntity = exports.getEntityChildren = exports.getUserProfiles = exports.getEvaluations = exports.getGroupHeadersBatch = exports.postUserGroupHeadersWithAlias = exports.getUserGroupHeaders = exports.updateMyUserProfile = exports.getMyUserBundle = exports.getUserBundle = exports.getUserProfileById = exports.getUserProfile = exports.createProject = exports.createEntity = exports.oAuthSessionRequest = exports.oAuthUrlRequest = exports.loginWith2fa = exports.login = exports.getFullQueryTableResults = exports.getQueryTableResults = exports.getQueryTableAsyncJobResults = exports.getAsyncResultBodyFromJobId = exports.getAsyncResultFromJobId = exports.getFileHandleByIdURL = exports.getActualFileHandleByIdURL = exports.getFileHandleById = exports.getDownloadFromTableRequest = exports.getVersion = exports.doPut = exports.doDelete = exports.doGet = exports.doPost = exports.returnIfTwoFactorAuthError = exports.allowNotFoundError = exports.delay = exports.getRootURL = exports.SYNAPSE_STORAGE_LOCATION_ID = exports.ACCESS_TOKEN_COOKIE_KEY = exports.IS_OUTSIDE_SYNAPSE_ORG = void 0;
+exports.createOAuthClient = exports.getOAuth2 = exports.getOAuth2Client = exports.hasUserAuthorizedOAuthClient = exports.getOAuth2RequestDescription = exports.getEvaluationSubmissions = exports.deleteEvaluationRound = exports.updateEvaluationRound = exports.createEvaluationRound = exports.getEvaluationRoundsList = exports.getEvaluationRound = exports.deleteEvaluation = exports.createEvaluation = exports.updateEvaluation = exports.getEvaluation = exports.getEvaluationPermissions = exports.submitToEvaluation = exports.createACL = exports.addFilesToDownloadListV2 = exports.createManifestFromDownloadListV2 = exports.createPackageFromDownloadListV2 = exports.addFileToDownloadListV2 = exports.getFileResult = exports.getFileHandleContent = exports.getFileHandleContentFromID = exports.startMultipartUpload = exports.checkUploadComplete = exports.uploadFile = exports.signOut = exports.getPrincipalAliasRequest = exports.getUseUtcTimeFromCookie = exports.getAccessTokenFromCookie = exports.setAccessTokenCookie = exports.isInSynapseExperimentalMode = exports.getPresignedUrlForWikiAttachment = exports.getWikiAttachmentsFromEvaluation = exports.getWikiAttachmentsFromEntity = exports.getWikiPageKeyForAccessRequirement = exports.getWikiPageKeyForEntity = exports.getIsUserMemberOfTeam = exports.bindInvitationToAuthenticatedUser = exports.getInviteeVerificationSignedToken = exports.getMembershipInvitation = exports.addTeamMemberAsAuthenticatedUserOrAdmin = exports.addTeamMemberWithToken = exports.getTeamMembers = exports.getUserTeamList = exports.getUserChallenges = exports.removeUserFavorite = exports.addUserFavorite = void 0;
+exports.getDataAccessRequestForUpdate = exports.getResearchProject = exports.updateResearchProject = exports.removeItemFromDownloadListV2 = exports.getDownloadListActionsRequired = exports.getDownloadListStatistics = exports.getAvailableFilesToDownload = exports.clearDownloadListV2 = exports.searchEntities = exports.getEntityVersions = exports.getEntityPath = exports.getUserProjects = exports.getMyProjects = exports.deletePersonalAccessToken = exports.getPersonalAccessTokenRecords = exports.createPersonalAccessToken = exports.getTransformSqlWithFacetsRequest = exports.updateTable = exports.deleteDownloadList = exports.deleteDownloadListFiles = exports.getAllOfPaginatedService = exports.getDownloadOrder = exports.getDownloadList = exports.postAccessApproval = exports.getAccessApproval = exports.createLockAccessRequirement = exports.getAllAccessRequirements = exports.getAccessRequirementStatus = exports.searchAccessRequirements = exports.getAccessRequirementAcl = exports.getAccessRequirementById = exports.getAccessRequirement = exports.getRestrictionInformation = exports.getProjectStatistics = exports.rejectFormData = exports.acceptFormData = exports.listFormDataAsFormAdmin = exports.listFormData = exports.submitFormData = exports.deleteFormData = exports.updateFormData = exports.createFormData = exports.updateFormACL = exports.getFormACL = exports.createFormGroup = exports.consentToOAuth2Request = exports.getAuthenticatedOn = exports.createOAuthClientSecret = exports.updateOAuthClient = exports.deleteOAuthClient = void 0;
+exports.getActivityForEntity = exports.getApprovedSubmissionInfo = exports.searchAccessSubmission = exports.searchAccessApprovals = exports.getForumThread = exports.forumSearch = exports.getModerators = exports.restoreThread = exports.deleteThread = exports.putThreadMessage = exports.putThreadTitle = exports.postThread = exports.getThreadMessageUrl = exports.getThread = exports.unPinThread = exports.pinThread = exports.getReplyMessageUrl = exports.getReplies = exports.deleteReply = exports.putReply = exports.postReply = exports.getReply = exports.updateNotificationEmail = exports.deleteEmail = exports.addEmailAddressStep2 = exports.addEmailAddressStep1 = exports.resetPassword = exports.changePasswordWithToken = exports.changePasswordWithCurrentPassword = exports.createProfileVerificationSubmission = exports.signSynapseTermsOfUse = exports.unbindOAuthProviderToAccount = exports.bindOAuthProviderToAccount = exports.oAuthRegisterAccountStep2 = exports.registerAccountStep2 = exports.registerAccountStep1 = exports.isAliasAvailable = exports.getNotificationEmail = exports.updateEntityJson = exports.getEntityJson = exports.hasAccessToEntity = exports.getValidationSchema = exports.getSchema = exports.getSchemaValidationResults = exports.getSchemaBinding = exports.updateSubmissionStatus = exports.getSubmissionById = exports.cancelDataAccessRequest = exports.submitDataAccessRequest = exports.updateDataAccessRequest = void 0;
+exports.getDOIAssociation = exports.getDefaultUploadDestination = exports.postSubscriptionList = exports.deleteSubscription = exports.postSubscription = exports.getSubscribers = exports.getSubscription = exports.getSynapseTeamGeoData = exports.getAllSynapseUserGeoData = exports.getGoogleMapsApiKey = exports.postCertifiedUserTestResponse = exports.getCertifyQuiz = exports.purgeFromTrashCan = exports.restoreFromTrashCan = exports.getItemsInTrashCan = exports.getProfilePicPreviewPresignedUrl = void 0;
 var tslib_1 = require("tslib");
 var spark_md5_1 = tslib_1.__importDefault(require("spark-md5"));
 var universal_cookie_1 = tslib_1.__importDefault(require("universal-cookie"));
 var _1 = require(".");
-var Login_1 = require("../containers/auth/Login");
 var APIConstants_1 = require("./APIConstants");
 var dispatchDownloadListChangeEvent_1 = require("./functions/dispatchDownloadListChangeEvent");
 var getEndpoint_1 = require("./functions/getEndpoint");
 var ObjectUtils_1 = require("./functions/ObjectUtils");
 var SynapseConstants_1 = require("./SynapseConstants");
 var synapseTypes_1 = require("./synapseTypes/");
+var synapseTypes_2 = require("./synapseTypes");
 var DiscussionBundle_1 = require("./synapseTypes/DiscussionBundle");
-var UserGroupHeader_1 = require("./synapseTypes/UserGroupHeader");
 var SynapseClientError_1 = require("./SynapseClientError");
 var calculateFriendlyFileSize_1 = require("./functions/calculateFriendlyFileSize");
+var ErrorResponse_1 = require("./synapseTypes/ErrorResponse");
 var cookies = new universal_cookie_1.default();
 // TODO: Create JSON response types for all return types
-exports.IS_OUTSIDE_SYNAPSE_ORG = window.location.hostname
+exports.IS_OUTSIDE_SYNAPSE_ORG = !window.location.hostname
     .toLowerCase()
-    .includes('.synapse.org')
-    ? false
-    : true;
+    .includes('.synapse.org');
 exports.ACCESS_TOKEN_COOKIE_KEY = 'org.sagebionetworks.security.user.login.token';
 // Max size file that we will allow the caller to read into memory (5MB)
 var MAX_JS_FILE_DOWNLOAD_SIZE = 5242880;
@@ -84,6 +82,46 @@ function allowNotFoundError(fn) {
     });
 }
 exports.allowNotFoundError = allowNotFoundError;
+/**
+ * If the asynchronous request returns a TwoFactorAuthErrorResponse, return that error instead of throwing it. Other
+ * types of errors will still be thrown.
+ * @param fn
+ */
+function returnIfTwoFactorAuthError(fn) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var response, e_2;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    response = null;
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, fn()];
+                case 2:
+                    response = _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_2 = _a.sent();
+                    if (e_2 instanceof SynapseClientError_1.SynapseClientError &&
+                        e_2.status === 401 &&
+                        e_2.errorResponse &&
+                        'errorCode' in e_2.errorResponse &&
+                        e_2.errorResponse.errorCode === ErrorResponse_1.ErrorResponseCode.TWO_FA_REQUIRED &&
+                        e_2.errorResponse.concreteType ===
+                            'org.sagebionetworks.repo.model.auth.TwoFactorAuthErrorResponse') {
+                        return [2 /*return*/, e_2.errorResponse];
+                    }
+                    else {
+                        throw e_2;
+                    }
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/, response];
+            }
+        });
+    });
+}
+exports.returnIfTwoFactorAuthError = returnIfTwoFactorAuthError;
 /*
   0 - no internet connection
   429 - Too Many Requests
@@ -157,7 +195,7 @@ var fetchWithExponentialTimeout = function (url, options, delayMs) {
                     else if (responseObject !== null &&
                         typeof responseObject === 'object' &&
                         'reason' in responseObject) {
-                        throw new SynapseClientError_1.SynapseClientError(response.status, responseObject.reason, url.toString());
+                        throw new SynapseClientError_1.SynapseClientError(response.status, responseObject.reason, url.toString(), responseObject);
                     }
                     else {
                         throw new SynapseClientError_1.SynapseClientError(response.status, JSON.stringify(responseObject), url.toString());
@@ -280,6 +318,7 @@ exports.getFileHandleByIdURL = getFileHandleByIdURL;
 /**
  * Get a completed asynchronous job. Will refetch every 500ms until COMPLETE or FAILED.
  * @param asyncJobId
+ * @param responseBodyEndpoint
  * @param accessToken
  * @param setCurrentAsyncStatus - optional function that will receive the AsynchronousJobStatus object every time
  *   it's fetched, including while it is in the "PROCESSING" state.
@@ -319,6 +358,7 @@ exports.getAsyncResultFromJobId = getAsyncResultFromJobId;
 /**
  * Get the response body for an asynchronous job, or throw an error if the job failed.
  * @param asyncJobId
+ * @param responseBodyEndpoint
  * @param accessToken
  * @returns
  */
@@ -338,7 +378,6 @@ exports.getAsyncResultBodyFromJobId = getAsyncResultBodyFromJobId;
  * https://rest-docs.synapse.org/rest/POST/entity/id/table/query/nextPage/async/start.html
  * @param {*} queryBundleRequest
  * @param {*} accessToken
- * @param {*} endpoint
  */
 var getQueryTableAsyncJobResults = function (queryBundleRequest, accessToken, setCurrentAsyncStatus) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var asyncJobId;
@@ -356,7 +395,7 @@ exports.getQueryTableAsyncJobResults = getQueryTableAsyncJobResults;
  * https://rest-docs.synapse.org/rest/POST/entity/id/table/query/nextPage/async/start.html
  * @param {*} queryBundleRequest
  * @param {*} accessToken
- * @param {*} endpoint
+ * @param {*} signal
  */
 var getQueryTableResults = function (queryBundleRequest, accessToken, signal) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var asyncJobId;
@@ -387,7 +426,7 @@ exports.getQueryTableResults = getQueryTableResults;
 var getFullQueryTableResults = function (queryBundleRequest, accessToken, signal) {
     if (accessToken === void 0) { accessToken = undefined; }
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var data, offset, query, rest, queryRequest, response, isDone, response_1;
+        var offset, query, rest, queryRequest, data, isDone, response;
         var _a;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
@@ -396,12 +435,13 @@ var getFullQueryTableResults = function (queryBundleRequest, accessToken, signal
                     query = queryBundleRequest.query, rest = tslib_1.__rest(queryBundleRequest, ["query"]);
                     queryRequest = tslib_1.__assign(tslib_1.__assign({}, rest), { query: tslib_1.__assign(tslib_1.__assign({}, query), { offset: offset }), partMask: queryBundleRequest.partMask |
                             _1.SynapseConstants.BUNDLE_MASK_QUERY_MAX_ROWS_PER_PAGE });
-                    return [4 /*yield*/, (0, exports.getQueryTableResults)(queryRequest, accessToken, signal)];
+                    return [4 /*yield*/, (0, exports.getQueryTableResults)(queryRequest, accessToken, signal)
+                        // we are done if we return less than a max pagesize that the backend is willing to return.
+                    ];
                 case 1:
-                    response = _b.sent();
-                    data = response;
-                    isDone = response.queryResult.queryResults.rows.length < data.maxRowsPerPage;
-                    offset += response.queryResult.queryResults.rows.length;
+                    data = _b.sent();
+                    isDone = data.queryResult.queryResults.rows.length < data.maxRowsPerPage;
+                    offset += data.queryResult.queryResults.rows.length;
                     queryRequest.query.limit = data.maxRowsPerPage; // set the limit to the actual max rows per page
                     _b.label = 2;
                 case 2:
@@ -409,11 +449,11 @@ var getFullQueryTableResults = function (queryBundleRequest, accessToken, signal
                     queryRequest.query.offset = offset;
                     return [4 /*yield*/, (0, exports.getQueryTableResults)(queryRequest, accessToken, signal)];
                 case 3:
-                    response_1 = _b.sent();
-                    (_a = data.queryResult.queryResults.rows).push.apply(_a, response_1.queryResult.queryResults.rows);
+                    response = _b.sent();
+                    (_a = data.queryResult.queryResults.rows).push.apply(_a, response.queryResult.queryResults.rows);
                     isDone =
-                        response_1.queryResult.queryResults.rows.length < queryRequest.query.limit;
-                    offset += response_1.queryResult.queryResults.rows.length;
+                        response.queryResult.queryResults.rows.length < queryRequest.query.limit;
+                    offset += response.queryResult.queryResults.rows.length;
                     return [3 /*break*/, 2];
                 case 4: return [2 /*return*/, data];
             }
@@ -426,11 +466,28 @@ exports.getFullQueryTableResults = getFullQueryTableResults;
  *  authenticated requests.
  *  https://rest-docs.synapse.org/rest/POST/login2.html
  */
-var login = function (username, password, authenticationReceipt, endpoint) {
+function login(username, password, authenticationReceipt, endpoint) {
     if (endpoint === void 0) { endpoint = getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT; }
-    return (0, exports.doPost)('/auth/v1/login2', { username: username, password: password, authenticationReceipt: authenticationReceipt }, undefined, endpoint);
-};
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, returnIfTwoFactorAuthError(function () {
+                    return (0, exports.doPost)('/auth/v1/login2', { username: username, password: password, authenticationReceipt: authenticationReceipt }, undefined, endpoint);
+                })];
+        });
+    });
+}
 exports.login = login;
+/**
+ * Performs authentication using 2FA, the body of the request needs to include the twoFaToken received as part of the
+ * error when authenticating and the totp code shown by the authenticator application.
+ *
+ * https://rest-docs.synapse.org/rest/POST/2fa/token.html
+ */
+function loginWith2fa(request, endpoint) {
+    if (endpoint === void 0) { endpoint = getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT; }
+    return (0, exports.doPost)('/auth/v1/2fa/token', request, undefined, endpoint);
+}
+exports.loginWith2fa = loginWith2fa;
 /**
  * Get redirect url
  * https://rest-docs.synapse.org/rest/POST/oauth2/authurl.html
@@ -453,7 +510,9 @@ exports.oAuthUrlRequest = oAuthUrlRequest;
  */
 var oAuthSessionRequest = function (provider, authenticationCode, redirectUrl, endpoint) {
     if (endpoint === void 0) { endpoint = getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT; }
-    return (0, exports.doPost)('/auth/v1/oauth2/session2', { provider: provider, authenticationCode: authenticationCode, redirectUrl: redirectUrl }, undefined, endpoint);
+    return returnIfTwoFactorAuthError(function () {
+        return (0, exports.doPost)('/auth/v1/oauth2/session2', { provider: provider, authenticationCode: authenticationCode, redirectUrl: redirectUrl }, undefined, endpoint);
+    });
 };
 exports.oAuthSessionRequest = oAuthSessionRequest;
 /**
@@ -525,7 +584,7 @@ exports.updateMyUserProfile = updateMyUserProfile;
  */
 var getUserGroupHeaders = function (prefix, typeFilter, offset, limit) {
     if (prefix === void 0) { prefix = ''; }
-    if (typeFilter === void 0) { typeFilter = UserGroupHeader_1.TYPE_FILTER.ALL; }
+    if (typeFilter === void 0) { typeFilter = synapseTypes_2.TYPE_FILTER.ALL; }
     if (offset === void 0) { offset = 0; }
     if (limit === void 0) { limit = 20; }
     return (0, exports.doGet)(APIConstants_1.USER_GROUP_HEADERS +
@@ -867,7 +926,7 @@ exports.isInSynapseExperimentalMode = isInSynapseExperimentalMode;
  *
  * @param {*} token Access token.  If undefined, then call should instruct the browser to delete the cookie.
  */
-var setAccessTokenCookie = function (token, sessionCallback) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+var setAccessTokenCookie = function (token) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -888,18 +947,10 @@ var setAccessTokenCookie = function (token, sessionCallback) { return tslib_1.__
                     path: '/',
                 });
                 _a.label = 3;
-            case 3:
-                sessionCallback();
-                return [3 /*break*/, 5];
+            case 3: return [3 /*break*/, 5];
             case 4: 
             // will set cookie in the http header
-            return [2 /*return*/, (0, exports.doPost)('Portal/sessioncookie', { sessionToken: token }, undefined, getEndpoint_1.BackendDestinationEnum.PORTAL_ENDPOINT, { credentials: 'include' })
-                    .then(function (_) {
-                    sessionCallback();
-                })
-                    .catch(function (err) {
-                    console.error('Error on setting access token ', err);
-                })];
+            return [2 /*return*/, (0, exports.doPost)('Portal/sessioncookie', { sessionToken: token }, undefined, getEndpoint_1.BackendDestinationEnum.PORTAL_ENDPOINT, { credentials: 'include' })];
             case 5: return [2 /*return*/];
         }
     });
@@ -927,82 +978,10 @@ var getPrincipalAliasRequest = function (accessToken, request) {
     return (0, exports.doPost)(url, request, accessToken, getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT);
 };
 exports.getPrincipalAliasRequest = getPrincipalAliasRequest;
-/*
-During SSO login, the authorization provider (Google) will
-send the user back to the portal with an authorization code,
-which can be exchanged for a Synapse user session.
-This function should be called whenever the root App is initialized
-(to look for this code parameter and complete the round-trip).
-If state is included, then we assume that this is being used for account creation,
-where we pass the username through the process.
-*/
-var detectSSOCode = function (registerAccountUrl, onError) {
-    var redirectURL = (0, exports.getRootURL)();
-    // 'code' handling (from SSO) should be preformed on the root page, and then redirect to original route.
-    var fullUrl = new URL(window.location.href);
-    // in test environment the searchParams isn't defined
-    var searchParams = fullUrl.searchParams;
-    if (!searchParams) {
-        return;
-    }
-    var code = searchParams.get('code');
-    var provider = searchParams.get('provider');
-    var state = searchParams.get('state');
-    // state is used during OAuth based Synapse account creation (it's the username)
-    if (code && provider) {
-        var redirectUrl = "".concat(redirectURL, "?provider=").concat(provider);
-        var redirectAfterSuccess_1 = function () {
-            // go back to original route after successful SSO login
-            var originalUrl = localStorage.getItem('after-sso-login-url');
-            localStorage.removeItem('after-sso-login-url');
-            if (originalUrl) {
-                window.location.replace(originalUrl);
-            }
-        };
-        if (Login_1.PROVIDERS.GOOGLE == provider) {
-            var onSuccess = function (synToken) {
-                (0, exports.setAccessTokenCookie)(synToken.accessToken, redirectAfterSuccess_1);
-            };
-            var onFailure = function (err) {
-                if (err.status === 404) {
-                    // Synapse account not found, send to registration page
-                    window.location.replace(registerAccountUrl !== null && registerAccountUrl !== void 0 ? registerAccountUrl : "".concat(getEndpoint_1.PRODUCTION_ENDPOINT_CONFIG.PORTAL, "#!RegisterAccount:0"));
-                }
-                console.error('Error with Google account association: ', err);
-                if (onError) {
-                    onError(err.reason);
-                }
-            };
-            if (state) {
-                (0, exports.oAuthRegisterAccountStep2)(state, provider, code, redirectUrl, getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT)
-                    .then(onSuccess)
-                    .catch(onFailure);
-            }
-            else {
-                (0, exports.oAuthSessionRequest)(provider, code, redirectUrl, getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT)
-                    .then(onSuccess)
-                    .catch(onFailure);
-            }
-        }
-        else if (Login_1.PROVIDERS.ORCID == provider) {
-            // now bind this to the user account
-            var onFailure = function (err) {
-                console.error('Error binding ORCiD to account: ', err);
-                if (onError) {
-                    onError(err.reason);
-                }
-            };
-            (0, exports.bindOAuthProviderToAccount)(provider, code, redirectUrl, getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT)
-                .then(redirectAfterSuccess_1)
-                .catch(onFailure);
-        }
-    }
-};
-exports.detectSSOCode = detectSSOCode;
-var signOut = function (sessionCallback) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+var signOut = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.setAccessTokenCookie)(undefined, sessionCallback)];
+            case 0: return [4 /*yield*/, (0, exports.setAccessTokenCookie)(undefined)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -1803,7 +1782,7 @@ exports.getDownloadOrder = getDownloadOrder;
  * @returns
  */
 var getAllOfPaginatedService = function (fn) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var limit, offset, existsMoreData, results, data, e_2;
+    var limit, offset, existsMoreData, results, data, e_3;
     return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -1827,8 +1806,8 @@ var getAllOfPaginatedService = function (fn) { return tslib_1.__awaiter(void 0,
                 }
                 return [3 /*break*/, 5];
             case 4:
-                e_2 = _a.sent();
-                throw Error("Error on getting paginated results ".concat(e_2));
+                e_3 = _a.sent();
+                throw Error("Error on getting paginated results ".concat(e_3));
             case 5: return [3 /*break*/, 1];
             case 6: return [2 /*return*/, results];
         }
@@ -1845,7 +1824,7 @@ var deleteDownloadListFiles = function (list, accessToken) {
 exports.deleteDownloadListFiles = deleteDownloadListFiles;
 // https://rest-docs.synapse.org/rest/DELETE/download/list.html ?
 var deleteDownloadList = function (accessToken) {
-    return (0, exports.doDelete)('/file/v1/download/list', accessToken, getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT).then(function (_) {
+    return (0, exports.doDelete)('/file/v1/download/list', accessToken, getEndpoint_1.BackendDestinationEnum.REPO_ENDPOINT).then(function () {
         (0, dispatchDownloadListChangeEvent_1.dispatchDownloadListChangeEvent)(undefined);
     });
 };
@@ -2613,7 +2592,7 @@ function getAllSynapseUserGeoData() {
                 case 1:
                     response = _a.sent();
                     return [4 /*yield*/, response.json()];
-                case 2: return [2 /*return*/, _a.sent()];
+                case 2: return [2 /*return*/, (_a.sent())];
             }
         });
     });
@@ -2631,7 +2610,7 @@ function getSynapseTeamGeoData(teamId) {
                 case 1:
                     response = _a.sent();
                     return [4 /*yield*/, response.json()];
-                case 2: return [2 /*return*/, _a.sent()];
+                case 2: return [2 /*return*/, (_a.sent())];
             }
         });
     });