fix(compute-api): ignore 404s when requesting webout content

fix(login-callback): fix request failure when login is required
chore(deps): bump adapter and test framework
2025-12-11 01:14:36 +00:00 · 2020-08-08 14:26:09 +01:00 · 2020-08-08 12:56:31 +01:00 · 2020-08-08 11:42:16 +01:00 · 2020-08-08 11:04:25 +01:00 · 2020-08-06 12:59:52 +00:00
7 changed files with 56 additions and 32 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1648,9 +1648,9 @@
      }
    },
    "@types/jest": {
-      "version": "26.0.8",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.8.tgz",
-      "integrity": "sha512-eo3VX9jGASSuv680D4VQ89UmuLZneNxv2MCZjfwlInav05zXVJTzfc//lavdV0GPwSxsXJTy2jALscB7Acqg0g==",
+      "version": "26.0.9",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.9.tgz",
+      "integrity": "sha512-k4qFfJ5AUKrWok5KYXp2EPm89b0P/KZpl7Vg4XuOTVVQEhLDBDBU3iBFrjjdgd8fLw96aAtmnwhXHl63bWeBQQ==",
      "dev": true,
      "requires": {
        "jest-diff": "^25.2.1",
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
  "license": "ISC",
  "devDependencies": {
    "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.8",
+    "@types/jest": "^26.0.9",
    "cp": "^0.2.0",
    "jest": "^25.5.4",
    "path": "^0.12.7",
--- a/sasjs-tests/package-lock.json
+++ b/sasjs-tests/package-lock.json
@@ -1357,9 +1357,9 @@
      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
    },
    "@sasjs/adapter": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.5.tgz",
-      "integrity": "sha512-54gQZD7QdNmQu77axOqr0vMS7hUVXO5hPbUtwXXocMIi3kRQDbROYjC3kuiFM9FrxqiZWbLRcyOqmFv3W/N36w==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.2.0.tgz",
+      "integrity": "sha512-PcQcmb7TsfPJ94tzFnvycm+tMYD3wKx2a6niwHfsV9+g6XHtmwReVV3EPZZ5XB4s565vU6Qc+ZnFbMIAeik8QA==",
      "requires": {
        "es6-promise": "^4.2.8",
        "form-data": "^3.0.0",
@@ -1379,15 +1379,23 @@
      }
    },
    "@sasjs/test-framework": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.3.0.tgz",
-      "integrity": "sha512-vrbRFUhNUShLlNFZO+XwVwFLXDLApQG9zOPx00xhQ8IUA0cSDFFmf2mP/KBdFCxa1REaR6GHvMctUj+xRZo9QQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.3.3.tgz",
+      "integrity": "sha512-Ou4UXlxBAVR8jv7boVvJ/eKLHRTQvDi9LouPAasLCO2EC4AD0wX1hLMwVhmydCvsdgVEeXs6InvX3ROHiKSADg==",
      "requires": {
        "@types/react-highlight.js": "^1.0.0",
+        "immer": "^7.0.7",
        "moment": "^2.27.0",
        "react-highlight.js": "^1.0.7",
        "semantic-ui-css": "^2.4.1",
        "semantic-ui-react": "^1.0.0"
+      },
+      "dependencies": {
+        "immer": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.7.tgz",
+          "integrity": "sha512-Q8yYwVADJXrNfp1ZUAh4XDHkcoE3wpdpb4mC5abDSajs2EbW8+cGdPyAnglMyLnm7EF6ojD2xBFX7L5i4TIytw=="
+        }
      }
    },
    "@semantic-ui-react/event-stack": {
@@ -3747,11 +3755,6 @@
        }
      }
    },
-    "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
    "clean-css": {
      "version": "4.2.3",
      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -3829,6 +3832,11 @@
        "shallow-clone": "^0.1.2"
      }
    },
+    "clsx": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
+      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
+    },
    "co": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -12226,21 +12234,36 @@
      }
    },
    "semantic-ui-react": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.0.0.tgz",
-      "integrity": "sha512-85mYHYuDBNa6la1BgKwuOSD1vcIPsFQEXRxGsZ9pUtE4iHlEcylF+x46NYHIGbBjlys63SpNH3PtK6VyZj9LBw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.1.1.tgz",
+      "integrity": "sha512-QtzLNkK4MUe1HQo4S7/tIkSp4NFtxSGDzTMKxmvztMJ6jt+nKGmMyjpyxJsrm3ohU8Z3sTyBUyiBsDYW4jNtjw==",
      "requires": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.10.5",
        "@semantic-ui-react/event-stack": "^3.1.0",
        "@stardust-ui/react-component-event-listener": "~0.38.0",
        "@stardust-ui/react-component-ref": "~0.38.0",
-        "classnames": "^2.2.6",
-        "keyboard-key": "^1.0.4",
-        "lodash": "^4.17.15",
+        "clsx": "^1.1.1",
+        "keyboard-key": "^1.1.0",
+        "lodash": "^4.17.19",
        "prop-types": "^15.7.2",
        "react-is": "^16.8.6",
-        "react-popper": "^1.3.4",
+        "react-popper": "^1.3.7",
        "shallowequal": "^1.1.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.11.2",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+          "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "lodash": {
+          "version": "4.17.19",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+        }
      }
    },
    "semver": {
--- a/sasjs-tests/package.json
+++ b/sasjs-tests/package.json
@@ -4,8 +4,8 @@
  "homepage": ".",
  "private": true,
  "dependencies": {
-    "@sasjs/adapter": "^1.0.5",
-    "@sasjs/test-framework": "^1.3.0",
+    "@sasjs/adapter": "^1.2.0",
+    "@sasjs/test-framework": "^1.3.3",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.5.0",
    "@testing-library/user-event": "^7.2.1",
--- a/sasjs-tests/src/Login.tsx
+++ b/sasjs-tests/src/Login.tsx
@@ -12,7 +12,7 @@ const Login = (): ReactElement<{}> => {
    (e) => {
      e.preventDefault();
      appContext.adapter.logIn(username, password).then((res) => {
-        appContext.setIsLoggedIn(true);
+        appContext.setIsLoggedIn(res.isLoggedIn);
      });
    },
    [username, password, appContext]
--- a/src/SASViyaApiClient.ts
+++ b/src/SASViyaApiClient.ts
@@ -304,12 +304,14 @@ export class SASViyaApiClient {
        `${this.serverUrl}${resultLink}`,
        { headers },
        "text"
-      );
+      ).catch((e) => ({
+        result: JSON.stringify(e),
+      }));
    }

    if (true && logLink) {
      log = await this.request<any>(
-        `${this.serverUrl}${logLink.href}/content`,
+        `${this.serverUrl}${logLink.href}/content?limit=10000`,
        {
          headers,
        }
--- a/src/utils/makeRequest.ts
+++ b/src/utils/makeRequest.ts
@@ -18,6 +18,9 @@ export async function makeRequest<T>(
      : (res: Response) => res.text();
  let etag = null;
  const result = await fetch(url, request).then(async (response) => {
+    if (response.redirected && response.url.includes("SASLogon/login")) {
+      return Promise.reject({ status: 401 });
+    }
    if (!response.ok) {
      if (response.status === 403) {
        const tokenHeader = response.headers.get("X-CSRF-HEADER");
@@ -75,10 +78,6 @@ export async function makeRequest<T>(
        responseText = JSON.stringify(responseTransformed);
      }

-      if (response.redirected && response.url.includes("SASLogon/login")) {
-        return Promise.reject({ status: 401, responseTransformed });
-      }
-
      if (needsRetry(responseText)) {
        if (retryCount < retryLimit) {
          retryCount++;
Author	SHA1	Message	Date
Krishna Acondy	f7a9b0cbb6	fix(compute-api): ignore 404s when requesting webout content	2020-08-08 14:26:09 +01:00
Krishna Acondy	1258a1a180	fix(login-callback): fix request failure when login is required	2020-08-08 12:56:31 +01:00
Krishna Acondy	0bb343a1de	chore(deps): bump adapter and test framework	2020-08-08 11:42:16 +01:00
Krishna Acondy	929c89b70f	Merge pull request #32 from sasjs/dependabot/npm_and_yarn/types/jest-26.0.9 chore(deps-dev): bump @types/jest from 26.0.8 to 26.0.9	2020-08-08 11:04:25 +01:00
dependabot-preview[bot]	169ca35238	chore(deps-dev): bump @types/jest from 26.0.8 to 26.0.9 Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.8 to 26.0.9. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-06 12:59:52 +00:00