@entur-partner/app-shell 2.2.1 → 2.4.0

package/dist/AppShell.d.ts

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { GetTokenSilentlyOptions } from '@auth0/auth0-spa-js';
 import { User } from '@entur-partner/micro-frontend';
+import { Environment } from '@entur-partner/common';
 import { DecorateUserFn } from './UserTypes';
 export interface AppShellValues {
     logout: () => void;
@@ -14,5 +15,6 @@ export interface AppShellProps {
     clientId: string;
     decorateUser: DecorateUserFn;
     redirectUri?: string;
+    environment?: Environment;
 }
-export declare const AppShell: ({ children, audience, domain, clientId, redirectUri, decorateUser, }: AppShellProps) => JSX.Element;
+export declare const AppShell: ({ children, audience, domain, clientId, redirectUri, decorateUser, environment, }: AppShellProps) => JSX.Element;

package/dist/EnvironmentBanner.d.ts

@@ -0,0 +1,6 @@
+import { Environment } from '@entur-partner/common';
+declare type EnvironmentBannerProps = {
+    environment: Exclude<Environment, Environment.Production>;
+};
+export declare const EnvironmentBanner: ({ environment }: EnvironmentBannerProps) => JSX.Element;
+export {};

package/dist/app-shell.cjs.development.js

@@ -6,9 +6,10 @@ var React = require('react');
 var loader = require('@entur/loader');
 var alert = require('@entur/alert');
 var tokens = require('@entur/tokens');
+var typography = require('@entur/typography');
 var util = require('@entur-partner/util');
-var createAuth0Client = require('@auth0/auth0-spa-js');
 var common = require('@entur-partner/common');
+var createAuth0Client = require('@auth0/auth0-spa-js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -846,6 +847,7 @@ function authReducer(state, event) {
 
 var _excluded$2 = ["children", "decorateUser"];
 var POST_LOGIN_ROUTE_KEY = '@entur-partner:post-login-route';
+var LOGIN_LAST_RETRY = '@entur-partner:last-login-retry';
 
 var redirect = function redirect(pathname) {
   if (pathname === void 0) {
@@ -961,12 +963,61 @@ var AuthProvider = function AuthProvider(_ref) {
       };
     }();
 
-    initAuth0()["catch"](function (error) {
-      dispatch({
-        type: 'ERROR',
-        error: error
-      });
-    }); // eslint-disable-next-line
+    initAuth0()["catch"]( /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(error) {
+        var _localStorage$getItem, lastRetryEpochSeconds, nowEpochSeconds, timeSinceLastRetry, minimumTimeForRetry;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.prev = 0;
+                lastRetryEpochSeconds = parseInt((_localStorage$getItem = localStorage.getItem(LOGIN_LAST_RETRY)) != null ? _localStorage$getItem : '0');
+                nowEpochSeconds = Math.floor(Date.now() / 1000);
+                timeSinceLastRetry = nowEpochSeconds - lastRetryEpochSeconds;
+                minimumTimeForRetry = 120; // Has there been more than x seconds since last retry?
+
+                if (!(timeSinceLastRetry >= minimumTimeForRetry)) {
+                  _context2.next = 12;
+                  break;
+                }
+
+                localStorage.setItem(LOGIN_LAST_RETRY, nowEpochSeconds.toString());
+                redirect('/');
+                _context2.next = 10;
+                return initAuth0();
+
+              case 10:
+                _context2.next = 13;
+                break;
+
+              case 12:
+                throw error;
+
+              case 13:
+                _context2.next = 18;
+                break;
+
+              case 15:
+                _context2.prev = 15;
+                _context2.t0 = _context2["catch"](0);
+                dispatch({
+                  type: 'ERROR',
+                  error: error
+                });
+
+              case 18:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, null, [[0, 15]]);
+      }));
+
+      return function (_x) {
+        return _ref3.apply(this, arguments);
+      };
+    }()); // eslint-disable-next-line
   }, []);
 
   var logout = function logout() {
@@ -981,12 +1032,12 @@ var AuthProvider = function AuthProvider(_ref) {
   };
 
   var login = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(redirectUri) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(redirectUri) {
       var _window, location;
 
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (redirectUri === void 0) {
                 redirectUri = window.location.origin;
@@ -1001,36 +1052,36 @@ var AuthProvider = function AuthProvider(_ref) {
 
             case 5:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
 
-    return function login(_x) {
-      return _ref3.apply(this, arguments);
+    return function login(_x2) {
+      return _ref4.apply(this, arguments);
     };
   }();
 
   var getToken = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(options) {
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(options) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               util.assertIsDefined(auth0Client);
-              return _context3.abrupt("return", auth0Client.getTokenSilently(options));
+              return _context4.abrupt("return", auth0Client.getTokenSilently(options));
 
             case 2:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
 
-    return function getToken(_x2) {
-      return _ref4.apply(this, arguments);
+    return function getToken(_x3) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -1044,6 +1095,22 @@ var AuthProvider = function AuthProvider(_ref) {
   }, children);
 };
 
+var EnvironmentBanner = function EnvironmentBanner(_ref) {
+  var environment = _ref.environment;
+  return React__default["default"].createElement("div", {
+    style: {
+      position: 'fixed',
+      zIndex: 9999,
+      top: 0,
+      left: 0,
+      right: 0,
+      width: '100vw',
+      height: '16px',
+      backgroundColor: common.getColorForEnvironment(environment)
+    }
+  });
+};
+
 var Login = function Login(_ref) {
   var redirectUri = _ref.redirectUri;
 
@@ -1097,7 +1164,9 @@ var Authenticate = function Authenticate(_ref2) {
           maxWidth: '600px',
           margin: '0 auto'
         }
-      }, "Authentication failed with: ", error == null ? void 0 : error.toString());
+      }, React__default["default"].createElement(typography.Paragraph, null, "Something went wrong while trying to authenticate you. If the problem persists you should contact", ' ', React__default["default"].createElement(typography.Link, {
+        href: "mailto:support@entur.org"
+      }, "support@entur.org"), " to get it resolved."), React__default["default"].createElement(typography.Paragraph, null, "Authentication failed with: ", React__default["default"].createElement(typography.CodeText, null, error == null ? void 0 : error.toString())));
 
     default:
       return null;
@@ -1110,7 +1179,8 @@ var AppShell = function AppShell(_ref3) {
       domain = _ref3.domain,
       clientId = _ref3.clientId,
       redirectUri = _ref3.redirectUri,
-      decorateUser = _ref3.decorateUser;
+      decorateUser = _ref3.decorateUser,
+      environment = _ref3.environment;
   return React__default["default"].createElement(AuthProvider, {
     audience: audience,
     domain: domain,
@@ -1119,7 +1189,9 @@ var AppShell = function AppShell(_ref3) {
   }, React__default["default"].createElement(Authenticate, {
     redirectUri: redirectUri
   }, function (params) {
-    return children(params);
+    return React__default["default"].createElement(React__default["default"].Fragment, null, environment && environment !== common.Environment.Production && React__default["default"].createElement(EnvironmentBanner, {
+      environment: environment
+    }), children(params));
   }));
 };