Handle error state when initial authentication against ReCodEx fails.

Author: krulis-martin

src/components/Groups/CoursesGroupsList/CoursesGroupsList.js

@@ -158,7 +158,7 @@ const CoursesGroupsList = ({
                                   <BindIcon gapRight />
                                   <FormattedMessage
                                     id="app.coursesGroupsList.bind"
-                                    defaultMessage="Bind Existing Group"
+                                    defaultMessage="Bind with Existing Group"
                                   />
                                 </Button>
                               )}

src/locales/cs.json

@@ -47,7 +47,7 @@
   "app.box.highlighterExplanation": "Tento panel je zvýrazněný. Klikněte pro vrácení do normálního stavu.",
   "app.confirm.no": "Ne",
   "app.confirm.yes": "Ano",
-  "app.coursesGroupsList.bind": "Svázat existující skupinu",
+  "app.coursesGroupsList.bind": "Svázat s existující skupinou",
   "app.coursesGroupsList.create": "Vytvořit novou skupinu",
   "app.coursesGroupsList.firstWeekEven": "sudé týdny",
   "app.coursesGroupsList.firstWeekOdd": "liché týdny",
@@ -142,13 +142,14 @@
   "app.homepage.groupsStudentPage": "Připojte se ke skupinám, které odpovídají vašim zapsaným předmětům v SISu.",
   "app.homepage.groupsSuperadminPage": "Správa skupin a jejich atributů na nejvyšší úrovni (dostupné pouze hlavním administrátorům).",
   "app.homepage.groupsTeacherPage": "Vytvořte nebo přiřaďte skupiny pro vaše předměty ze SISu.",
+  "app.homepage.loginFailed": "Ověření uživatele selhalo",
   "app.homepage.processingToken": "Probíhá zpracování přihlašovacího tokenu...",
   "app.homepage.processingTokenFailed": "Autentizační proces selhal.",
   "app.homepage.returnToReCodEx": "Návrat do ReCodExu...",
   "app.homepage.termsPage": "Správa semestrů a jejich souvisejících dat (kdy jsou aktivní pro studenty a učitele).",
   "app.homepage.title": "Rozšíření SIS-CodEx",
   "app.homepage.userPage": "Stránka s osobními údaji umožnujě synchronizovat uživatelský profil (jméno, tituly, email) s daty ze SISu.",
-  "app.homepage.userSessionExpired": "Vaše uživatelská relace vypršela",
+  "app.homepage.userSessionExpired": "Vaše uživatelská relace vypršela nebo jste se odhlásili",
   "app.homepage.userSessionExpiredInfo": "Musíte inicializovat novou relaci opětovným vstupem do této aplikace z ReCodExu.",
   "app.localizedTexts.validation.noLocalizedText": "Prosíme povolte alespoň jednu záložku s lokalizovanými texty.",
   "app.notifications.hideAll": "Pouze nové notifikace",

src/locales/en.json

@@ -47,7 +47,7 @@
   "app.box.highlighterExplanation": "This box is highlighted. Click to restore.",
   "app.confirm.no": "No",
   "app.confirm.yes": "Yes",
-  "app.coursesGroupsList.bind": "Bind Existing Group",
+  "app.coursesGroupsList.bind": "Bind with Existing Group",
   "app.coursesGroupsList.create": "Create New Group",
   "app.coursesGroupsList.firstWeekEven": "even weeks",
   "app.coursesGroupsList.firstWeekOdd": "odd weeks",
@@ -142,13 +142,14 @@
   "app.homepage.groupsStudentPage": "Join groups that correspond to your enrolled courses in SIS.",
   "app.homepage.groupsSuperadminPage": "Management of groups and their attributes at highest level (available to superadmins only).",
   "app.homepage.groupsTeacherPage": "Create or bind groups for your courses in SIS.",
+  "app.homepage.loginFailed": "Authentication process failed",
   "app.homepage.processingToken": "Processing authentication token...",
   "app.homepage.processingTokenFailed": "Authentication process failed.",
   "app.homepage.returnToReCodEx": "Return to ReCodEx...",
   "app.homepage.termsPage": "Management of terms and their related dates (when they are active for students and teachers).",
   "app.homepage.title": "SiS-CodEx Extension",
   "app.homepage.userPage": "The personal data integration page allows updating ReCodEx user profile (name, titles, email) using data from SIS.",
-  "app.homepage.userSessionExpired": "Your user session has expired",
+  "app.homepage.userSessionExpired": "Your user session has expired or you have logged out",
   "app.homepage.userSessionExpiredInfo": "You need to initialize a new session by re-entering this application from ReCodEx.",
   "app.localizedTexts.validation.noLocalizedText": "Please enable at least one tab of localized texts.",
   "app.notifications.hideAll": "Only new notifications",
@@ -267,4 +268,4 @@
   "generic.operationFailed": "The operation has failed",
   "generic.reset": "Reset",
   "generic.save": "Save"
-}
+}

src/pages/Home/Home.js

@@ -23,10 +23,10 @@ import Icon, {
 import Callout from '../../components/widgets/Callout';
 
 import { setLang } from '../../redux/modules/app.js';
-import { login, logout } from '../../redux/modules/auth.js';
+import { login, logout, statusTypes as authStatusTypes } from '../../redux/modules/auth.js';
 import { fetchUserIfNeeded } from '../../redux/modules/users.js';
 import { loggedInUserSelector } from '../../redux/selectors/users.js';
-import { loggedInUserIdSelector } from '../../redux/selectors/auth.js';
+import { loggedInUserIdSelector, loginStatusSelector } from '../../redux/selectors/auth.js';
 
 import { getReturnUrl, setReturnUrl } from '../../helpers/localStorage.js';
 import { knownLocalesNames } from '../../helpers/localizedData.js';
@@ -85,19 +85,27 @@ class Home extends Component {
   render() {
     const {
       loggedInUser,
+      loginStatus,
       params: { token = null },
       links: { USER_URI, TERMS_URI, GROUPS_STUDENT_URI, GROUPS_TEACHER_URI, GROUPS_SUPERADMIN_URI },
     } = this.props;
 
-    if (!loggedInUser && !token) {
+    if (!loggedInUser && (!token || loginStatus === authStatusTypes.LOGIN_FAILED)) {
       return (
         <PageContent
           icon={<HomeIcon />}
           title={<FormattedMessage id="app.homepage.title" defaultMessage="SiS-CodEx Extension" />}
           windowTitle={<FormattedMessage id="app.homepage.title" defaultMessage="SiS-CodEx Extension" />}>
           <Callout variant="warning" className="my-3">
             <h4>
-              <FormattedMessage id="app.homepage.userSessionExpired" defaultMessage="Your user session has expired" />
+              {!token ? (
+                <FormattedMessage
+                  id="app.homepage.userSessionExpired"
+                  defaultMessage="Your user session has expired or you have logged out"
+                />
+              ) : (
+                <FormattedMessage id="app.homepage.loginFailed" defaultMessage="Authentication process failed" />
+              )}
             </h4>
             <p>
               <FormattedMessage
@@ -342,6 +350,7 @@ Home.propTypes = {
   }),
   loggedInUserId: PropTypes.string,
   loggedInUser: ImmutablePropTypes.map,
+  loginStatus: PropTypes.string,
   loadAsync: PropTypes.func.isRequired,
   setLang: PropTypes.func.isRequired,
   login: PropTypes.func.isRequired,
@@ -353,6 +362,7 @@ export default connect(
   state => ({
     loggedInUserId: loggedInUserIdSelector(state),
     loggedInUser: loggedInUserSelector(state),
+    loginStatus: loginStatusSelector(state),
   }),
   dispatch => ({
     loadAsync: userId => Home.loadAsync({ userId }, dispatch),

src/redux/selectors/auth.js

@@ -15,7 +15,7 @@ export const accessTokenExpiration = createSelector(accessTokenSelector, token =
 );
 export const loggedInUserIdSelector = createSelector(getAuth, getLoggedInUserId);
 
-export const loginStatusSelector = createSelector(getAuth, auth => auth.getIn(['status']));
+export const loginStatusSelector = createSelector(getAuth, auth => auth.getIn(['status', 'recodex']));
 
 export const loginErrorSelector = createSelector(getAuth, auth => auth.getIn(['errors', 'recodex'])?.toJS() || null);