Moodle

Review SQL statement in login/token.php and remove unneeded join and selects

Details

  • Type: Sub-task Sub-task
  • Status: Closed Closed
  • Priority: Minor Minor
  • Resolution: Fixed
  • Affects Version/s: 2.2
  • Fix Version/s: 2.2
  • Component/s: Web Services
  • Labels:
    None
  • Testing Instructions:
    Hide

    1- create a web service (enabled and authorised for a specific username)
    2- in the mysql/postgres 'external_services' table, set manually the SHORTNAME
    3- Enter in your browser: http://yourmoodle/login/token.php?service=SHORTNAME&username=USERNAME&password=PASSWORD

    //use a no-admin user who has the moodle/webservice:createtoken capability
    a) the user never visited his security keys page (i.e. no token exists for him) and everything is set up correctly => a token is returned
    b) you run a) a new time (so a token has been generated) => the same token is returned.

    Show
    1- create a web service (enabled and authorised for a specific username) 2- in the mysql/postgres 'external_services' table, set manually the SHORTNAME 3- Enter in your browser: http://yourmoodle/login/token.php?service=SHORTNAME&username=USERNAME&password=PASSWORD //use a no-admin user who has the moodle/webservice:createtoken capability a) the user never visited his security keys page (i.e. no token exists for him) and everything is set up correctly => a token is returned b) you run a) a new time (so a token has been generated) => the same token is returned.
  • Affected Branches:
    MOODLE_22_STABLE
  • Fixed Branches:
    MOODLE_22_STABLE
  • Pull from Repository:
  • Pull Master Branch:
  • Pull Master Diff URL:

Description

The SQL statement within login/token.php that is selecting all of the applicable tokens for the user + service joins on the service and then selects several fields from it.
However after the refactoring done in MDL-29716 this join and selects no longer appear to be needed (the service is fetched above and we can use the id from there in the where directly).

Issue Links

has been marked as being related by

Sub-task - Issues are sometimes broken into multiple sub-tasks. MDL-29716 Make token more flexible to support third party client

  • Critical - Crashes server, loss of data, severe memory leak
  • Closed - The issue is considered finished, the resolution is correct. Issues which are closed should not be reopened.

Activity

Ascending order - Click to sort in descending order
Hide
Permalink
Dongsheng Cai added a comment -

Looks good to me

Show
Dongsheng Cai added a comment - Looks good to me
Hide
Permalink
Jérôme Mouneyrac added a comment -

Thanks Dongsheng, submitting for integration.

Show
Jérôme Mouneyrac added a comment - Thanks Dongsheng, submitting for integration.
Hide
Permalink
Eloy Lafuente (stronk7) added a comment -

The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

TIA and ciao

Show
Eloy Lafuente (stronk7) added a comment - The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week. TIA and ciao
Hide
Permalink
Eloy Lafuente (stronk7) added a comment -

Yeah, far better if $service is already there, integrated, thanks!

Show
Eloy Lafuente (stronk7) added a comment - Yeah, far better if $service is already there, integrated, thanks!
Hide
Permalink
Sam Hemelryk added a comment -

Thanks guys - passing this now

Show
Sam Hemelryk added a comment - Thanks guys - passing this now
Hide
Permalink
Eloy Lafuente (stronk7) added a comment -

Yes, you got this finally upstream, just in time for Moodle 2.2beta. Congrats and thanks!

Ciao

Show
Eloy Lafuente (stronk7) added a comment - Yes, you got this finally upstream, just in time for Moodle 2.2beta. Congrats and thanks! Ciao

People

Vote (0)
Watch (0)

Dates

  • Created:
    Updated:
    Resolved: