update success message

packages/app/src/components/InvitedForm.tsx

@@ -18,6 +18,7 @@ export const InvitedForm = (props: InvitedFormProps): JSX.Element => {
   const { t } = useTranslation();
   const router = useRouter();
   const { data: user } = useCurrentUser();
+  const [loginSuccess, setLoginSuccess] = useState<boolean>(false);
   const [loginErrors, setLoginErrors] = useState<Error[]>([]);
 
   const { invitedFormUsername, invitedFormName } = props;
@@ -41,6 +42,7 @@ export const InvitedForm = (props: InvitedFormProps): JSX.Element => {
 
     try {
       const res = await apiv3Post('/invited', { invitedForm });
+      setLoginSuccess(true);
       const { redirectTo } = res.data;
       router.push(redirectTo);
     }
@@ -50,6 +52,15 @@ export const InvitedForm = (props: InvitedFormProps): JSX.Element => {
   }, [router]);
 
   const formNotification = useCallback(() => {
+
+    if (loginSuccess) {
+      return (
+        <p className="alert alert-success">
+          <strong>{ t('message.successfully_connected') }</strong><br></br>
+        </p>
+      );
+    }
+
     return (
       <>
         { loginErrors != null && loginErrors.length > 0 ? (
@@ -66,7 +77,7 @@ export const InvitedForm = (props: InvitedFormProps): JSX.Element => {
         ) }
       </>
     );
-  }, [loginErrors, t]);
+  }, [loginSuccess, loginErrors, t]);
 
   if (user == null) {
     return <></>;

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

@@ -102,7 +102,7 @@ module.exports = function(crowi, app) {
     });
 
     // check for redirection to '/invited'
-    const redirectTo = req.user.status === User.STATUS_INVITED ? '/invited' : req.session;
+    const redirectTo = req.user.status === User.STATUS_INVITED ? '/invited' : req.session.redirectTo;
 
     // remove session.redirectTo
     delete req.session.redirectTo;

packages/app/src/server/routes/login.js

@@ -89,7 +89,7 @@ module.exports = function(crowi, app) {
   };
 
   actions.preLogin = function(req, res, next) {
-    // // user has already logged in
+    // user has already logged in
     // const { user } = req;
     // if (user != null && user.status === User.STATUS_ACTIVE) {
     //   const { redirectTo } = req.session;