itizawa 6 лет назад
Родитель
Сommit
a2bf616ff8

+ 1 - 1
src/client/js/app.jsx

@@ -234,7 +234,7 @@ if (adminSecuritySettingElem != null) {
     adminGoogleSecurityContainer, adminGithubSecurityContainer, adminTwitterSecurityContainer,
   ];
   ReactDOM.render(
-    <Provider inject={[injectableContainers, adminSecurityContainers]}>
+    <Provider inject={Object.assign(injectableContainers, adminSecurityContainers)}>
       <I18nextProvider i18n={i18n}>
         <SecurityManagement />
       </I18nextProvider>

+ 1 - 1
src/client/js/services/AdminGeneralSecurityContainer.js

@@ -19,7 +19,7 @@ export default class AdminGeneralSecurityContainer extends Container {
     this.state = {
       // TODO GW-583 set value
       useOnlyEnvVarsForSomeOptions: true,
-      appSiteUrl: '',
+      appSiteUrl: appContainer.config.crowi.url || '',
       isLocalEnabled: true,
       registrationMode: 'open',
       registrationWhiteList: '',

+ 2 - 2
src/client/js/services/AdminTwitterSecurityContainer.js

@@ -1,7 +1,7 @@
 import { Container } from 'unstated';
 
 import loggerFactory from '@alias/logger';
-// import { pathUtils } from 'growi-commons';
+import { pathUtils } from 'growi-commons';
 
 // eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:security:AdminTwitterSecurityContainer');
@@ -18,7 +18,7 @@ export default class AdminTwitterSecurityContainer extends Container {
     this.appContainer = appContainer;
 
     this.state = {
-      // callbackUrl: `${pathUtils.removeTrailingSlash(appContainer.config.crowi.url)}/passport/twitter/callback`,
+      callbackUrl: `${pathUtils.removeTrailingSlash(appContainer.config.crowi.url)}/passport/twitter/callback`,
       twitterConsumerId: '',
       twitterConsumerSecret: '',
       isSameUsernameTreatedAsIdenticalUser: true,