read configs from env
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import React, {createContext, useEffect, useMemo, useState} from "react";
|
||||
import { UserManager } from "oidc-client-ts";
|
||||
import {appConfig} from "./confs/appConfig";
|
||||
import config from "./config";
|
||||
|
||||
|
||||
export const AuthContext = createContext({
|
||||
@@ -14,10 +14,7 @@ const AuthProvider = ({ children }) => {
|
||||
const [user, setUser] = useState(null);
|
||||
const [roles, setRoles] = useState([]);
|
||||
const userManager =
|
||||
useMemo(() => new UserManager(appConfig.oidcConfig), []);
|
||||
|
||||
|
||||
//new UserManager(appConfig.oidcConfig);
|
||||
useMemo(() => new UserManager(config.OIDC_CONFIG), []);
|
||||
|
||||
useEffect(() => {
|
||||
userManager.getUser()
|
||||
@@ -25,7 +22,7 @@ const AuthProvider = ({ children }) => {
|
||||
if (user && !user.expired) {
|
||||
setUser(user);
|
||||
localStorage.setItem("accessToken", user.access_token);
|
||||
const clientRoles = user?.profile?.resource_access?.[appConfig.kc_client_id]?.roles || [];
|
||||
const clientRoles = user?.profile?.resource_access?.[config.KC_CLIENT_ID]?.roles || [];
|
||||
setRoles(clientRoles);
|
||||
} else if (user && user.expired) {
|
||||
userManager
|
||||
@@ -34,7 +31,7 @@ const AuthProvider = ({ children }) => {
|
||||
setUser(newUser);
|
||||
localStorage.setItem("accessToken", newUser.access_token);
|
||||
const clientRoles =
|
||||
newUser?.profile?.resource_access?.[appConfig.kc_client_id]?.roles || [];
|
||||
newUser?.profile?.resource_access?.[config.KC_CLIENT_ID]?.roles || [];
|
||||
setRoles(clientRoles);
|
||||
})
|
||||
.catch((err) => {
|
||||
@@ -49,7 +46,7 @@ const AuthProvider = ({ children }) => {
|
||||
.signinRedirect()
|
||||
.catch(
|
||||
(err) => {
|
||||
console.log(appConfig);
|
||||
console.log(config);
|
||||
console.log(err);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user