@@ -34,35 +34,37 @@ define('admin/plugins/session-sharing', ['settings'], function (Settings) {
3434
3535 ACP . _searchDelay = setTimeout ( function ( ) {
3636 delete ACP . _searchDelay ;
37-
38- socket . emit ( 'admin.user.search' , {
37+
38+ var qs = decodeURIComponent ( $ . param ( {
3939 query : element . val ( ) ,
40- } , function ( err , results ) {
41- var resultEl = $ ( '#result' ) ;
42-
43- if ( err ) {
44- return resultEl . text ( 'We encountered an error while servicing this request:' + err . message ) ;
45- }
46-
47- if ( results . users . length ) {
48- socket . emit ( 'plugins.sessionSharing.showUserIds' , {
49- uids : results . users . map ( function ( user ) {
50- return user . uid ;
51- } ) ,
52- } , function ( err , remoteIds ) {
53- if ( err ) {
54- resultEl . text ( 'We encountered an error while servicing this request:' + err . message ) ;
55- } else {
56- resultEl . empty ( ) ;
57- results . users . forEach ( function ( userObj , idx ) {
58- resultEl . append ( '<p>Username: ' + userObj . username + '<br />NodeBB uid: ' + userObj . uid + '<br />Remote id: ' + ( remoteIds [ idx ] || '<em>Not Found</em>' ) ) ;
59- } ) ;
60- }
61- } ) ;
62- } else {
63- resultEl . text ( 'No users matched your query' ) ;
64- }
65- } ) ;
40+ } ) ) ;
41+
42+ $ . get ( config . relative_path + '/api/admin/manage/users?' + qs )
43+ . then ( function ( results ) {
44+ var resultEl = $ ( '#result' ) ;
45+
46+ if ( results . users . length ) {
47+ socket . emit ( 'plugins.sessionSharing.showUserIds' , {
48+ uids : results . users . map ( function ( user ) {
49+ return user . uid ;
50+ } ) ,
51+ } , function ( err , remoteIds ) {
52+ if ( err ) {
53+ resultEl . text ( 'We encountered an error while servicing this request:' + err . message ) ;
54+ } else {
55+ resultEl . empty ( ) ;
56+ results . users . forEach ( function ( userObj , idx ) {
57+ resultEl . append ( '<p>Username: ' + userObj . username + '<br />NodeBB uid: ' + userObj . uid + '<br />Remote id: ' + ( remoteIds [ idx ] || '<em>Not Found</em>' ) ) ;
58+ } ) ;
59+ }
60+ } ) ;
61+ } else {
62+ resultEl . text ( 'No users matched your query' ) ;
63+ }
64+ } )
65+ . fail ( function ( err ) {
66+ $ ( '#result' ) . text ( 'We encountered an error while servicing this request:' + err . message ) ;
67+ } ) ;
6668 } , 500 ) ;
6769 } ;
6870
0 commit comments