@devtron-labs/devtron-fe-common-lib 0.0.7-beta-34 → 0.0.7-beta-36

package/dist/Common/Constants.d.ts

@@ -11,6 +11,9 @@ export declare const PATTERNS: {
     START_END_ALPHANUMERIC: RegExp;
     ALPHANUMERIC_WITH_SPECIAL_CHAR: RegExp;
 };
+export declare const URLS: {
+    LOGIN_SSO: string;
+};
 export declare const ROUTES: {
     PROJECT_LIST_MIN: string;
 };

package/dist/index.js

@@ -3,7 +3,6 @@
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var ReactDOM = require('react-dom');
-var reactRouter = require('react-router');
 var reactRouterDom = require('react-router-dom');
 
 function _interopNamespaceDefault(e) {
@@ -38,6 +37,9 @@ var PATTERNS = {
     START_END_ALPHANUMERIC: /^([Az09].*[A-Za-z0-9])$|[A-Za-z0-9]$/,
     ALPHANUMERIC_WITH_SPECIAL_CHAR: /^[A-Za-z0-9._-]+$/, // allow alphanumeric,(.) ,(-),(_)
 };
+var URLS = {
+    LOGIN_SSO: '/login/sso',
+};
 var ROUTES = {
     PROJECT_LIST_MIN: 'team/autocomplete',
 };
@@ -302,6 +304,10 @@ var responseMessages = {
     598: 'Network read timeout error',
     599: 'Network connect timeout error',
 };
+function handleLogout() {
+    var continueParam = "".concat(window.location.pathname.replace(process.env.PUBLIC_URL, '')).concat(window.location.search);
+    window.location.href = "".concat(window.location.origin).concat(process.env.PUBLIC_URL).concat(URLS.LOGIN_SSO, "?continue=").concat(continueParam);
+}
 function handleServerError(contentType, response) {
     return __awaiter(this, void 0, void 0, function () {
         var code, status, serverError, responseBody;
@@ -363,6 +369,7 @@ function fetchAPI(url, type, data, signal, preventAutoLogout, isMultipartRequest
                                     });
                                 }
                                 else {
+                                    handleLogout();
                                     return [2 /*return*/, { code: 401, status: 'Unauthorized', result: [] }];
                                 }
                             case 1:
@@ -1966,9 +1973,9 @@ function GenericEmptyState(_a) {
 }
 
 function ErrorScreenNotFound() {
-    var history = reactRouter.useHistory();
+    var push = reactRouterDom.useHistory().push;
     var redirectToHome = function () {
-        history.push('app/list');
+        push('/app/list');
     };
     var renderGenerateButton = function () {
         return (jsxRuntime.jsx("button", __assign({ className: "flex cta h-32", onClick: redirectToHome, "data-testid": "empty-screen-take-me-home" }, { children: ERROR_EMPTY_SCREEN.TAKE_BACK_HOME })));
@@ -16470,6 +16477,7 @@ exports.TippyCustomized = TippyCustomized;
 exports.ToastBody = ToastBody;
 exports.ToastBody3 = ToastBody3;
 exports.ToastBodyWithButton = ToastBodyWithButton;
+exports.URLS = URLS;
 exports.VisibleModal = VisibleModal;
 exports.VisibleModal2 = VisibleModal2;
 exports.get = get;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.0.7-beta-34",
+    "version": "0.0.7-beta-36",
     "description": "Supporting common component library",
     "main": "dist/index.js",
     "scripts": {

package/src/Common/Api.ts

@@ -1,5 +1,5 @@
 import { ServerErrors } from './ServerError'
-import { RequestTimeout, Host } from './Constants'
+import { RequestTimeout, Host, URLS } from './Constants'
 import { ResponseType, APIOptions } from './Types'
 
 const responseMessages = {
@@ -73,6 +73,11 @@ const responseMessages = {
     599: 'Network connect timeout error',
 }
 
+function handleLogout() {
+    const continueParam = `${window.location.pathname.replace(process.env.PUBLIC_URL, '')}${window.location.search}`
+    window.location.href = `${window.location.origin}${process.env.PUBLIC_URL}${URLS.LOGIN_SSO}?continue=${continueParam}`
+}
+
 async function handleServerError(contentType, response) {
     //Test for HTTP Status Code
     let code: number = response.status
@@ -126,6 +131,7 @@ async function fetchAPI(
                         ],
                     })
                 } else {
+                    handleLogout()
                     return { code: 401, status: 'Unauthorized', result: [] }
                 }
             } else if (response.status >= 300 && response.status <= 599) {

package/src/Common/Constants.ts

@@ -14,6 +14,10 @@ export const PATTERNS = {
     ALPHANUMERIC_WITH_SPECIAL_CHAR: /^[A-Za-z0-9._-]+$/, // allow alphanumeric,(.) ,(-),(_)
 }
 
+export const URLS = {
+    LOGIN_SSO: '/login/sso',
+}
+
 export const ROUTES = {
     PROJECT_LIST_MIN: 'team/autocomplete',
 }
@@ -44,8 +48,8 @@ export const ERROR_EMPTY_SCREEN = {
     TAKE_BACK_HOME: 'Take me home',
     ONLY_FOR_SUPERADMIN: 'Information on this page is available only to superadmin users.',
     NOT_AUTHORIZED: 'Not authorized',
-    UNAUTHORIZED:'unauthorized',
-    FORBIDDEN:'forbidden',
+    UNAUTHORIZED: 'unauthorized',
+    FORBIDDEN: 'forbidden',
     REQUIRED_MANAGER_ACCESS:
         'Looks like you don’t have access to information on this page. Please contact your manager to request access.',
 }

package/src/Common/ErrorScreenNotFound.tsx

@@ -1,13 +1,13 @@
 import React from 'react'
 import notFound from '../Assets/Img/ic-empty-error@2x.png'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 import { ERROR_EMPTY_SCREEN } from './Constants'
 import GenericEmptyState from './EmptyState/GenericEmptyState'
 
 function ErrorScreenNotFound() {
-    const history = useHistory()
+    const {push} = useHistory()
     const redirectToHome = () => {
-        history.push('app/list')
+        push('/app/list')
     }
     const renderGenerateButton = () => {
         return (