Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit b5e428f

Browse files
authored
Merge pull request #894 from openedx/zamir/VAN-315/add_frontend_app_authn
feat: add frontend app authn
2 parents 73060b2 + 139fca1 commit b5e428f

5 files changed

Lines changed: 32 additions & 5 deletions

File tree

README.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ Instead of a service name or list, you can also run commands like ``make dev.pro
308308
+------------------------------------+-------------------------------------+----------------+--------------+
309309
| `frontend-app-gradebook`_ | http://localhost:1994/ | MFE (React.js) | Default |
310310
+------------------------------------+-------------------------------------+----------------+--------------+
311+
| `frontend-app-authn`_ | http://localhost:1999/ | MFE (React.js) | Default |
312+
+------------------------------------+-------------------------------------+----------------+--------------+
311313
| `registrar`_ | http://localhost:18734/api-docs/ | Python/Django | Extra |
312314
+------------------------------------+-------------------------------------+----------------+--------------+
313315
| `frontend-app-program-console`_ | http://localhost:1976/ | MFE (React.js) | Extra |
@@ -331,7 +333,7 @@ Instead of a service name or list, you can also run commands like ``make dev.pro
331333

332334
Some common service combinations include:
333335

334-
* ``lms``: LMS, along with dependencies ``forum``, ``discovery``, and some databases
336+
* ``lms``: LMS, along with dependencies ``forum``, ``discovery``, ``Authn`` and some databases
335337
* ``ecommerce``: Ecommerce, but also LMS as a dependency (for auth)
336338
* ``studio+credentials``: Services can be combined to affect both at once
337339

@@ -352,6 +354,7 @@ Some common service combinations include:
352354
.. _frontend-app-library-authoring: https://github.com/edx/frontend-app-library-authoring
353355
.. _frontend-app-course-authoring: https://github.com/edx/frontend-app-course-authoring
354356
.. _frontend-app-account: https://github.com/edx/frontend-app-account
357+
.. _frontend-app-authn: https://github.com/openedx/frontend-app-authn
355358
.. _xqueue: https://github.com/edx/xqueue
356359
.. _coursegraph: https://github.com/edx/edx-platform/tree/master/openedx/core/djangoapps/coursegraph
357360
.. _frontend-app-ora-grading: https://github.com/edx/frontend-app-ora-grading

docker-compose-host.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ services:
6565
- frontend_app_account_node_modules:/edx/app/frontend-app-account/node_modules
6666
- ${DEVSTACK_WORKSPACE}/src:/edx/app/src
6767

68+
frontend-app-authn:
69+
volumes:
70+
- ${DEVSTACK_WORKSPACE}/frontend-app-authn:/edx/app/frontend-app-authn
71+
- frontend_app_authn_node_modules:/edx/app/frontend-app-authn/node_modules
72+
- ${DEVSTACK_WORKSPACE}/src:/edx/app/src
73+
6874
frontend-app-course-authoring:
6975
volumes:
7076
- ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring
@@ -115,6 +121,7 @@ volumes:
115121
edxapp_node_modules:
116122
edxapp_uploads:
117123
frontend_app_account_node_modules:
124+
frontend_app_authn_node_modules:
118125
frontend_app_course_authoring_node_modules:
119126
frontend_app_gradebook_node_modules:
120127
frontend_app_ora_grading_node_modules:

docker-compose.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ services:
418418
- memcached
419419
- mongo
420420
- mysql57
421+
- frontend-app-authn
421422
# Allows attachment to the LMS service using 'docker attach <containerID>'.
422423
stdin_open: true
423424
tty: true
@@ -428,6 +429,7 @@ services:
428429
EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
429430
NO_PYTHON_UNINSTALL: 1
430431
DJANGO_WATCHMAN_TIMEOUT: 30
432+
EDXAPP_ENABLE_AUTHN_MFE: 1
431433
image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
432434
networks:
433435
default:
@@ -492,7 +494,7 @@ services:
492494
- "19001:19001"
493495
volumes:
494496
- /edx/var/analyticsapi
495-
497+
496498
registrar:
497499
command: bash -c 'source /edx/app/registrar/registrar_env && while true; do python /edx/app/registrar/registrar/manage.py runserver 0.0.0.0:18734; sleep 2; done'
498500
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.registrar"
@@ -652,6 +654,19 @@ services:
652654
depends_on:
653655
- lms
654656

657+
frontend-app-authn:
658+
extends:
659+
file: microfrontend.yml
660+
service: microfrontend
661+
working_dir: '/edx/app/frontend-app-authn'
662+
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-authn"
663+
networks:
664+
default:
665+
aliases:
666+
- edx.devstack.frontend-app-authn
667+
ports:
668+
- "1999:1999"
669+
655670
frontend-app-course-authoring:
656671
extends:
657672
file: microfrontend.yml
@@ -681,7 +696,7 @@ services:
681696
- "1994:1994"
682697
depends_on:
683698
- lms
684-
699+
685700
frontend-app-ora-grading:
686701
extends:
687702
file: microfrontend.yml

options.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ ALWAYS_CACHE_PROGRAMS ?= false
6161
# The current value was chosen such that it would not change the existing
6262
# Devstack behavior.
6363
DEFAULT_SERVICES ?= \
64-
credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-gradebook+frontend-app-payment+frontend-app-publisher+frontend-app-learning+lms+studio
64+
credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-authn+frontend-app-gradebook+frontend-app-payment+frontend-app-publisher+frontend-app-learning+lms+studio
6565

6666
# All edX services, whether or not they are run by default.
6767
# Separated by plus signs.
6868
# Separated by plus signs. Listed in alphabetical order for clarity.
6969
EDX_SERVICES ?= \
70-
analyticsapi+credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms_watcher+registrar+registrar-worker+studio+studio_watcher+xqueue+xqueue_consumer
70+
analyticsapi+credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms_watcher+registrar+registrar-worker+studio+studio_watcher+xqueue+xqueue_consumer
7171

7272
# Services with database migrations.
7373
# Should be a subset of $(EDX_SERVICES).

repo.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ repos=(
3838
)
3939

4040
non_release_repos=(
41+
"https://github.com/openedx/frontend-app-authn.git"
4142
"https://github.com/edx/frontend-app-course-authoring.git"
4243
"https://github.com/edx/frontend-app-learning.git"
4344
"https://github.com/edx/frontend-app-library-authoring.git"
@@ -65,6 +66,7 @@ ssh_repos=(
6566
)
6667

6768
non_release_ssh_repos=(
69+
"git@github.com:openedx/frontend-app-authn.git"
6870
"git@github.com:edx/frontend-app-course-authoring.git"
6971
"git@github.com:edx/frontend-app-learning.git"
7072
"git@github.com:edx/frontend-app-library-authoring.git"

0 commit comments

Comments
 (0)