Fix currentApiClient return type to include undefined
This commit is contained in:
@@ -128,8 +128,8 @@ const ConnectionRequired: FunctionComponent<ConnectionRequiredProps> = ({
|
||||
// If this is an admin route, ensure the user has access
|
||||
if (isAdminRequired) {
|
||||
try {
|
||||
const user = await client.getCurrentUser();
|
||||
if (!user.Policy?.IsAdministrator) {
|
||||
const user = await client?.getCurrentUser();
|
||||
if (!user?.Policy?.IsAdministrator) {
|
||||
console.warn('[ConnectionRequired] normal user attempted to access admin route');
|
||||
bounce(await ServerConnections.connect());
|
||||
return;
|
||||
|
||||
@@ -88,7 +88,7 @@ class ServerConnections extends ConnectionManager {
|
||||
|
||||
/**
|
||||
* Gets the ApiClient that is currently connected.
|
||||
* @returns {ApiClient} apiClient
|
||||
* @returns {ApiClient|undefined} apiClient
|
||||
*/
|
||||
currentApiClient() {
|
||||
let apiClient = this.getLocalApiClient();
|
||||
|
||||
@@ -34,7 +34,7 @@ const ServerContentPage: FunctionComponent<ServerContentPageProps> = ({ view })
|
||||
const apiClient = ServerConnections.currentApiClient();
|
||||
|
||||
// Fetch the view html from the server and translate it
|
||||
const viewHtml = await apiClient.get(apiClient.getUrl(view + location.search))
|
||||
const viewHtml = await apiClient?.get(apiClient.getUrl(view + location.search))
|
||||
.then((html: string) => globalize.translateHtml(html));
|
||||
|
||||
viewManager.loadView({
|
||||
|
||||
@@ -23,7 +23,7 @@ export const ApiProvider: FC = ({ children }) => {
|
||||
|
||||
useEffect(() => {
|
||||
ServerConnections.currentApiClient()
|
||||
.getCurrentUser()
|
||||
?.getCurrentUser()
|
||||
.then(newUser => updateApiUser(undefined, newUser))
|
||||
.catch(err => {
|
||||
console.info('[ApiProvider] Could not get current user', err);
|
||||
|
||||
@@ -71,7 +71,7 @@ class Manager {
|
||||
|
||||
/**
|
||||
* Update active ApiClient.
|
||||
* @param {Object} apiClient The ApiClient.
|
||||
* @param {ApiClient|undefined} apiClient The ApiClient.
|
||||
*/
|
||||
updateApiClient(apiClient) {
|
||||
if (!apiClient) {
|
||||
|
||||
Reference in New Issue
Block a user