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.

Sign up for GitHub

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

Jump to bottom

D10 main #267

Draft
wants to merge 117 commits into
base: master
Choose a base branch
from
Draft

D10 main #267

wants to merge 117 commits into from

Conversation

burnout87
Copy link
Collaborator

No description provided.

@burnout87
Copy link
Collaborator Author

With the work of the last days, the API token form is now working (the email sending needs to be tested):

image

The module jwt_link is currently not available for Druapl 10, we use this in Drupal 7 to se the fields we want to include in the token. So, for now, these are set directly in the code of the mmoda module:

mmoda-frontend-module/mmoda.module

Lines 132 to 155 in e0bb29b

case 'jwt-token':
if (\Drupal::currentUser()->isAuthenticated()) {
$jwt_auth_service = \Drupal::service('jwt.authentication.jwt');
$jwt_encoded_token = $jwt_auth_service->generateToken();
\Drupal::logger('mmoda_module')->log(RfcLogLevel::INFO, 'jwt_encoded_token: @jwt_encoded_token', ['@jwt_encoded_token' => print_r($jwt_encoded_token, TRUE)]);
$jwt_transcoder_service = \Drupal::service('jwt.transcoder');
$jwt_decoded_token = $jwt_transcoder_service->decode($jwt_encoded_token);
$jwt_decoded_token -> setClaim('sub', $user->get('mail')->value);
$jwt_decoded_token -> setClaim('email', $user->get('mail')->value);
$jwt_decoded_token -> setClaim('name', $user->get('name')->value);
$jwt_decoded_token -> setClaim('roles', $user->getRoles());
if($is_mxroomid_empty)
unset($jwt_decoded_token -> mxroomid);
else
$jwt_decoded_token -> setClaim('field_matrix_room_id', $maxroomid_field->getValue()[0]['value']);
\Drupal::logger('mmoda_module')->log(RfcLogLevel::INFO, 'jwt_decoded_token: @jwt_decoded_token', ['@jwt_decoded_token' => print_r($jwt_decoded_token->getPayload(), TRUE)]);
$jwt_encoded_token_updated = $jwt_transcoder_service->encode($jwt_decoded_token);
$replacements[$original . '_updated'] = $jwt_encoded_token_updated;

Hopefully the module will be soon available also for Drupal 10, making our life easier.

Finally, the token structure is also slightly different:

eg

{
  "iat": 1725447485,
  "exp": 1725451085,
  "drupal": {
    "uid": "1"
  },
  "sub": "[email protected]",
  "email": "[email protected]",
  "name": "sitamin",
  "roles": [
    "authenticated",
    "administrator",
    "integral_private_qla",
    "unige_hpc_full"
  ],
  "field_matrix_room_id": "asd"
}

But afetr some test, it seems like it is still compatible with the dispatcher

@burnout87
Copy link
Collaborator Author

Something to keep in mind when the Drupal 10 instance will be deployed, the current key is not compatible:

image

burnout87 and others added 30 commits November 28, 2024 13:29
@burnout87
template position return progress link button
becf22c
@burnout87
click function for return progress link button
e39094c
Better handling of missing or double instrument weights
63244cd
@burnout87
spinner using bootstrap class
9ddf724
@burnout87
Merge branch 'd10-main' of github.com:oda-hub/mmoda-frontend-module i…
a856efc 
…nto d10-main
@burnout87
using css display property to show and hide spinner
12b76e0
@burnout87
css classes progress bar
5bad94e
@burnout87
removed some code and didi some bugfix return progress functionality
11c1208
@burnout87
properly reading url
e6f90e9
@burnout87
help page url grb detection
c5160ec
@burnout87
removed not needed code
7e7e943
@burnout87
missing instrument_query init in display_lc_table
e6604d1
@burnout87
missing query_type in template
a11be43
@burnout87
aligning calls to display outputs
34c3277
@burnout87
more alignement
65de1a1
Added a new feature, publish only help pages of enabled modules
5bb9747
Removed an extra space in MMODA module info file
c0e205c
Removed Module from MMODA module name
e8de611
@burnout87
product_panel_body renaming and file name renaming before submit
b61444c
@burnout87
missing form_id character and name attribute
298ab34
@burnout87
run_analysis_data_query_status global varialbe to handle return progr…
c6dc760 
…ess query status
@burnout87
mmoda frontend version visualization
34e453d
@burnout87
setting instrument version
1aba0fe
@burnout87
typo in exploreMMODAGalleryObject
8a8bc0e
@burnout87
setting instrument version cta and crbeam
455b433
@burnout87
desi instrument version
d682d11
@burnout87
removed dpuble parameter in the template
a59851c
Added few validations to ISGRI and fixed class name type
476a4d8
Removed a none needed directory in form validation JS library
965a0aa
Removed button "Write feedback" from all modal windows except processing
a4b03d9 
requests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
1 participant
@burnout87