Fixes bug where the online licensing screen would hang indefinitely when a user is not licensed for the release of MATLAB being started.

Author: krisctl

gui/src/components/Information/index.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 The MathWorks, Inc.
+// Copyright (c) 2020-2023 The MathWorks, Inc.
 
 import React, { useRef, useState } from 'react';
 import PropTypes from 'prop-types';
@@ -66,7 +66,7 @@ function Information({
         <div className="error-container alert alert-danger">
             <p><strong>Error</strong></p>
             <Linkify>
-                <div className="error-text">{error.message}</div>
+                <div className="error-text"><pre style={{backgroundColor: 'hsla(0,0%,100%,0)', border: 'none', fontFamily: 'inherit', fontSize: '15px'}}>{error.message}</pre></div>
             </Linkify>
         </div>
     ) : null;

gui/src/selectors/index.js

@@ -111,10 +111,11 @@ export const selectLicensingMhlmUsername = createSelector(
     (licensingInfo, isMhlm) => isMhlm ? licensingInfo.emailAddress : ''
 );
 
+// Selector to check if the license type is mhlm and entitlements property is not empty
 export const selectLicensingMhlmHasEntitlements = createSelector(
     selectLicensingIsMhlm,
     selectLicensingInfo,
-    (isMhlm, licensingInfo) => isMhlm && licensingInfo.entitlements
+    (isMhlm, licensingInfo) => isMhlm && licensingInfo.entitlements && licensingInfo.entitlements.length > 0
 );
 
 export const selectIsEntitled = createSelector(
@@ -124,7 +125,7 @@ export const selectIsEntitled = createSelector(
 );
 
 // TODO Are these overkill? Perhaps just selecting status would be enough
-// TODO Could be used for detected intermedia failures, such as server being
+// TODO Could be used for detected intermediate failures, such as server being
 // temporarily inaccessible
 export const selectMatlabPending = createSelector(
     selectMatlabStatus,

matlab_proxy/app_state.py

@@ -446,6 +446,17 @@ async def update_entitlements(self):
             self.licensing["profile_id"] = None
             self.licensing["entitlements"] = []
             self.licensing["entitlement_id"] = None
+            # To ensure that any entitlement errors are displayed on the control panel,
+            # the function returns true. The cached license file only contains the license type
+            # and the user's email address. These two attributes are necessary for preventing
+            # the LicenseGatherer step from becoming stuck on the front-end side.
+            # Additionally, displaying the license type and user email address on the
+            # information panel makes it worthwhile to maintain these attributes in the state.
+            return True
+
+        except OnlineLicensingError as e:
+            self.error = e
+            log_error(logger, e)
             return False
 
         # Keeping base error class at the last to catch any uncaught licensing related issues

matlab_proxy/util/mw.py

@@ -69,7 +69,7 @@ async def fetch_entitlements(mhlm_api_endpoint, access_token, matlab_release):
 
             if entitlement_el is None or len(entitlement_el) == 0:
                 raise EntitlementError(
-                    f"Your MathWorks account is not linked to a valid license for MATLAB {matlab_release}."
+                    f"Your MathWorks account is not linked to a valid license for MATLAB {matlab_release}.\nSign out and login with a licensed user."
                 )
 
             entitlements = entitlement_el.findall("entitlement")