|
@@ -1,13 +1,15 @@
|
|
|
-/* eslint-disable react/no-danger */
|
|
|
|
|
import React from 'react';
|
|
import React from 'react';
|
|
|
|
|
|
|
|
-import PropTypes from 'prop-types';
|
|
|
|
|
|
|
+import { pathUtils } from '@growi/core';
|
|
|
import { useTranslation } from 'next-i18next';
|
|
import { useTranslation } from 'next-i18next';
|
|
|
|
|
+import PropTypes from 'prop-types';
|
|
|
|
|
+import urljoin from 'url-join';
|
|
|
|
|
|
|
|
|
|
|
|
|
import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
|
|
import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
|
|
|
import AdminOidcSecurityContainer from '~/client/services/AdminOidcSecurityContainer';
|
|
import AdminOidcSecurityContainer from '~/client/services/AdminOidcSecurityContainer';
|
|
|
import { toastSuccess, toastError } from '~/client/util/apiNotification';
|
|
import { toastSuccess, toastError } from '~/client/util/apiNotification';
|
|
|
|
|
+import { useSiteUrl } from '~/stores/context';
|
|
|
|
|
|
|
|
import { withUnstatedContainers } from '../../UnstatedUtils';
|
|
import { withUnstatedContainers } from '../../UnstatedUtils';
|
|
|
|
|
|
|
@@ -33,13 +35,15 @@ class OidcSecurityManagementContents extends React.Component {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
render() {
|
|
render() {
|
|
|
- const { t, adminGeneralSecurityContainer, adminOidcSecurityContainer } = this.props;
|
|
|
|
|
|
|
+ const {
|
|
|
|
|
+ t, adminGeneralSecurityContainer, adminOidcSecurityContainer, siteUrl,
|
|
|
|
|
+ } = this.props;
|
|
|
const { isOidcEnabled } = adminGeneralSecurityContainer.state;
|
|
const { isOidcEnabled } = adminGeneralSecurityContainer.state;
|
|
|
|
|
+ const oidcCallbackUrl = urljoin(pathUtils.removeTrailingSlash(siteUrl), '/passport/oidc/callback');
|
|
|
|
|
|
|
|
return (
|
|
return (
|
|
|
|
|
|
|
|
- <React.Fragment>
|
|
|
|
|
-
|
|
|
|
|
|
|
+ <>
|
|
|
<h2 className="alert-anchor border-bottom">
|
|
<h2 className="alert-anchor border-bottom">
|
|
|
{t('security_setting.OAuth.OIDC.name')}
|
|
{t('security_setting.OAuth.OIDC.name')}
|
|
|
</h2>
|
|
</h2>
|
|
@@ -69,11 +73,11 @@ class OidcSecurityManagementContents extends React.Component {
|
|
|
<input
|
|
<input
|
|
|
className="form-control"
|
|
className="form-control"
|
|
|
type="text"
|
|
type="text"
|
|
|
- value={adminOidcSecurityContainer.state.callbackUrl}
|
|
|
|
|
|
|
+ value={oidcCallbackUrl}
|
|
|
readOnly
|
|
readOnly
|
|
|
/>
|
|
/>
|
|
|
<p className="form-text text-muted small">{t('security_setting.desc_of_callback_URL', { AuthName: 'OAuth' })}</p>
|
|
<p className="form-text text-muted small">{t('security_setting.desc_of_callback_URL', { AuthName: 'OAuth' })}</p>
|
|
|
- {!adminGeneralSecurityContainer.state.appSiteUrl && (
|
|
|
|
|
|
|
+ {(siteUrl == null || siteUrl === '') && (
|
|
|
<div className="alert alert-danger">
|
|
<div className="alert alert-danger">
|
|
|
<i
|
|
<i
|
|
|
className="icon-exclamation"
|
|
className="icon-exclamation"
|
|
@@ -86,7 +90,7 @@ class OidcSecurityManagementContents extends React.Component {
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
{isOidcEnabled && (
|
|
{isOidcEnabled && (
|
|
|
- <React.Fragment>
|
|
|
|
|
|
|
+ <>
|
|
|
|
|
|
|
|
<h3 className="border-bottom">{t('security_setting.configuration')}</h3>
|
|
<h3 className="border-bottom">{t('security_setting.configuration')}</h3>
|
|
|
|
|
|
|
@@ -365,11 +369,11 @@ class OidcSecurityManagementContents extends React.Component {
|
|
|
<input
|
|
<input
|
|
|
className="form-control"
|
|
className="form-control"
|
|
|
type="text"
|
|
type="text"
|
|
|
- defaultValue={adminOidcSecurityContainer.state.callbackUrl || ''}
|
|
|
|
|
|
|
+ defaultValue={oidcCallbackUrl}
|
|
|
readOnly
|
|
readOnly
|
|
|
/>
|
|
/>
|
|
|
<p className="form-text text-muted small">{t('security_setting.desc_of_callback_URL', { AuthName: 'OAuth' })}</p>
|
|
<p className="form-text text-muted small">{t('security_setting.desc_of_callback_URL', { AuthName: 'OAuth' })}</p>
|
|
|
- {!adminGeneralSecurityContainer.state.appSiteUrl && (
|
|
|
|
|
|
|
+ {(siteUrl == null || siteUrl === '') && (
|
|
|
<div className="alert alert-danger">
|
|
<div className="alert alert-danger">
|
|
|
<i
|
|
<i
|
|
|
className="icon-exclamation"
|
|
className="icon-exclamation"
|
|
@@ -437,7 +441,7 @@ class OidcSecurityManagementContents extends React.Component {
|
|
|
</button>
|
|
</button>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- </React.Fragment>
|
|
|
|
|
|
|
+ </>
|
|
|
)}
|
|
)}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -455,7 +459,7 @@ class OidcSecurityManagementContents extends React.Component {
|
|
|
</ol>
|
|
</ol>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- </React.Fragment>
|
|
|
|
|
|
|
+ </>
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -465,11 +469,13 @@ OidcSecurityManagementContents.propTypes = {
|
|
|
t: PropTypes.func.isRequired, // i18next
|
|
t: PropTypes.func.isRequired, // i18next
|
|
|
adminGeneralSecurityContainer: PropTypes.instanceOf(AdminGeneralSecurityContainer).isRequired,
|
|
adminGeneralSecurityContainer: PropTypes.instanceOf(AdminGeneralSecurityContainer).isRequired,
|
|
|
adminOidcSecurityContainer: PropTypes.instanceOf(AdminOidcSecurityContainer).isRequired,
|
|
adminOidcSecurityContainer: PropTypes.instanceOf(AdminOidcSecurityContainer).isRequired,
|
|
|
|
|
+ siteUrl: PropTypes.string,
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const OidcSecurityManagementContentsWrapperFC = (props) => {
|
|
const OidcSecurityManagementContentsWrapperFC = (props) => {
|
|
|
const { t } = useTranslation();
|
|
const { t } = useTranslation();
|
|
|
- return <OidcSecurityManagementContents t={t} {...props} />;
|
|
|
|
|
|
|
+ const { data: siteUrl } = useSiteUrl();
|
|
|
|
|
+ return <OidcSecurityManagementContents t={t} {...props} siteUrl={siteUrl} />;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const OidcSecurityManagementContentsWrapper = withUnstatedContainers(OidcSecurityManagementContentsWrapperFC, [
|
|
const OidcSecurityManagementContentsWrapper = withUnstatedContainers(OidcSecurityManagementContentsWrapperFC, [
|