Merge branch 'dev' into enable-ROPC-via-broker

Author: fengga

msal/application.py

@@ -624,8 +624,12 @@ def _decorate_scope(
             # We could make the developer pass these and then if they do they will
             # come back asking why they don't see refresh token or user information.
             raise ValueError(
-                "API does not accept {} value as user-provided scopes".format(
-                    reserved_scope))
+                """You cannot use any scope value that is reserved.
+Your input: {}
+The reserved list: {}""".format(list(scope_set), list(reserved_scope)))
+            raise ValueError(
+                "You cannot use any scope value that is in this reserved list: {}".format(
+                    list(reserved_scope)))
 
         # client_id can also be used as a scope in B2C
         decorated = scope_set | reserved_scope

tests/test_e2e.py

@@ -507,12 +507,8 @@ class LabBasedTestCase(E2eTestCase):
     @classmethod
     def setUpClass(cls):
         # https://docs.msidlab.com/accounts/apiaccess.html#code-snippet
-        try:
-            cls.session = get_session(get_lab_app(), ["https://msidlab.com/.default"])
-        except LabTokenError:
-            cls.session = get_session(get_lab_app(), [
-                # A lab change since June 10, 2024 which may or may not be reverted
-                "https://request.msidlab.com/.default",
+        cls.session = get_session(get_lab_app(), [
+                "https://request.msidlab.com/.default",  # A lab change since June 10, 2024
             ])
 
     @classmethod