From 7a82b15c49c0c25bbff475d70bb8062594d4980c Mon Sep 17 00:00:00 2001
From: FoskyM <i@fosky.top>
Date: Sun, 1 Oct 2023 18:18:43 +0800
Subject: [PATCH] fix: get client info

---
 extend.php                                    |   5 +++
 js/dist/forum.js                              | Bin 3541 -> 4090 bytes
 js/dist/forum.js.map                          | Bin 12321 -> 13659 bytes
 .../forum/components/oauth/AuthorizePage.js   |  23 +++++++++++-
 src/Api/Controller/ShowClientController.php   |  10 ++---
 src/Api/Serializer/ClientPublicSerializer.php |  35 ++++++++++++++++++
 6 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 src/Api/Serializer/ClientPublicSerializer.php

diff --git a/extend.php b/extend.php
index cebf87a..2d24d6b 100644
--- a/extend.php
+++ b/extend.php
@@ -35,5 +35,10 @@ return [
         ->patch('/oauth-clients/{id}', 'oauth.clients.update', Api\Controller\UpdateClientController::class)
         ->delete('/oauth-clients/{id}', 'oauth.clients.delete', Api\Controller\DeleteClientController::class),
 
+    (new Extend\Settings)
+        ->serializeToForum('foskym-oauth-center.allow_implicit', 'foskym-oauth-center.allow_implicit', 'boolval')
+        ->serializeToForum('foskym-oauth-center.enforce_state', 'foskym-oauth-center.enforce_state', 'boolval')
+        ->serializeToForum('foskym-oauth-center.require_exact_redirect_uri', 'foskym-oauth-center.require_exact_redirect_uri', 'boolval'),
+
     (new Extend\Middleware('api'))->add(ResourceScopeMiddleware::class),
 ];
diff --git a/js/dist/forum.js b/js/dist/forum.js
index 7564cab6f04bfac660dbd72f6ada1a5e1cd14261..2422d75c017c9af68f12a51062aefe48d9701d4a 100644
GIT binary patch
delta 1204
zcmbtTJ#QOF5XDCP5E%z{K}$+xM5lux?3$|+4FnKC=3*Fu3#W)&IF%3+M`|c7blj!q
z_9zh)!6?5V!q%>gRH+ideadvM61DLkunnY3;be}cKCH??n!(-9&U^Fb&Hldl_tFpZ
z438FS>nMj&9Y;dqNN&|RNEG20!;V4TkI*xo(jE#M7>?42m6he}6QnsBFD@841f6yP
zqgD*{<(k|ETgOfF^DiGWhVIY&b@x2~k$cI?MHAXUb3FcseZb1;<VOkFcHfmhapPin
z4Z{ex2};`}h(T}L9ce-hd){5dXuwfO9o8E9b8P5pRT%eZW_`{Gad2RFR3d_Qtf;i9
zw!+l?G;@ok?vI&Oin&~sVl8)*;x{>uVn4S+@kuVb^V=l;HHn|**D5I&qR}=wv0f5x
za-!$PMfoMxc8B?=tT|Owbax9kN`r}rrf9eq`3mVQy2HW(Ytfw*_iN!=u|LVT+(}`B
zZJbqpSzIVTm}EAD-2XrFnQ^a+YcytWwvr9IT*+sKq5FC^rP*}@G^vH47h%-pqM_3`
z4nuQ3se^;*k$W{eM_`4L92?o=B1o)32s%n{ao<F#-C2D*-o%#|>P298Ky%(nb=xYV
zxfMgz;k7U%d2cNgr%fbaxxeO%2E+*raoR*^H*4QEvZjGb5Vpn&p>3NfsvzmbifTNn
z$qX?u1hLuXASNBscBb7RvKCc~L~_4llHEafb=obh0w4iCP6@CH`w@W>{297Wd%Su(
z3?U$mu)opaCZkv5Q+mo@ZvFjvqc}EuP1Pj@ZDlhq-<n;}el~uDq(^$7X$L*H%rf@>
zgFMhQg*G%38(GL$P91(Hahbvwqmd9|BrzaU9x59{c;=w{v2>L^aL-Du&oJmK*gH>&
zA%aa&d)a%N`gey<wq**#v%>o~s^nSq!ll!N(@_`Po6<a!u2#NxRn&cdBw@t+^ycI)
dJ%q0=tnwp<$9F!gFt+O+UiqF4+{u+U{{patmZ|^%

delta 714
zcmbV}Pj3=I7{)WQ%Tg$f2dr4sZb?IC%5>q@1l%T#cj?7blj5=ru+1`WGdqhC*fjMM
z*v#33@#snW0rcq2lX}%JpeEjoQ3pz@XD`3Z%=>Si=l!w%zVzfeg0o_M2k69WKtd=a
zwA;Xp0&#aIJrH>030v3!w}D6pFi=4%m5tevQE_%sDhfJbJRUOPbwbwIsM9`^4LA@l
zU)?|m)F<<rdS~X<7nHSxD;<vE{5QISvi|%M5E`poYO@BeC;GY#myr`P-j@R^T+SZa
zdqQ|)41{vG-sE?n$*WZ&)M098RS+_r%0Unj#}5Nt+77y|uU@3Kkgq<Zwlxi-s#!NS
zHSZg?=E$gMJ~d`JZ|D3z=WVlA@G&7xA9y6~$UVS%JQm6`*HNra&F5&mP-CgR^v$LA
zT)>z#)n~JyHCpO4T|^_DQ&DfySFO%GK2jgkEwq1GdDkjtTl2_1p^yGoIuh!eRnzv`
znZg=4zylsgw-<9?2EZ{RliA)t-OI$<#-Sr1mdrW!gg3;b$>T6|UGdkn>2&d=zGhZ+
z@AMLVAm}kBP9#Avrx)-pE`t}#!S;pIQJMZzPaHX59OKImNHT#%dsot#qYyGDgg%xe
zA%r9pR4G?REw!8LXc^CPMRk(DrT8+=C6pz&qc=g1v^{I;^>Y0}sHT}eL~!2C7Z5s9
N<CVv#t$wcj`U6EK=QIES

diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
index cef956e52fe65ed8c6f5066eeb43de366d310269..40b9e1ec57e06900644f0c55fec7d9e2c2ce3eb7 100644
GIT binary patch
delta 1806
zcmbtTOK%%h6jr)&;|Nr#Do7xDo4T>B+)nxsEm0MTGj}FVGPtI3+|W>D#?Fm1cs!oW
zBXt9jf5cs|V!<8>qzL{23w{HOiX}UK0_WTr2b(^GgcoyP=X~co-}(Igm%o4Y(_4i?
z-`e91@U62eg{`@9Wbqn6Z1PP2-vn+0G!hd7#7<Ap$rij0P_I$ICU1iHlnW4_Jf=5i
z3j?8<Wg(7;G)}#5Y8*dXI@|?t5sh%T1L9Z+{s`ca;G1Iv-Js0v4ix~Ppq6Ly7A|~f
z0o++9f{EDD1s$C@%7FK{1aW^o)u&mW4%mA;uRu%%fM;VHFfxxZ59>F&1QXgDFL(Po
zlo(NZHc`z`5ahW@D1p8IGRh{{s050(j)ZL8hv;CKZ9Ox`L<RUR2s_l;;Q?>lBYk+1
z>8S%i;*hk0sESw>IHXLlE`ZisAOOxp3ni>OCMumH(~z7Fot*>JulCr<Q=2e;bE!TK
zU}#ZveJ{^Pti}%SqGB7}83r}54^4+CfG#-5hv=CgI)Uak`_MDtAtN8PKGVbx1&V~p
z0zzw<1cRn0lrw+xf^Vsl`S-3ZTN+)EAwbt&$zVUqmiy|L`K62ZvcsyaYK0Hp?mW@F
zQ6ZGId8{rKuV3}F{W8_b>2~I)2|Kl2tj?{fZ;Gpzkp`+(=L78Fp&(Q4j?{0(t8>fh
z&*H`fU#Pna*K2*D{{|;I*xAVnlHJ8^OH;1jMXS?fTo7=N_S8TNE0ZnIxl|-l-z~iR
zAQnWl_2D$uk)XsAD~sc)3HG*5Jf1-90@~y3uZ5@Y)Vu>$>H3}w62q54FF9muYisOQ
zm3{p*VCTPq5e?Hs8nH|&<&|>v!9S0uO!~1@AD0%#pWpgo>VdKDFo+YDMqbR;SY9NO
z`(7lwNgJ<?IP^UPWHW$S-q4qZKkQW~d%7HB#Mli(<6s!21H(;{$m<}tN?H9;x;&2L
zQHllHa^zx>>1yRFTUyd=3@_N1qsBocbR%~V8`Du$?4RAd{jdH>h&O1!*l8}v`&zQs
zP*g8USH`aI51+NY0k+=tl8n?jk2plhWIK5tO5#yYhJ6`e%*-(UGnrR$DNOXzWMqIU
zc4a$G+(gcBnRy{DLF)VegUCc6b~>3R-l%U&KXMZ5T5{;cMrM(zB9TneC}8DsZmU!E
zLrF5W%+NCUol44c+krcf>e7ux_45)x3vc{-(If*c@<nYmT*;H@E!?5I@O$nb+~>By
L-Awn&TzT;~0f+|E

delta 595
zcmZWmO-lk%6vb#^<jkf|2>LLH)R!qqBChVcGnfvOh=~|3(#ia28YBBI=ttaTtNI0j
z+g3%tqD8BIMVsDxW(3V*=DsuMynD{Q@12LeC*ALl@LiUNb>5%$=X`gbk!2=;l@k~g
zLDaZ^$XNlPfGi7;^|-`ZTpY}tq#}y9X&iA@1OQeBG!G<G)B>nAB@-%2F!&FRHfJ_~
z&AJ9)3OkA+=nen{$0sU1&aB~8!Umdk*$1Q}%V8ye5^Hn7`u;!If$WL&2e`o*N)18>
zBdRVYIDL(;jU<u6fw`raq14DSk|zDel@hK7pG!Ijtc+a@4%a4S{PTLfB8^!!8La5i
zOJI3Ep=L9Pt-PxF49(K07V=$FR7*|9R4AJr3Fq4=Q<Ocr(H49$y4SWwlAJ!Z<;*5m
zb3ayOYe%&cm<<>=lwtc+t^sqb1_&2wC8AkL3`s;q6Q#m#QC^>&YNPa7I{$lDlWz4{
z-5u)6AePa8)T=X8Seaf*SG~pG$LV^#uG@&Z-R7#}wj17QC{6v<S9*?w`)A>|G3|#D
LWI@59+r-B=am%Hy

diff --git a/js/src/forum/components/oauth/AuthorizePage.js b/js/src/forum/components/oauth/AuthorizePage.js
index 467eeb8..10ac76b 100644
--- a/js/src/forum/components/oauth/AuthorizePage.js
+++ b/js/src/forum/components/oauth/AuthorizePage.js
@@ -21,8 +21,22 @@ export default class AuthorizePage extends IndexPage {
     } else {
       this.params = params;
       app.store.find('oauth-clients', params.client_id).then(client => {
-          this.client = client;
-          console.log(client);
+        if (client.length === 0) {
+          m.route.set('/');
+        } else {
+          this.client = client[0];
+          const uris = client.redirect_uri.split(' ');
+          console.log(uris);
+          if (app.forum.attribute('foskym-oauth-center.require_exact_redirect_uri') && uris.indexOf(params.redirect_uri) == -1) {
+              m.route.set('/');
+          }
+          if (app.forum.attribute('foskym-oauth-center.allow_implicit') && params.response_type == 'token') {
+              m.route.set('/');
+          }
+          if (app.forum.attribute('foskym-oauth-center.enforce_state') && params.enforce_state == null) {
+              m.route.set('/');
+          }
+        }
       });
     }
   }
@@ -32,6 +46,11 @@ export default class AuthorizePage extends IndexPage {
     app.setTitleCount(0);
   }
   view() {
+    if (!this.client) {
+      return '';
+    }
+    app.setTitle(extractText(app.translator.trans('foskym-oauth-center.forum.page.title.authorize') + ' ' + this.client.client_name));
+    app.setTitleCount(0);
     return (
       <div className="AuthorizePage">
         <div className="container">
diff --git a/src/Api/Controller/ShowClientController.php b/src/Api/Controller/ShowClientController.php
index 2b662d7..5a64375 100644
--- a/src/Api/Controller/ShowClientController.php
+++ b/src/Api/Controller/ShowClientController.php
@@ -8,21 +8,17 @@ use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 use FoskyM\OAuthCenter\Models\Client;
-use FoskyM\OAuthCenter\Api\Serializer\ClientSerializer;
+use FoskyM\OAuthCenter\Api\Serializer\ClientPublicSerializer;
 
 class ShowClientController extends AbstractListController
 {
-    public $serializer = ClientSerializer::class;
+    public $serializer = ClientPublicSerializer::class;
     protected function data(ServerRequestInterface $request, Document $document)
     {
         $client_id = Arr::get($request->getQueryParams(), 'client_id');
         RequestUtil::getActor($request)->assertRegistered();
 
-        $client = Client::whereOrFail('client_id', $client_id);
-
-        if (isset($client->client_secret)) {
-            $client->client_secret = '<PROTECT>';
-        }
+        $client = Client::where('client_id', $client_id)->get();
 
         return $client;
 
diff --git a/src/Api/Serializer/ClientPublicSerializer.php b/src/Api/Serializer/ClientPublicSerializer.php
new file mode 100644
index 0000000..660fd63
--- /dev/null
+++ b/src/Api/Serializer/ClientPublicSerializer.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace FoskyM\OAuthCenter\Api\Serializer;
+
+use Flarum\Api\Serializer\AbstractSerializer;
+use FoskyM\OAuthCenter\Models\Client;
+use InvalidArgumentException;
+
+class ClientPublicSerializer extends AbstractSerializer
+{
+    protected $type = 'oauth-clients';
+
+    protected function getDefaultAttributes($model)
+    {
+        if (!($model instanceof Client)) {
+            throw new InvalidArgumentException(
+                get_class($this) . ' can only serialize instances of ' . Client::class
+            );
+        }
+
+        // See https://docs.flarum.org/extend/api.html#serializers for more information.
+
+        return [
+            "id" => $model->id,
+            "client_id" => $model->client_id,
+            "redirect_uri" => $model->redirect_uri,
+            "grant_types" => $model->grant_types,
+            "scope" => $model->scope,
+            "client_name" => $model->client_name,
+            "client_icon" => $model->client_icon,
+            "client_desc" => $model->client_desc,
+            "client_home" => $model->client_home
+        ];
+    }
+}