richie-education 3.3.2-dev4 → 3.3.2-dev6

package/js/api/lms/openedx-hawthorn.spec.ts

@@ -170,7 +170,7 @@ describe('OpenEdX Hawthorn API', () => {
         );
       });
 
-      it('throws HttpError.localizedMessage on enrollment failure', async () => {
+      it('throws HttpError.localizedMessage on enrollment failure for bad requests', async () => {
         fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, {
           status: HttpStatusCode.BAD_REQUEST,
           body: { localizedMessage: 'You are not authorized to enroll in this course' },
@@ -189,7 +189,7 @@ describe('OpenEdX Hawthorn API', () => {
         );
       });
 
-      it('throws HttpError on enrollment failure when localizedMessage property is not present in the payload', async () => {
+      it('throws HttpError on enrollment failure when localizedMessage property is not present in the payload for bad requests', async () => {
         fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, {
           status: HttpStatusCode.BAD_REQUEST,
           body: { message: 'Bad Request' },
@@ -202,6 +202,38 @@ describe('OpenEdX Hawthorn API', () => {
         ).rejects.toThrow(new HttpError(HttpStatusCode.BAD_REQUEST, 'Bad Request'));
       });
 
+      it('throws HttpError.localizedMessage on enrollment failure for forbidden requests', async () => {
+        fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, {
+          status: HttpStatusCode.FORBIDDEN,
+          body: { localizedMessage: 'You are not authorized to enroll in this course' },
+        });
+
+        await expect(
+          HawthornApi.enrollment.set(`https://demo.endpoint/courses?course_id=${courseId}`, {
+            username,
+          }),
+        ).rejects.toThrow(
+          new HttpError(
+            HttpStatusCode.FORBIDDEN,
+            'Forbidden',
+            'You are not authorized to enroll in this course',
+          ),
+        );
+      });
+
+      it('throws HttpError on enrollment failure when localizedMessage property is not present in the payload for forbidden requests', async () => {
+        fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, {
+          status: HttpStatusCode.FORBIDDEN,
+          body: { message: 'Forbidden' },
+        });
+
+        await expect(
+          HawthornApi.enrollment.set(`https://demo.endpoint/courses?course_id=${courseId}`, {
+            username,
+          }),
+        ).rejects.toThrow(new HttpError(HttpStatusCode.FORBIDDEN, 'Forbidden'));
+      });
+
       it('throws HttpError when response has no json payload', async () => {
         fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, HttpStatusCode.BAD_REQUEST);
 

package/js/api/lms/openedx-hawthorn.ts

@@ -115,7 +115,10 @@ const API = (APIConf: AuthenticationBackend | LMSBackend, options?: APIOptions):
         })
           .then(async (response) => {
             if (response.ok) return response.json();
-            if (response.status === HttpStatusCode.BAD_REQUEST) {
+            if (
+              response.status === HttpStatusCode.BAD_REQUEST ||
+              response.status === HttpStatusCode.FORBIDDEN
+            ) {
               if (response.headers.get('Content-Type') === 'application/json') {
                 const { localizedMessage } = await response.json();
                 throw new HttpError(response.status, response.statusText, localizedMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "3.3.2-dev4",
+  "version": "3.3.2-dev6",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {
@@ -9,6 +9,7 @@
     "extract-translations": "formatjs extract './**/*.ts*' --ignore ./node_modules --ignore './**/*.d.ts' --out-file './i18n/frontend.json' --id-interpolation-pattern '[sha512:contenthash:base64:6]' --format crowdin",
     "compile-translations": "./i18n/compile-translations.js",
     "lint": "eslint . 'js/**/*.ts?(x)'",
+    "prettier-check": "prettier --check 'js/**/*.+(ts|tsx|json|js|jsx)' '*.+(ts|tsx|json|js|jsx)' '**/*.+(css|scss)'",
     "prettier-write": "prettier --write 'js/**/*.+(ts|tsx|json|js|jsx)' '*.+(ts|tsx|json|js|jsx)' '**/*.+(css|scss)'",
     "build-sass": "sass scss/_main.scss ../richie/static/richie/css/main.css --load-path=node_modules",
     "build-sass-production": "sass scss/_main.scss ../richie/static/richie/css/main.css --style=compressed --load-path=node_modules",