소스 검색

loginError -> externalAccountLoginError

Shun Miyazawa 3 년 전
부모
커밋
58f8e81796
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 6 6
      packages/app/src/pages/login.page.tsx
  2. 1 1
      packages/app/src/server/routes/login-passport.js

+ 6 - 6
packages/app/src/pages/login.page.tsx

@@ -31,7 +31,7 @@ type Props = CommonProps & {
   isLdapSetupFailed: boolean,
   isPasswordResetEnabled: boolean,
   isEmailAuthenticationEnabled: boolean,
-  loginError?: IExternalAccountLoginError,
+  externalAccountLoginError?: IExternalAccountLoginError,
 };
 
 const LoginPage: NextPage<Props> = (props: Props) => {
@@ -56,7 +56,7 @@ const LoginPage: NextPage<Props> = (props: Props) => {
         isPasswordResetEnabled={props.isPasswordResetEnabled}
         isMailerSetup={props.isMailerSetup}
         registrationMode={props.registrationMode}
-        loginError={props.loginError}
+        externalAccountLoginError={props.externalAccountLoginError}
       />
     </NoLoginLayout>
   );
@@ -123,10 +123,10 @@ export const getServerSideProps: GetServerSideProps = async(context: GetServerSi
 
   const props: Props = result.props as Props;
 
-  if (context.query.loginError != null) {
-    const loginError = context.query.loginError;
-    if (isExternalAccountLoginError(loginError)) {
-      props.loginError = { ...loginError as IExternalAccountLoginError };
+  if (context.query.externalAccountLoginError != null) {
+    const externalAccountLoginError = context.query.externalAccountLoginError;
+    if (isExternalAccountLoginError(externalAccountLoginError)) {
+      props.externalAccountLoginError = { ...externalAccountLoginError as IExternalAccountLoginError };
     }
   }
 

+ 1 - 1
packages/app/src/server/routes/login-passport.js

@@ -164,7 +164,7 @@ module.exports = function(crowi, app) {
 
     const { nextApp } = crowi;
     req.crowi = crowi;
-    nextApp.render(req, res, '/login', { loginError: error });
+    nextApp.render(req, res, '/login', { externalAccountLoginError: error });
     return;
   };