From 6e2aeffb4305258980ade5ae9411458c1effcf8b Mon Sep 17 00:00:00 2001 From: FoskyM Date: Sun, 1 Oct 2023 22:28:20 +0800 Subject: [PATCH] fix: authorize --- js/dist/forum.js | Bin 7223 -> 7383 bytes js/dist/forum.js.map | Bin 23797 -> 24182 bytes .../forum/components/oauth/AuthorizePage.js | 27 +++++++++++------- src/Controllers/AuthorizeController.php | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/js/dist/forum.js b/js/dist/forum.js index 4ee4e8b5f13846242eb843c7018a12a07036a300..319120c1608426433c586c27ebbaf42bd46a8aed 100644 GIT binary patch delta 309 zcmdmPaouu5GZSOxB}EoHCQYG6^vzZsuUN1`2O>Vco|Fq?p;)F^lOHmnP+A zmc-}eC#GcPrQ0eR>ZI0YZr;rGmKkWkLOvtOOud5A;tY)v&00-Oojlt-z2yA7lX(SgCYOne z27+v{O)JeyF3HT#1G=ReY*>9sofdSLSjDmB>LEa~kMoHCQYG6^weZsuUN1`2O>Vco|Fq?p;)F*DUBZa&WS zmKmscE1!{MqFzC1afU{TX04{CPM&R^UUGh3a$<=_;wJtH?1Gua@rk7+8Tmz-RjDbq qiiWk56$Py)e-}$cmoWgz*i1esF1lG;Vj9q{$;Y`&Hh+_R$OHh-NHsM8 diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map index e7f62edec2158ae4a6ce02f2c08c48421bc4f4ed..faae6328c5aa2d45368305ed0101e862c7199214 100644 GIT binary patch delta 2680 zcma)8&rf4j6i(GR%mDKX7{EA_4v9K5Jb{)DKb&D^?z`{xQ66tzp_E$0OrR~L&=zP5 zG9{D#14d15;>MM()Qu)xIWbP$=t7Mvm%4Ff)TJ61CVuDKjstOG+_d!G^Yi<@b1uJq z68Qboz{kzw$NWXZ7xARJfBeHGTgZyJBaOT%M8Py{A>4{Iq!0oh@noD%#FpeQX*dGD zF`Uft!2*94Eh8yPUd2SzvbSS~Egai5_5O*0i!ZZ9nJk1Cv0x#*kY%_+Ncs?A_4A3@ zwl%U!z4xUeSK-%8BPGO`G&~{p&8j{unMO{CyhVq5W?3KNYXx1{CG}?edBJ6f zgg{7{O>wb;%#$ff=(ZX~bfj!0N$D)Ekw8T?^=o@D5K$*P1_BEz)N$_lU2O|@dx64Q zc9xvo1?tA%=8|#|RqE&+J94C>dgQmkkjizA^vDsQJ4JIs-S05Y)cs zmF`_IQLw47eREV>l+@ME8*Qy05p~dMoYI+tk*HA~0B8%`+8xfgo%Odv#X%`;qMCeaXMsMjs^(aGLMm1E{?=4XS&vrmC+(W;b-NpG`y{2hx5-;k}S zad0nkBb*`~qjG(UEg?!I^-E+8*1?oJODE|WZV7#$j1;crRl1J}IUd#BN(L#Ui;f!^ zYTM@yZd2qW{*-HJRX_E?In*#GV(~5R$wl|LPo>r5=^sP5B6Y07ALZ%NX$X?wnRM8? zhaw85h!yQY<(+wZqIH^u%4OXIR;XBT@q-Mli?R-RuNj+APzVb8>uhf$zNariHZWNk z<_Z$re}PBNZQVrJ?jZ*-kieFdQL-uF3Q~Az#uu|(4!f4Lh8M)NxNWs4juUORTQ3Ygxs6{A+U0^7*di|C*k-${~N@Ki1t+b3NUS9ZO8w zkbo^lqTIE_4uWzm%nx!2>ch2(!)d@l*%=OzH!;r=N&*Rz|O;YwjIQ7aWQ$=qS#L5h2(11X3MAk>$9r(cbbxf5mj#*bWX+Qd)UEbB{b zDE3qj&h@+kgj#T+7rSC^vU>UPkP*TMPaCb9^~37~`Ujwdx5K2+dqsx?D|jPn#CY8>6HC=)HIr4-W_uc!!|`Fk|nlD}5IlBU~+2j?7$m%y6Z9RZj92 zfx`+d|17T*V}gg8Vr*C$ZiE+Fis%(PthPxL0|!h!ru??1a-6|hUHO+w+e07qZQpdD zsQUVEy`bmcTaUt8&d}hC0{uM&D{XQ(G@ohcd-Nu3WoQ&1`Mwny+6E zx2ex=wW}|!Wp&Z^)RZ{ZtlED*sh)DqK6x;FMTKU<&39wpJ<-F?*uK@R-r?tJrUf2RH9(c+rk(hq?S3Nl~}u!Fj^ G{LSAb)c~OY delta 2229 zcmZ`)O>Y}j6qVabBqX6}x?IM;v}wHRh8p7b!^9W z9pk295mkrh$HenDBVK%9HWEolXt=keUHbI-Z= z&7a@-p4|7{>-N9oUbfO=DQCXz|I$`M2utB##?p9fDE?7aLclADH)(#c!e`C4*2Gk* zDG@)NYRIsS*SclCfBEd0b@r%}hj61dJcPS%TaFNl4iPrKfz;_u^2(Oz)XH+vcnlL`}xbqd{wU?^%l_p{C)l%CaJXj)|R^x$sKhV2)^0c?wJsJHoyF zLLU{m&(ykMPZz>|g`r1i8WI&R-8?&OGlZ4|6zV-g?4@TV37uqarzu7i2th{*>wqd| zt)fsXH#tE`ldn_e0Yd*tp+$@>MTVEhAW_bSjXdD6S7-@CAWFBnYCcIqq^X>$P#%%4 zlDBXu(n-;q{346Bf04%{2RpQIP)*Inz5W$JbUd=1B|=z}E;p5;%xid5TRC(0_!nas z!DW%m>~Nb71cg19GnwJXVVDT*2I2wFgHDUEw(mLj?1Zo%mqBXV}DO zseK6s0a`HrDdwAy5m7zAEvt&TiC}K-438W%q|lj;=Ky&?O<|gWWSItR5QX+EQT98m zPSd8|lT}Sc3-EQ}nieU+%kFd(_jFj*2Ft$A3hBCEQ;T_ToCKa#TUO04C$9uMHiMZb z!muScn8z8jI5OGKMpd?No86J9-*YX3Gc1&A(OT@8`y&f_&jy)#bGJuHLFlBn`?)q{ zS1SnN>BE3jIQLlP}!;|x&Y zHo%Q(LmIk)=*T+AsWKj?isnPbanC{-*wJ7fBdgXu{g=^$TG=(fjRmI8D;_ovHP(Y# z#LbBTo{^vd%H*)gGyqL=Cg4AK@9+)TyG|pr8t3L`o-R3h=#95FL7K^tn8DmW~%n2q3JEv(e=|j|VG5C1S?wCIU z=Tb8aK~NEqvhw6ZkE^7%xRu}^t|OSSIlc$PtoPHt1RB=L1Y!M#3Y$VO7{ix|LOW#o z@9z}dA!;MfeR(=%TjuNFYZcG}Jp{fZN|O*8gZOM+v0k+Ayq^#Y@6|1CgqlKi?kQ0-lvk*ceFZkyV8@JL;o6JsOY z&&Ef`yANhR>>HVEm$!G%6>Hn2di(lrvC%9|cCTNE_8Fr~<}dAZ6Y;-~9({lMO>;;1 zP1rfr{bcdyBj&6Qn(@rIxtk0axj1TmSI5jl_d)+;qmEp~>IHK~hs;tY^n%CRMy7x4 SHZpRc`@_{=edeoc5B~wIrFIwq diff --git a/js/src/forum/components/oauth/AuthorizePage.js b/js/src/forum/components/oauth/AuthorizePage.js index ec1e0a5..02a757d 100644 --- a/js/src/forum/components/oauth/AuthorizePage.js +++ b/js/src/forum/components/oauth/AuthorizePage.js @@ -14,6 +14,7 @@ export default class AuthorizePage extends IndexPage { client_scope = []; loading = true; is_authorized = false; + submit_loading = false; oninit(vnode) { super.oninit(vnode); @@ -76,7 +77,7 @@ export default class AuthorizePage extends IndexPage { scopes_temp = scopes_temp.concat(default_scopes); this.client_scope = scopes_temp.filter((scope, index) => scopes_temp.indexOf(scope) === index); - console.log( this.client_scope ); + console.log(this.client_scope); this.loading = false; m.redraw(); }); @@ -135,9 +136,9 @@ export default class AuthorizePage extends IndexPage {
{ (scope_info.scope_icon().indexOf('fa-') > -1) ? - : - + : + }
@@ -158,7 +159,7 @@ export default class AuthorizePage extends IndexPage { }
-{/* + {/* @@ -166,14 +167,12 @@ export default class AuthorizePage extends IndexPage { */}
- -
@@ -187,6 +186,12 @@ export default class AuthorizePage extends IndexPage { ); } + deny(e) { + this.is_authorized = false; + } + agree(e) { + this.is_authorized = true; + } onsubmit(e) { e.preventDefault(); diff --git a/src/Controllers/AuthorizeController.php b/src/Controllers/AuthorizeController.php index c1a8f6a..325b614 100644 --- a/src/Controllers/AuthorizeController.php +++ b/src/Controllers/AuthorizeController.php @@ -45,7 +45,7 @@ class AuthorizeController implements RequestHandlerInterface return new JsonResponse(json_decode($response->getResponseBody(), true)); } - $is_authorized = (Arr::get($params, 'authorized', 'no') === 'yes'); + $is_authorized = Arr::get($params, 'is_authorized', 0); $server->handleAuthorizeRequest($request, $response, $is_authorized, $actor->id); if ($is_authorized) { // this is only here so that you get to see your code in the cURL request. Otherwise, we'd redirect back to the client