Merge branch 'staging' into hotfix_bkwdCmpatNiftiLayers

deploy/datasets/query.js

@@ -59,7 +59,7 @@ const fetchDatasetFromKg = async ({ user } = {}) => {
   const { releasedOnly, option } = await getUserKGRequestParam({ user })
 
   return await new Promise((resolve, reject) => {
-    request(`${KG_QUERY_DATASETS_URL}${releasedOnly ? '&databaseScope=RELEASED' : ''}`, option, (err, resp, body) => {
+    request(`${KG_QUERY_DATASETS_URL}${releasedOnly ? '&databaseScope=RELEASED' : '&databaseScope=INFERRED'}`, option, (err, resp, body) => {
       if (err) return reject(err)
       if (resp.statusCode >= 400) return reject(resp.statusCode)
       try {
@@ -108,8 +108,11 @@ const getPublicDs = async () => {
   throw `cached Data not yet resolved, neither is get public ds defined`
 }
 
-
-const getDs = ({ user }) => (user
+/**
+ * force get only public ds
+ * getting individual ds is too slow
+ */
+const getDs = ({ user }) => (false && user
     ? fetchDatasetFromKg({ user }).then(({ results }) => results)
     : getPublicDs()
   ).then(async datasets => {

deploy/datasets/util.js

@@ -21,8 +21,9 @@ const getUserKGRequestParam = async ({ user }) => {
   let publicAccessToken
   /**
    * n.b. ACCESS_TOKEN env var is usually only set during dev
+   * user.type any other than 'hbp-oidc' (v1 of oidc) will result in timeout/error
    */
-  const accessToken = (user && user.tokenset && user.tokenset.access_token) || process.env.ACCESS_TOKEN
+  const accessToken = (user && user.type === 'hbp-oidc' && user.tokenset && user.tokenset.access_token) || process.env.ACCESS_TOKEN
   const releasedOnly = !accessToken
   if (!accessToken && getPublicAccessToken) {
     publicAccessToken = await getPublicAccessToken()

docs/releases/v2.3.3.md

@@ -3,3 +3,4 @@
 ## Bugfixes
 
 - fix backwards compatibility with some URLs
+- fix bug where fetching of regional features does not complete for logged in users (#826). (the viewer will only fetch released datasets)