Update deprecated URLs /_matrix/client/*/admin (#984)

matrix-org · Nov 20, 2020 · 29f3307 · 29f3307
1 parent 3914ed6
commit 29f3307
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/tests/10apidoc/01register.pl b/tests/10apidoc/01register.pl
@@ -256,7 +256,7 @@ sub matrix_register_user
    });
 }
 
-shared_secret_tests( "/r0/admin/register", \&matrix_admin_register_user_via_secret);
+shared_secret_tests( "/_synapse/admin/v1/register", \&matrix_admin_register_user_via_secret);
 
 sub matrix_admin_register_user_via_secret
 {
@@ -269,8 +269,8 @@ sub matrix_admin_register_user_via_secret
       croak "Require UID for matrix_register_user_via_secret";
 
    $http->do_request_json(
-      method => "GET",
-      uri    => "/r0/admin/register",
+      method   => "GET",
+      full_uri => "/_synapse/admin/v1/register",
    )->then( sub{
       my ( $nonce ) = @_;
 
@@ -280,8 +280,8 @@ sub matrix_admin_register_user_via_secret
       );
 
       return $http->do_request_json(
-         method => "POST",
-         uri    => "/r0/admin/register",
+         method   => "POST",
+         full_uri => "/_synapse/admin/v1/register",
 
          content => {
            nonce    => $nonce->{nonce},

diff --git a/tests/48admin.pl b/tests/48admin.pl
@@ -17,8 +17,8 @@ sub await_purge_complete {
          $prev_trial ? delay( $delay *= 1.5 ) : Future->done
       )->then( sub {
          do_request_json_for( $admin_user,
-            method  => "GET",
-            uri     => "/r0/admin/purge_history_status/$purge_id",
+            method   => "GET",
+            full_uri => "/_synapse/admin/v1/purge_history_status/$purge_id",
          )
       })->then( sub {
          my ($body) = @_;
@@ -95,15 +95,15 @@ sub await_purge_complete {
          await_message_in_room( $user, $room_id, $last_event_id ),
       })->then( sub {
          do_request_json_for( $user,
-            method  => "POST",
-            uri     => "/r0/admin/purge_history/$room_id/${ \uri_escape( $last_event_id ) }",
-            content => {}
+            method   => "POST",
+            full_uri => "/_synapse/admin/v1/purge_history/$room_id/${ \uri_escape( $last_event_id ) }",
+            content  => {}
          )->main::expect_http_403;  # Must be server admin
       })->then( sub {
          do_request_json_for( $admin,
-            method  => "POST",
-            uri     => "/r0/admin/purge_history/$room_id/${ \uri_escape( $last_event_id ) }",
-            content => {}
+            method   => "POST",
+            full_uri => "/_synapse/admin/v1/purge_history/$room_id/${ \uri_escape( $last_event_id ) }",
+            content  => {}
          )
       })->then( sub {
          my ( $body ) = @_;
@@ -184,9 +184,9 @@ sub await_purge_complete {
          await_message_in_room( $user, $room_id, $last_event_id ),
       })->then( sub {
          do_request_json_for( $admin,
-            method  => "POST",
-            uri     => "/r0/admin/purge_history/$room_id",
-            content => {
+            method   => "POST",
+            full_uri => "/_synapse/admin/v1/purge_history/$room_id",
+            content  => {
                purge_up_to_ts => int($last_event_ts * 1000),
             },
          )
@@ -287,9 +287,9 @@ sub await_purge_complete {
          )
       })->then( sub {
          do_request_json_for( $admin,
-            method  => "POST",
-            uri     => "/r0/admin/purge_history/$room_id/${ \uri_escape( $last_event_id ) }",
-            content => {}
+            method   => "POST",
+            full_uri => "/_synapse/admin/v1/purge_history/$room_id/${ \uri_escape( $last_event_id ) }",
+            content  => {}
          )
       })->then( sub {
          my ( $body ) = @_;
@@ -381,9 +381,9 @@ sub await_purge_complete {
          matrix_join_room( $remote_user, $room_id );
       })->then( sub {
          do_request_json_for( $admin,
-            method  => "POST",
-            uri     => "/r0/admin/shutdown_room/$room_id",
-            content => { "new_room_user_id" => $dummy_user->user_id },
+            method   => "POST",
+            full_uri => "/_synapse/admin/v1/shutdown_room/$room_id",
+            content  => { "new_room_user_id" => $dummy_user->user_id },
          );
       })->SyTest::pass_on_done( "Shutdown room returned success" )
       ->then( sub {

diff --git a/tests/51media/48admin-quarantine.pl b/tests/51media/48admin-quarantine.pl
@@ -43,9 +43,9 @@
          );
       })->then( sub {
          do_request_json_for( $admin,
-            method  => "POST",
-            uri     => "/r0/admin/quarantine_media/$room_id",
-            content => {},
+            method   => "POST",
+            full_uri => "/_synapse/admin/v1/quarantine_media/$room_id",
+            content  => {},
          );
       })->SyTest::pass_on_done( "Quarantine returns success" )
       ->then( sub {