Index: openacs-4/packages/xooauth/tcl/oauth-client-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/Attic/oauth-client-procs.tcl,v diff -u -N -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/xooauth/tcl/oauth-client-procs.tcl 12 Mar 2021 10:23:58 -0000 1.1.2.3 +++ openacs-4/packages/xooauth/tcl/oauth-client-procs.tcl 2 May 2023 18:14:54 -0000 1.1.2.4 @@ -26,7 +26,9 @@ # set :remote_server $server_metadata #} - Client ad_instproc client_metadata {} {} { + Client ad_instproc client_metadata {} { + Client metadata + } { set :client_metadata_id [:require_client_metadata] set client [::xo::db::CrClass get_instance_from_db -item_id ${:client_metadata_id}] return $client @@ -61,7 +63,9 @@ return $client_metadata_id } - Client ad_instproc get_temp_credentials {} {} { + Client ad_instproc get_temp_credentials {} { + Get temporal credentials + } { if {${:remote_server} eq ""} { error "no remote server" } @@ -104,7 +108,9 @@ } } - Client ad_instproc callback {} {} { + Client ad_instproc callback {} { + Callback + } { set client ${:client_metadata} set temp_cred_identifier [:request_parameter oauth_token] set temporary_credentials [:get_credentials \ @@ -125,10 +131,14 @@ -client [$client_credentials client]] } - Client ad_instproc authorize {} {} { + Client ad_instproc authorize {} { + Authorize + } { } - Client ad_instproc token {} {} { + Client ad_instproc token {} { + Token + } { } Index: openacs-4/packages/xooauth/tcl/oauth-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/Attic/oauth-procs.tcl,v diff -u -N -r1.1.2.8 -r1.1.2.9 --- openacs-4/packages/xooauth/tcl/oauth-procs.tcl 29 Nov 2022 12:39:55 -0000 1.1.2.8 +++ openacs-4/packages/xooauth/tcl/oauth-procs.tcl 2 May 2023 18:14:54 -0000 1.1.2.9 @@ -400,7 +400,9 @@ # # - AuthenticatedRequest ad_instproc send {} {} { + AuthenticatedRequest ad_instproc send {} { + Send request + } { :initialize :send_request } @@ -528,16 +530,15 @@ return $parameter_pair_list } - AuthenticatedRequest ad_instproc decode {s} {} { - # We cannot use urldecode, as this translates plusses to spaces. - #return [ns_urldecode $s] + AuthenticatedRequest ad_instproc decode {s} { + URL decode + } { return [::xo::oauth::utility urldecode $s] } AuthenticatedRequest ad_instproc encode {s} { @see http://tools.ietf.org/html/rfc5849#section-3.6 } { - #return [::xowiki::utility urlencode $s] return [::xo::oauth::utility urlencode $s] } Index: openacs-4/packages/xooauth/tcl/oauth-server-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/Attic/oauth-server-procs.tcl,v diff -u -N -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/xooauth/tcl/oauth-server-procs.tcl 1 Nov 2022 16:17:14 -0000 1.1.2.2 +++ openacs-4/packages/xooauth/tcl/oauth-server-procs.tcl 2 May 2023 18:14:54 -0000 1.1.2.3 @@ -17,7 +17,9 @@ Class create Server - Server ad_instproc server_metadata {} {} { + Server ad_instproc server_metadata {} { + Server metadata + } { set :server_metadata_id [:require_server_metadata] :log "I retrieved the sm: ${:server_metadata_id}" set server [::xo::db::CrClass get_instance_from_db -item_id ${:server_metadata_id}] @@ -26,6 +28,7 @@ } Server ad_instproc require_server_metadata {} { + Require server metadata } { set parent_id ${:folder_id} set server_metadata_id [ns_cache eval xotcl_object_type_cache xooauth_server_metadata-${:id} { @@ -127,6 +130,7 @@ } Server ad_instproc token {} { + Token credentials } { # TODO: This URL must be only accessible via HTTPS if {[:verify_incoming_request]} { @@ -159,7 +163,13 @@ return $credentials } - Server ad_instproc get_credentials { {-identifier} {-server ""} {-client ""} } {} { + Server ad_instproc get_credentials { + {-identifier} + {-server ""} + {-client ""} + } { + Get credentials + } { # TODO: Replace with ::xo::db-layer code set sql " SELECT DISTINCT item_id @@ -189,6 +199,7 @@ name {default ""} } { + Request parameter } { set authorization_header_parameter [:authorization_header_parameter $name $default] #my log "AAAAAAA $name - $default - $authorization_header_parameter" @@ -346,9 +357,9 @@ return $base_string_uri } - Server ad_instproc decode {s} {} { - # We cannot use urldecode, as this translates plusses to spaces. - #return [ns_urldecode $s] + Server ad_instproc decode {s} { + URL decode + } { return [::xo::oauth::utility urldecode $s] }