Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attempting to merge app-support into develop #7010

Merged
merged 40 commits into from
Jun 10, 2020

Conversation

indirectlylit
Copy link
Contributor

@indirectlylit indirectlylit commented Jun 9, 2020

Summary

conflicts:

  • kolibri/plugins/user/kolibri_plugin.py
  • kolibri/plugins/user/assets/src/views/SignInPage/UsersList.vue added in remotes/le/app-support inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to kolibri/plugins/user/assets/src/views/UsersList.vue
  • kolibri/plugins/user/assets/src/views/SignInPage.vue
  • kolibri/plugins/learn/assets/src/views/LearnIndex.vue
  • kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
  • kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/index.vue
  • kolibri/deployment/default/dev_urls.py
  • kolibri/core/device/models.py
  • kolibri/core/auth/api.py
  • kolibri/core/assets/src/views/userAccounts/PasswordTextbox.vue

Reviewer guidance

everything check out and work?


Contributor Checklist

PR process:

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Testing:

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

Reviewer Checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

kollivier and others added 30 commits May 18, 2020 14:32
Fix for mount point detection on Android with latest toolchain.
…device_settings

Remote access device settings changes
…t-users-in-app-context

List Users Login Flow in App Context
nucleogenesis and others added 3 commits June 8, 2020 12:50
# Conflicts:
#	kolibri/core/assets/src/views/userAccounts/PasswordTextbox.vue
#	kolibri/core/auth/api.py
#	kolibri/core/device/models.py
#	kolibri/deployment/default/dev_urls.py
#	kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/index.vue
#	kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
#	kolibri/plugins/learn/assets/src/views/LearnIndex.vue
#	kolibri/plugins/user/assets/src/views/SignInPage.vue
#	kolibri/plugins/user/assets/src/views/UsersList.vue
#	kolibri/plugins/user/kolibri_plugin.py
@indirectlylit indirectlylit added this to the 0.14.0 milestone Jun 9, 2020
@indirectlylit indirectlylit added the TODO: needs review Waiting for review label Jun 9, 2020
@codecov
Copy link

codecov bot commented Jun 9, 2020

Codecov Report

Merging #7010 into develop will decrease coverage by 0.10%.
The diff coverage is 26.92%.

Impacted Files Coverage Δ
...ibri/core/assets/src/state/modules/core/actions.js 22.84% <0.00%> (-2.24%) ⬇️
...ri/core/assets/src/state/modules/core/mutations.js 38.88% <0.00%> (-2.29%) ⬇️
.../assets/src/views/userAccounts/PasswordTextbox.vue 58.53% <0.00%> (-6.33%) ⬇️
kolibri/core/device/serializers.py 88.73% <ø> (ø)
kolibri/core/discovery/utils/filesystem/posix.py 57.28% <0.00%> (ø)
kolibri/deployment/default/dev_urls.py 0.00% <ø> (ø)
kolibri/deployment/default/urls.py 93.33% <ø> (ø)
...ach/assets/src/views/plan/CreateExamPage/index.vue 0.00% <ø> (ø)
...vice/assets/src/views/DeviceSettingsPage/index.vue 0.00% <0.00%> (ø)
...gins/learn/assets/src/modules/coreLearn/actions.js 25.64% <0.00%> (-0.68%) ⬇️
... and 17 more

@nucleogenesis
Copy link
Member

DeviceNotProvisioned at /en/user/
No exception message supplied

After starting the server with a new KOLIBRI_HOME I refreshed at /en/user and it did not redirect me to Setup Wizard as expected.

@nucleogenesis
Copy link
Member

Not sure if it is intentional but /app/api/initialize no longer works even when logged in I get a 403.

@nucleogenesis
Copy link
Member

nucleogenesis commented Jun 9, 2020

Bug (Fixed)

On a multiple-facility device:

  • Login as superadmin
  • Facility -> [select a facility that isn't the first one on your device] -> Users
  • Create a few users
  • After one or two users, you'll see that you created a user for the wrong facility now after the first one or two were in the facility that you had selected.

@jredrejo
Copy link
Member

Not sure if it is intentional but /app/api/initialize no longer works even when logged in I get a 403.

@nucleogenesis

/app/api/initialize has never worked, the right url is /app/api/initialize/<token>
Example:
http://localhost:8000/app/api/initialize/01f5bcbe590b45e987ae0471c002ec47

To get the token, from a kolibri shell:

from kolibri.core.device.models import DeviceAppKey
DeviceAppKey.get_app_key()

@indirectlylit indirectlylit deleted the merge-app branch June 10, 2020 23:57
@jonboiser jonboiser removed the TODO: needs review Waiting for review label Jun 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants