asab_webui_shell 27.4.4 → 27.5.0

package/dist/modules/auth/api.js

@@ -81,15 +81,24 @@ class SeaCatAuthApi {
     });
   }
   userinfo(access_token) {
-    var userinfoPath = '/userinfo';
+    var internal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    // 'internal' is a flag to indicate that the userinfo is requested from the internal API (SeaCat Auth API)
+    // instead of the public OpenID Connect API - that is used for the web app that runs inside of the cluser (asab-pyppeteer)
+
     var headers = {};
     // Add access bearer token to the Authorization headers
     if (access_token != null) {
       headers.Authorization = 'Bearer ' + access_token;
     }
-    return this.OidcAPI.get(userinfoPath, {
-      headers: headers
-    });
+    if (internal) {
+      return this.SeaCatAuthAPI.get('/openidconnect/userinfo', {
+        headers: headers
+      });
+    } else {
+      return this.OidcAPI.get('/userinfo', {
+        headers: headers
+      });
+    }
   }
   token_authorization_code(authorization_code, redirect_uri) {
     var redirectUri = new URL(redirect_uri);

package/dist/modules/auth/index.js

@@ -14,13 +14,28 @@ var _actions = require("./actions");
 var _actions2 = require("../../actions");
 var _api = require("./api");
 var _locationReplace = require("../../components/locationReplace");
+var _extractTenantFromUrl = require("../../utils/extractTenantFromUrl");
 var _SessionExpirationAlert = require("./components/SessionExpirationAlert");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); } // TODO: Use SessionExpirationAlert only after proper fix of the component
 var AccessControlScreen = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require("./screens/AccessControlScreen"))));
 class AuthModule extends _asab_webui_components.Module {
   constructor(app, name) {
     super(app, "AuthModule");
-    this.OAuthTokens = JSON.parse(sessionStorage.getItem('SeaCatOAuth2Tokens'));
+    if (typeof OAUTH_TOKENS !== 'undefined') {
+      // Read OAuth tokens from webpack.dev.js settings ... this is development mode only
+      // Example from webpack.dev.js:
+      // new webpack.DefinePlugin({
+      //  ....
+      // 	'OAUTH_TOKENS': JSON.stringify({
+      // 		"internal": true,
+      // 		"access_token": "eyJh...SbVaw"
+      // 	})
+      // }),
+      this.OAuthTokens = OAUTH_TOKENS;
+    } else {
+      // Read OAuth tokens from session storage
+      this.OAuthTokens = JSON.parse(sessionStorage.getItem('SeaCatOAuth2Tokens'));
+    }
     this.UserInfo = null;
     this.Api = new _api.SeaCatAuthApi(app);
     this.RedirectURL = window.location.href;
@@ -327,27 +342,71 @@ class AuthModule extends _asab_webui_components.Module {
   updateUserInfo() {
     var _this3 = this;
     return (0, _asyncToGenerator2.default)(function* () {
-      var _response$data;
-      var response;
-      try {
-        response = yield _this3.Api.userinfo(_this3.OAuthTokens.access_token);
-      } catch (err) {
-        console.error("Failed to update user info", err);
-        _this3.UserInfo = null;
-        if (_this3.App.AppStore) {
-          var _this3$App$AppStore$d, _this3$App$AppStore;
-          (_this3$App$AppStore$d = (_this3$App$AppStore = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d === void 0 || _this3$App$AppStore$d.call(_this3$App$AppStore, {
-            type: _actions.types.AUTH_USERINFO,
-            payload: _this3.UserInfo
-          });
+      var internal = _this3.OAuthTokens.internal || false;
+      if (!internal) {
+        var _response$data;
+        var response;
+        try {
+          response = yield _this3.Api.userinfo(_this3.OAuthTokens.access_token);
+        } catch (err) {
+          console.error("Failed to update user info", err);
+          _this3.UserInfo = null;
+          if (_this3.App.AppStore) {
+            var _this3$App$AppStore$d, _this3$App$AppStore;
+            (_this3$App$AppStore$d = (_this3$App$AppStore = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d === void 0 || _this3$App$AppStore$d.call(_this3$App$AppStore, {
+              type: _actions.types.AUTH_USERINFO,
+              payload: _this3.UserInfo
+            });
+          }
+          return false;
         }
-        return false;
+        _this3.UserInfo = response.data;
+        _this3.SessionExpiration = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.exp;
+      } else {
+        var _response$data2;
+        var _response;
+        try {
+          _response = yield _this3.Api.userinfo(_this3.OAuthTokens.access_token, internal);
+        } catch (err) {
+          console.error("Failed to update user info", err);
+          _this3.UserInfo = null;
+          if (_this3.App.AppStore) {
+            var _this3$App$AppStore$d2, _this3$App$AppStore2;
+            (_this3$App$AppStore$d2 = (_this3$App$AppStore2 = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d2 === void 0 || _this3$App$AppStore$d2.call(_this3$App$AppStore2, {
+              type: _actions.types.AUTH_USERINFO,
+              payload: _this3.UserInfo
+            });
+          }
+          return false;
+        }
+        _this3.UserInfo = _response.data;
+
+        // If the resource is `{'*': [....]}` then it is a global resources token (i.e. for API keys)
+        var resources = _response.data.resources;
+        var isGlobalResources = resources != null && typeof resources === 'object' && !Array.isArray(resources) && Object.keys(resources).length === 1 && Array.isArray(resources['*']);
+        if (isGlobalResources) {
+          var tenant = (0, _extractTenantFromUrl.extractTenantFromUrl)();
+          if (tenant) {
+            // Monkey patch the userinfo to add the tenant and resources
+            _this3.UserInfo['tenants'] = [tenant];
+            _this3.UserInfo['resources'][tenant] = resources['*'];
+          } else {
+            var _this3$App, _this3$App$dispatch;
+            console.error("Tenant not found in URL - if the global resources token is used, the tenant must be specified in the URL");
+            _this3.UserInfo = null;
+            _this3.SessionExpiration = null;
+            (_this3$App = _this3.App) === null || _this3$App === void 0 || (_this3$App = _this3$App.AppStore) === null || _this3$App === void 0 || (_this3$App$dispatch = _this3$App.dispatch) === null || _this3$App$dispatch === void 0 || _this3$App$dispatch.call(_this3$App, {
+              type: _actions.types.AUTH_USERINFO,
+              payload: null
+            });
+            return false;
+          }
+        }
+        _this3.SessionExpiration = (_response$data2 = _response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.exp;
       }
-      _this3.UserInfo = response.data;
-      _this3.SessionExpiration = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.exp;
       if (_this3.App.AppStore) {
-        var _this3$App$AppStore$d2, _this3$App$AppStore2;
-        (_this3$App$AppStore$d2 = (_this3$App$AppStore2 = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d2 === void 0 || _this3$App$AppStore$d2.call(_this3$App$AppStore2, {
+        var _this3$App$AppStore$d3, _this3$App$AppStore3;
+        (_this3$App$AppStore$d3 = (_this3$App$AppStore3 = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d3 === void 0 || _this3$App$AppStore$d3.call(_this3$App$AppStore3, {
           type: _actions.types.AUTH_USERINFO,
           payload: _this3.UserInfo
         });

package/dist/modules/tenant/service.js

@@ -9,6 +9,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _asab_webui_components = require("asab_webui_components");
 var _actions = require("./actions");
 var _locationReplace = require("../../components/locationReplace");
+var _extractTenantFromUrl = require("../../utils/extractTenantFromUrl");
 class TenantService extends _asab_webui_components.Service {
   constructor(app) {
     var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'TenantService';
@@ -43,7 +44,7 @@ class TenantService extends _asab_webui_components.Service {
       var _this2$App, _this2$App$dispatch;
       var authorizedTenant = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : undefined;
       // Extract the current tenant from URL params
-      var tenantFromUrl = _this2._extractTenantFromUrl();
+      var tenantFromUrl = (0, _extractTenantFromUrl.extractTenantFromUrl)();
 
       /* If tenant has not been provided in access URL, insert the authorized tenant 
       or the first available tenant into the URL and reload the application */
@@ -130,17 +131,9 @@ class TenantService extends _asab_webui_components.Service {
     var currentTenant = state === null || state === void 0 || (_state$tenant = state.tenant) === null || _state$tenant === void 0 ? void 0 : _state$tenant.current;
     // If current tenant is not in Application store yet, get it from the URL params
     if (!currentTenant) {
-      currentTenant = this._extractTenantFromUrl();
+      currentTenant = (0, _extractTenantFromUrl.extractTenantFromUrl)();
     }
     return currentTenant;
   }
-
-  // Extract tenant from URL params
-  _extractTenantFromUrl() {
-    var search = window.location.search;
-    var params = new URLSearchParams(search);
-    var tenant = params.get('tenant');
-    return tenant;
-  }
 }
 exports.default = TenantService;

package/dist/screens/SuspenseScreen.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = SuspenseScreen;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _reactI18next = require("react-i18next");
 var _asab_webui_components = require("asab_webui_components");
 var _reactstrap = require("reactstrap");
 var _BrandImage = require("../components/branding/BrandImage");
@@ -18,6 +19,8 @@ function SuspenseScreen(props) {
     brandImage = _useState2[0],
     setBrandImage = _useState2[1];
   var theme = (0, _asab_webui_components.useAppSelector)(state => state.theme);
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+    t = _useTranslation.t;
   (0, _react.useEffect)(() => {
     setBrandImage((0, _BrandImage.getBrandImage)(props, theme));
   }, [theme]);
@@ -31,8 +34,8 @@ function SuspenseScreen(props) {
   }, brandImage ? /*#__PURE__*/_react.default.createElement("img", {
     className: "suspense-img",
     src: brandImage === null || brandImage === void 0 ? void 0 : brandImage.full,
-    alt: "Loading..."
+    alt: "Loading"
   }) : /*#__PURE__*/_react.default.createElement("h2", {
     className: "text-center text-primary"
-  }, "Loading...")), /*#__PURE__*/_react.default.createElement(_asab_webui_components.Spinner, null))));
+  }, t('General|Loading'))), /*#__PURE__*/_react.default.createElement(_asab_webui_components.Spinner, null))));
 }

package/dist/utils/extractTenantFromUrl.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.extractTenantFromUrl = extractTenantFromUrl;
+function extractTenantFromUrl() {
+  var search = window.location.search;
+  var params = new URLSearchParams(search);
+  var tenant = params.get('tenant');
+  return tenant;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asab_webui_shell",
-	"version": "27.4.4",
+	"version": "27.5.0",
 	"license": "BSD-3-Clause",
 	"description": "TeskaLabs ASAB WebUI Shell Application",
 	"contributors": [