Index: openacs-4/packages/xooauth/xooauth.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/xooauth.info,v diff -u -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/xooauth/xooauth.info 25 Feb 2022 12:56:17 -0000 1.1.2.7 +++ openacs-4/packages/xooauth/xooauth.info 3 May 2023 12:41:51 -0000 1.1.2.8 @@ -9,7 +9,7 @@ f f - + Michael Aram XOTcl based OAuth implementation and OAuth based REST interfaces for OpenACS @@ -28,8 +28,8 @@ 0 - - + + Index: openacs-4/packages/xooauth/tcl/ms-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/ms-procs.tcl,v diff -u -r1.1.2.13 -r1.1.2.14 --- openacs-4/packages/xooauth/tcl/ms-procs.tcl 2 May 2023 18:20:37 -0000 1.1.2.13 +++ openacs-4/packages/xooauth/tcl/ms-procs.tcl 3 May 2023 12:41:51 -0000 1.1.2.14 @@ -1132,6 +1132,14 @@ }] } + :public method logout {} { + # + # Perform logout operation form MS in the background + # (i.e. without a redirect). + # + ns_http run [ms::azure logout_url] + } + :method get_user_data {{required_fields {upn family_name given_name}}} { # # Get data from the query variables "id_token", "error" @@ -1258,15 +1266,14 @@ #ad_script_abort } else { set user_id [:lookup_user_id $data] - if {${:create_not_registered_users}} { + if {$user_id == 0 && ${:create_not_registered_users}} { try { :register_new_user $data } on ok result { set user_id $result } on error {errorMsg} { dict set data error oacs-register_failed dict set data error_description $errorMsg - set user_id 0 } } dict set data user_id $user_id @@ -1276,9 +1283,9 @@ # - Sync/check validity of the token vs. the validity # of the login cookie. # - maybe set an extra cookie to perform token refresh - # from azure when the login expires. + # from Azure when the login expires. # - ad_user_login $user_id + ad_user_login -external_registry [self] $user_id #ad_returnredirect ${:after_successful_login_url} #ad_script_abort