Compare commits

...

4 commits

8 changed files with 891 additions and 673 deletions

1472
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{
"name": "@chimera-pe/react-saas",
"version": "0.1.4",
"version": "0.2.0",
"type": "module",
"scripts": {
"dev": "vite",
@ -9,41 +9,41 @@
"preview": "vite preview"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.11",
"@mui/lab": "^5.0.0-alpha.143",
"@mui/material": "^5.14.11",
"@mui/x-date-pickers": "^6.15.0",
"@reduxjs/toolkit": "^1.9.6",
"axios": "^1.5.1",
"@mui/icons-material": "^5.15.11",
"@mui/lab": "^5.0.0-alpha.166",
"@mui/material": "^5.15.11",
"@mui/x-date-pickers": "^6.19.5",
"@reduxjs/toolkit": "^2.2.1",
"axios": "^1.6.7",
"date-fns": "^2.30.0",
"final-form": "^4.20.10",
"jwt-decode": "^3.1.2",
"jwt-decode": "^4.0.0",
"lodash": "^4.17.21",
"mui-rff": "^6.2.3",
"mui-rff": "^7.3.0",
"navigator-languages": "^2.0.2",
"node-polyglot": "^2.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-final-form": "^6.5.9",
"react-polyglot": "^0.7.2",
"react-redux": "^8.1.2",
"react-router-dom": "^6.16.0"
"react-redux": "^9.1.0",
"react-router-dom": "^6.22.2"
},
"peerDependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.23",
"@types/react-dom": "^18.2.8",
"@vitejs/plugin-react": "^4.1.0",
"eslint": "^8.50.0",
"@types/react": "^18.2.56",
"@types/react-dom": "^18.2.19",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.9"
"eslint-plugin-react-refresh": "^0.4.5",
"vite": "^5.1.4"
},
"description": "Componente integrador con SaaS",
"main": "./dist/react-saas.umd.cjs",

View file

@ -21,11 +21,11 @@ const ErrorAlert = ({titulo,texto,align = "center",severity = "error"}) => {
);
};
Error.propTypes={
ErrorAlert.propTypes={
titulo: PropTypes.string.isRequired,
texto: PropTypes.string,
align: PropTypes.string,
severity: PropTypes.string
};
export default ErrorAlert;
export default ErrorAlert;

View file

@ -10,7 +10,7 @@ import Idioma from "./Idioma";
import Tema from "./Tema";
import MainRouter from "./MainRouter";
const InicializarInner = ({devURL,children}) => {
const InicializarInner = ({devURL,basename,children}) => {
const aplicacion = useSelector(store => store.aplicacion);
return (
@ -27,7 +27,11 @@ const InicializarInner = ({devURL,children}) => {
<Error titulo={"saas.inicializar.error.titulo"} texto={"saas.inicializar.error.mensaje"} />
:
<>
<MainRouter devURL={devURL} requiereLogin={aplicacion.instancia.requiereLogin}>
<MainRouter
devURL={devURL}
requiereLogin={aplicacion.instancia.requiereLogin}
basename={basename}
>
{children}
</MainRouter>
<Notificacion />
@ -39,6 +43,7 @@ const InicializarInner = ({devURL,children}) => {
InicializarInner.propTypes={
devURL: PropTypes.string,
basename: PropTypes.string,
children: PropTypes.element.isRequired
};
@ -48,6 +53,7 @@ const Inicializar = ({
devAuthURL,
messages,
idiomaDefecto,
basename,
children
}) => {
const dispatch = useDispatch();
@ -59,7 +65,10 @@ const Inicializar = ({
return (
<Idioma messages={messages} idiomaDefecto={idiomaDefecto}>
<Tema>
<InicializarInner devURL={devAuthURL}>
<InicializarInner
devURL={devAuthURL}
basename={basename}
>
{children}
</InicializarInner>
</Tema>
@ -73,7 +82,8 @@ Inicializar.propTypes={
devAuthURL: PropTypes.string,
messages: PropTypes.object.isRequired,
idiomaDefecto: PropTypes.string,
basename: PropTypes.string,
children: PropTypes.element.isRequired
};
export default Inicializar;
export default Inicializar;

View file

@ -22,8 +22,13 @@ RequiereAuth.propTypes={
children: PropTypes.element.isRequired
};
const MainRouter = ({devURL,requiereLogin,children}) => (
<BrowserRouter>
const MainRouter = ({
devURL,
requiereLogin,
basename,
children
}) => (
<BrowserRouter basename={basename}>
<Routes>
<Route path="/login" element={<Login devURL={devURL} />} />
<Route
@ -42,6 +47,7 @@ const MainRouter = ({devURL,requiereLogin,children}) => (
MainRouter.propTypes={
devURL: PropTypes.string,
requiereLogin: PropTypes.bool,
basename: PropTypes.string,
children: PropTypes.element.isRequired
};

View file

@ -11,6 +11,7 @@ const SaasApp = ({
dev = false,
idiomaDefecto,
messages,
basename,
children
}) => {
return (
@ -21,6 +22,7 @@ const SaasApp = ({
devAuthURL={dev ? devAuthURL : undefined}
idiomaDefecto={idiomaDefecto}
messages={messages}
basename={basename}
>
{children}
</Inicializar>
@ -36,6 +38,7 @@ SaasApp.propTypes={
dev: PropTypes.bool,
idiomaDefecto: PropTypes.string,
messages: PropTypes.object,
basename: PropTypes.string,
children: PropTypes.element.isRequired
};

View file

@ -1,6 +1,6 @@
import {useEffect} from "react";
import {useDispatch,useSelector} from "react-redux";
import {logout, refreshToken} from "../redux";
import {logout,refreshToken} from "../redux";
const useCheckLogin = (devURL) => {
const dispatch = useDispatch();
@ -21,4 +21,4 @@ const useCheckLogin = (devURL) => {
return login.autenticado;
};
export default useCheckLogin;
export default useCheckLogin;

View file

@ -24,6 +24,9 @@ const loginSlice = createSlice({
state.usuario = null;
state.perfiles = [];
state.error = null;
sessionStorage.removeItem("saas-token");
sessionStorage.removeItem("saas-refresh-token");
sessionStorage.removeItem("saas-expiration");
}
},
extraReducers(builder) {
@ -44,6 +47,9 @@ const loginSlice = createSlice({
state.expiracion = expiracion.getTime();
state.usuario = jwtToken.name;
state.perfiles = jwtToken.authorities;
sessionStorage.setItem("saas-token",token);
sessionStorage.setItem("saas-refresh-token",action.payload.refresh_token);
sessionStorage.setItem("saas-expiration",expiracion.getTime());
})
.addCase(requestToken.rejected,(state,action) => {
console.log(action);
@ -55,6 +61,9 @@ const loginSlice = createSlice({
state.usuario = null;
state.perfiles = [];
state.error = action.error?.message;
sessionStorage.removeItem("saas-token");
sessionStorage.removeItem("saas-refresh-token");
sessionStorage.removeItem("saas-expiration");
})
.addCase(refreshToken.pending,state => {
state.cargando = true;
@ -65,6 +74,9 @@ const loginSlice = createSlice({
state.token = action.payload.access_token;
state.refreshToken = action.payload.refresh_token;
state.expiracion = expiracion.getTime();
sessionStorage.setItem("saas-token",action.payload.access_token);
sessionStorage.setItem("saas-refresh-token",action.payload.refresh_token);
sessionStorage.setItem("saas-expiration",expiracion.getTime());
})
.addCase(refreshToken.rejected,(state,action) => {
state.cargando = false;
@ -75,6 +87,9 @@ const loginSlice = createSlice({
state.usuario = null;
state.perfiles = [];
state.error = action.error?.message;
sessionStorage.removeItem("saas-token");
sessionStorage.removeItem("saas-refresh-token");
sessionStorage.removeItem("saas-expiration");
});
}
});
@ -97,4 +112,4 @@ export const getUsuario=state => state.login.usuario;
export const getPerfiles=state => state.login.perfiles;
export default loginSlice.reducer;
export default loginSlice.reducer;