nick2432 · nick2432 · Jan 23, 2024 · Dec 5, 2023 · Dec 5, 2023 · Dec 5, 2023
diff --git a/.github/workflows/build_pex.yml b/.github/workflows/build_pex.yml
@@ -21,7 +21,7 @@ jobs:
       pex-file-name: ${{ steps.get-pex-filename.outputs.pex-file-name }}
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}

diff --git a/.github/workflows/build_whl.yml b/.github/workflows/build_whl.yml
@@ -42,7 +42,7 @@ jobs:
       id: yarn-cache-dir-path
       run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
     - name: Cache Node.js modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -53,14 +53,14 @@ jobs:
         yarn --frozen-lockfile
         npm rebuild node-sass
     - name: Cache Python dependencies
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Cache C extensions
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: cext_cache
         key: ${{ runner.os }}-cext-${{ hashFiles('requirements/cext*.txt') }}

diff --git a/.github/workflows/c_extensions.yml b/.github/workflows/c_extensions.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-ext-${{ hashFiles('requirements/*.txt') }}
@@ -76,7 +76,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-no-ext-${{ hashFiles('requirements/*.txt') }}

diff --git a/.github/workflows/check_docs.yml b/.github/workflows/check_docs.yml
@@ -35,7 +35,7 @@ jobs:
       with:
         python-version: 3.9
     - name: pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-docs-${{ hashFiles('requirements/docs.txt') }}

diff --git a/.github/workflows/check_licenses.yml b/.github/workflows/check_licenses.yml
@@ -35,7 +35,7 @@ jobs:
       with:
         node-version: '18.x'
     - name: Cache Node.js modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: '**/node_modules'
         key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/no_zombies.yml b/.github/workflows/no_zombies.yml
@@ -34,7 +34,7 @@ jobs:
       with:
         python-version: '3.11'
     - name: pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-base-${{ hashFiles('requirements/base.txt') }}

diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
@@ -42,7 +42,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install tox
     - name: tox env cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/.tox/py3.9
         key: ${{ runner.os }}-tox-py3.9-${{ hashFiles('requirements/*.txt') }}

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -41,7 +41,7 @@ jobs:
       id: yarn-cache-dir-path
       run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
     - name: Cache Node.js modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -46,7 +46,7 @@ jobs:
         pip install "tox<4"
     - name: tox env cache
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/.tox/py${{ matrix.python-version }}
         key: ${{ runner.os }}-tox-py${{ matrix.python-version }}-${{ hashFiles('requirements/*.txt') }}
@@ -68,7 +68,7 @@ jobs:
         pip install "tox<4"
     - name: tox env cache
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/.tox/py2.7
         key: ${{ runner.os }}-tox-py2.7-${{ hashFiles('requirements/*.txt') }}
@@ -112,7 +112,7 @@ jobs:
         pip install "tox<4"
     - name: tox env cache
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/.tox/py3.9
         key: ${{ runner.os }}-tox-py3.9-${{ hashFiles('requirements/*.txt') }}
@@ -142,7 +142,7 @@ jobs:
         pip install "tox<4"
     - name: tox env cache
       if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/.tox/py${{ matrix.python-version }}
         key: ${{ runner.os }}-tox-py${{ matrix.python-version }}-${{ hashFiles('requirements/*.txt') }}

diff --git a/.github/workflows/yarn.yml b/.github/workflows/yarn.yml
@@ -38,7 +38,7 @@ jobs:
       id: yarn-cache-dir-path
       run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
     - name: Cache Node.js modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

diff --git a/docs/backend_architecture/content/index.rst b/docs/backend_architecture/content/index.rst
@@ -6,7 +6,6 @@ This is a core module found in ``kolibri/core/content``.
 .. toctree::
    :maxdepth: 1
 
-   models
    concepts_and_definitions
    implementation
    api_methods

diff --git a/docs/backend_architecture/content/models.rst b/docs/backend_architecture/content/models.rst
diff --git a/docs/conf.py b/docs/conf.py
@@ -189,7 +189,7 @@ def setup(app):
     # Register the docstring processor with sphinx
     app.connect("autodoc-process-docstring", process_docstring)
     # Add our custom CSS overrides
-    app.add_stylesheet("theme_overrides.css")
+    app.add_css_file("theme_overrides.css")
 
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,

diff --git a/docs/howtos/another_kolibri_instance.md b/docs/howtos/another_kolibri_instance.md
@@ -1,3 +1,5 @@
+# Running another Kolibri instance alongside the development server
+
 This guide will walk you through the process of setting up and running another instance of Kolibri alongside your development server using the `pex` executable.
 
 ## Introduction

diff --git a/docs/howtos/another_kolibri_instance.rst b/docs/howtos/another_kolibri_instance.rst
diff --git a/docs/howtos/installing_pyenv.md b/docs/howtos/installing_pyenv.md
@@ -1,3 +1,5 @@
+## Installing pyenv
+
 ### Prerequisites
 
 [Git](https://git-scm.com/) installed.

diff --git a/docs/howtos/installing_pyenv.rst b/docs/howtos/installing_pyenv.rst
diff --git a/docs/howtos/nodeenv.md b/docs/howtos/nodeenv.md
@@ -1,3 +1,5 @@
+# Using nodeenv
+
 ## Instructions
 Once you've created a python virtual environment, you can use `nodeenv` to install particular versions of node.js within the environment. This allows you to use a different node.js version in the virtual environment than what's available on your host, keep multiple virtual enviroments with different versions of node.js, and to install node.js "global" modules that are only available within the virtual environment.
 

diff --git a/docs/howtos/nodeenv.rst b/docs/howtos/nodeenv.rst
diff --git a/docs/howtos/pyenv_virtualenv.md b/docs/howtos/pyenv_virtualenv.md
@@ -1,3 +1,5 @@
+## Using pyenv-virtualenv
+
 ### Virtual Environments
 
 Virtual environments allow a developer to have an encapsulated Python environment, using a specific version of Python, and with dependencies installed in a way that only affect the virtual environment. This is important as different projects or even different versions of the same project may have different dependencies, and virtual environments allow you to switch between them seamlessly and explicitly.

diff --git a/docs/howtos/pyenv_virtualenv.rst b/docs/howtos/pyenv_virtualenv.rst
diff --git a/kolibri/core/assets/src/composables/useUser.js b/kolibri/core/assets/src/composables/useUser.js
@@ -9,6 +9,7 @@ export default function useUser() {
   const isAdmin = computed(() => store.getters.isAdmin);
   const isSuperuser = computed(() => store.getters.isSuperuser);
   const canManageContent = computed(() => store.getters.canManageContent);
+  const isAppContext = computed(() => store.getters.isAppContext);
 
   return {
     isLearnerOnlyImport,
@@ -18,5 +19,6 @@ export default function useUser() {
     isAdmin,
     isSuperuser,
     canManageContent,
+    isAppContext,
   };
 }
diff --git a/kolibri/core/assets/src/utils/browserInfo.js b/kolibri/core/assets/src/utils/browserInfo.js
@@ -64,30 +64,6 @@ export const os = {
   patch: osVersion[2],
 };
 
-/**
- * Detection of whether an Android device is using WebView based on
- * https://developer.chrome.com/multidevice/user-agent#webview_user_agent
- * First checks for 'wv' (Lolipop+), then for 'Version/x.x'
- */
-const isAndroid = os.name === 'Android';
-export const isAndroidWebView =
-  isAndroid &&
-  (browser.name === 'Chrome Webview' ||
-    (browser.name === 'Chrome' && /Version\/\d+\.\d+/.test(userAgent)));
-
-/**
- * Embedded WebViews on Mac have no app identifier, while all the major browsers do, so check
- * for browser app strings and mark as embedded if none are found.
- */
-const isMac = os.name === 'Mac OS';
-export const isMacWebView =
-  isMac && !(/Safari/.test(userAgent) || /Chrome/.test(userAgent) || /Firefox/.test(userAgent));
-
-/**
- * All web views
- */
-export const isEmbeddedWebView = isAndroidWebView || isMacWebView;
-
 // Check for presence of the touch event in DOM or multi-touch capabilities
 export const isTouchDevice =
   'ontouchstart' in window ||

diff --git a/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue b/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue
@@ -20,12 +20,19 @@
 
 <script>
 
-  import { isEmbeddedWebView } from 'kolibri.utils.browserInfo';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import { getFilePresetString } from './filePresetStrings';
   import { getRenderableFiles } from './utils';
 
   export default {
     name: 'DownloadButton',
+    setup() {
+      const { isAppContext } = useUser();
+
+      return {
+        isAppContext,
+      };
+    },
     props: {
       files: {
         type: Array,
@@ -41,7 +48,7 @@
         return getRenderableFiles(this.files).filter(file => file.preset !== 'exercise');
       },
       canDownload() {
-        return !isEmbeddedWebView && this.downloadableFiles.length;
+        return !this.isAppContext && this.downloadableFiles.length;
       },
       fileOptions() {
         const options = this.files.map(file => {

diff --git a/kolibri/core/assets/src/views/CoreFullscreen.vue b/kolibri/core/assets/src/views/CoreFullscreen.vue
@@ -14,9 +14,6 @@
 <script>
 
   import ScreenFull from 'screenfull';
-  import { isAndroidWebView } from 'kolibri.utils.browserInfo';
-
-  const fullscreenApiIsSupported = ScreenFull.isEnabled && !isAndroidWebView;
 
   const NORMALIZE_FULLSCREEN_CLASS = 'normalize-fullscreen';
   const MIMIC_FULLSCREEN_CLASS = 'mimic-fullscreen';
@@ -32,7 +29,7 @@
     computed: {
       fullscreenClass() {
         if (this.isInFullscreen) {
-          return fullscreenApiIsSupported ? NORMALIZE_FULLSCREEN_CLASS : MIMIC_FULLSCREEN_CLASS;
+          return ScreenFull.isEnabled ? NORMALIZE_FULLSCREEN_CLASS : MIMIC_FULLSCREEN_CLASS;
         }
         return null;
       },
@@ -46,7 +43,7 @@
     },
     mounted() {
       // Catch the use of the esc key to exit fullscreen
-      if (fullscreenApiIsSupported) {
+      if (ScreenFull.isEnabled) {
         ScreenFull.onchange(() => {
           this.isInFullscreen = ScreenFull.isFullscreen;
         });
@@ -60,13 +57,13 @@
         if (!this.toggling) {
           let fullScreenPromise;
           this.toggling = true;
-          if (fullscreenApiIsSupported) {
+          if (ScreenFull.isEnabled) {
             fullScreenPromise = ScreenFull.toggle(this.$refs.fullscreen);
           } else {
             fullScreenPromise = Promise.resolve();
           }
           fullScreenPromise.then(() => {
-            this.isInFullscreen = fullscreenApiIsSupported
+            this.isInFullscreen = ScreenFull.isEnabled
               ? ScreenFull.isFullscreen
               : !this.isInFullscreen;
             this.toggling = false;

diff --git a/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue b/kolibri/core/assets/src/views/sync/SelectDeviceModalGroup/SelectDeviceForm.vue
@@ -10,9 +10,9 @@
     @cancel="$emit('cancel')"
   >
     <template>
-      <p v-if="filterLODAvailable">
+      <!-- <p v-if="filterLODAvailable">
         {{ $tr('lodSubHeader') }}
-      </p>
+      </p> -->
       <p v-if="hasFetched && !devices.length">
         {{ $tr('noDeviceText') }}
       </p>
@@ -387,6 +387,9 @@
         context:
           'Error message that displays when an admin attempts to find a device, but the device is not found.',
       },
+      // TODO Update this string to be more specific that it is 0.15 or greater
+      // once this is done, reinstate the $tr('lodSubHeader') in the template
+      // eslint-disable-next-line kolibri/vue-no-unused-translations
       lodSubHeader: {
         message: 'Select a device with Kolibri version 0.15 to import learner user accounts',
         context:

diff --git a/kolibri/core/auth/api.py b/kolibri/core/auth/api.py
@@ -880,7 +880,11 @@ def create(self, request):
                 ],
                 status=status.HTTP_400_BAD_REQUEST,
             )
-
+        except FacilityUser.MultipleObjectsReturned:
+            # Handle case of multiple matching usernames
+            unauthenticated_user = FacilityUser.objects.get(
+                username__exact=username, facility=facility_id
+            )
         user = authenticate(username=username, password=password, facility=facility_id)
         if user is not None and user.is_active:
             # Correct password, and the user is marked "active"