From 81198bb3f80105c4664ecc4a7fdd83be65e2e242 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Wed, 12 Jan 2022 22:55:11 +0100 Subject: [PATCH 01/12] test de la route login --- backend/__pycache__/app.cpython-310.pyc | Bin 0 -> 345 bytes backend/__pycache__/config.cpython-310.pyc | Bin 0 -> 1367 bytes backend/__pycache__/config.cpython-38.pyc | Bin 1407 -> 1403 bytes .../__pycache__/fictive_users.cpython-38.pyc | Bin 0 -> 957 bytes backend/application/__init__.py | 10 +- .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 1070 bytes .../__pycache__/__init__.cpython-38.pyc | Bin 1107 -> 1078 bytes .../__pycache__/api_functions.cpython-310.pyc | Bin 0 -> 5905 bytes .../__pycache__/api_functions.cpython-38.pyc | Bin 5861 -> 5961 bytes .../__pycache__/logs_model.cpython-310.pyc | Bin 0 -> 1262 bytes .../__pycache__/logs_model.cpython-38.pyc | Bin 1296 -> 1296 bytes .../__pycache__/responses.cpython-310.pyc | Bin 0 -> 995 bytes .../__pycache__/routes.cpython-310.pyc | Bin 0 -> 6571 bytes .../__pycache__/routes.cpython-38.pyc | Bin 6650 -> 6685 bytes .../__pycache__/sessionJWT.cpython-310.pyc | Bin 0 -> 1288 bytes .../__pycache__/users_model.cpython-310.pyc | Bin 0 -> 1192 bytes .../__pycache__/users_model.cpython-38.pyc | Bin 1226 -> 1226 bytes backend/fictive_users.py | 8 +- backend/test.py | 123 +++++++++++++----- 19 files changed, 99 insertions(+), 42 deletions(-) create mode 100644 backend/__pycache__/app.cpython-310.pyc create mode 100644 backend/__pycache__/config.cpython-310.pyc create mode 100644 backend/__pycache__/fictive_users.cpython-38.pyc create mode 100644 backend/application/__pycache__/__init__.cpython-310.pyc create mode 100644 backend/application/__pycache__/api_functions.cpython-310.pyc create mode 100644 backend/application/__pycache__/logs_model.cpython-310.pyc create mode 100644 backend/application/__pycache__/responses.cpython-310.pyc create mode 100644 backend/application/__pycache__/routes.cpython-310.pyc create mode 100644 backend/application/__pycache__/sessionJWT.cpython-310.pyc create mode 100644 backend/application/__pycache__/users_model.cpython-310.pyc diff --git a/backend/__pycache__/app.cpython-310.pyc b/backend/__pycache__/app.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..56671cd9e5fd0711581018cc324eaaa029b4db67 GIT binary patch literal 345 zcmYjMJ5Iwu5Z#X*JBCCEVa?vl)N) z6jyA;UTNm*j`HTr?fuPt)mgDD(Ecn`feuutx^Eo!*<=%O^o7bKrVve?mW>v&s>aYg zyF8v;h|%~CLLo|-8zI2EzPd^C^$Q`-!TxaLY0SZUv~>esWnBaQ>FDJ4Jnq64$`tuj zHn}y9;RRr}hCrLA+*t$sK{vpW)5;rJY9U+y5%1;t`cg6FjO*>_b*`Xb2UlL4{`EqV<= zB`QxOEHUXoK1T^EOudjVWSnVB6j9}aL=~pJSFjFTr5WHErUN&CYg7lWCp-(>pjqJA zgy*R2O10cq*hO-N0v8`pHdpZu0w!UZN*GZYE6`MmaE56I`nf?Bs$L+RO<5*kurkg= zE2LR1$re+lC#=MZtVE5E2rs4iEX~16<&@=V0a%5qps~ocMljtUk6IqjwrtbgCT6ea zT*j935?7n1XVy*EBD;N??7CLp#g*T3cDL=;(3wF8k7f}Iqca_%Nid3d&b1nS%Ol&? z9k zle8z(wCcNUu6vg2b(}UXG~9lRSdLk@ttLl7#C0}38Hd4?Dco9Of_M?=k z%E{O(MJB_%O|igjfGb4?B~B3>zrxGC5Ii2n<6xQ=f>YB%115!80pdc1c>!es6#>8W z&!bx+w+e6<+BY$EF4&Nh?0-l@^ZKU>NK<*yV^KVwj^?_&)-}QkV(Y&PTZ19@#V}z+ zDA>({?m_RhUddQX{i-zC37Z7RM{F9W!kn7^hhaG1v|d_vx3^Wo=pe3D2n?bN~PV literal 0 HcmV?d00001 diff --git a/backend/__pycache__/config.cpython-38.pyc b/backend/__pycache__/config.cpython-38.pyc index ad47e0fc3e43f1d8d461c3d408606d778d18447f..6e1dae20edeb7a33534b33ebb93c6f91b7f4e559 100644 GIT binary patch delta 65 zcmey*^_z=3l$V!_0SGF2?{DOO&a51gT3nKum+qXOmzJ3x;^wExR>T36F5(0cAeBWt Olk1q3He0i}FaiKpt`KMd delta 72 zcmey(^`DD7l$V!_0SFR4U){+4oLMWlBr!cRFWosmFD)}Y#LZ8Wt%w6CUBn3@Kq{ly VgF_tMJ^kD#H!{m_HfM2R1OWS~6Ab_W diff --git a/backend/__pycache__/fictive_users.cpython-38.pyc b/backend/__pycache__/fictive_users.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..477bdc3dbe61a6c9bc08dd615afc2e56216b0b36 GIT binary patch literal 957 zcma)4OK%e~5VrS`Y_?7Mpbx?caSN5Q?aH>|T2lAxXxmVOIyle(_nQrKFb_>=-FgeK2urYh z>pg%KScNrM*T@sgcijs<=qpD@_Yt_;v6aC=*^x#lC*|R3%92PqcQnf3 zGGLJKbYfJ5Lq7b6a2I{$=%^-~m>RSQS;}IVxwqD@BECD_si4?!a=rkJ%kd1-?&|~VN3kyvs94+*B=-7V)e&fEW%91QDrU*+JnN;;suoSXH=%j>hPsdbdd6xUO zhHm=q{o&2;M64j-ci$UjN#rGb#KhR^XJMH{X(7GmJ#X;LlTlcDyD^iey>~l(?*j`@ zqZGU$4-5V&3QGOb-F&R(@RFd&s=x-)%4HOUy0k?NTEl5*eIwQ|+Hu7aDrL&CR94Q4 zk*eVjLSD5#^OL$2d5~lf#Z@hSdv=%QJQ$WK=8>hcDp;)@_Fe@?gPnum`0e4FV81sQ u9KS#4SC>}B&WKf=fwP6|WgNZK4=T4%IMku@de(Hp)x5Es|FC~qPyPTyu=WuE literal 0 HcmV?d00001 diff --git a/backend/application/__init__.py b/backend/application/__init__.py index c726987..e26ae65 100644 --- a/backend/application/__init__.py +++ b/backend/application/__init__.py @@ -20,16 +20,16 @@ def create_app(flask_env='development'): if app.config['SQLALCHEMY_DATABASE_URI_1'] is None or app.config['SQLALCHEMY_DATABASE_URI_2'] is None: print('No ENV Variable for DATABASE_URL_USERS or DATABASE_URL_LOGS') sys.exit(1) - else: - print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS']) + #else: + # print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS']) print('init_app') db.init_app(app) with app.app_context(): - print('import routes') + #print('import routes') from . import routes app.register_blueprint(routes.bp) - print('db.create_all') + #print('db.create_all') db.create_all() - print('db created') + #print('db created') return app diff --git a/backend/application/__pycache__/__init__.cpython-310.pyc b/backend/application/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4f97792e0b1678ad90599070ca4ed729509eee30 GIT binary patch literal 1070 zcmZ`&OK;Oa5Z+xoj^j9eAOsESAs2+gp;5WELWDL2q%@SKEvhdo$Ga(R{bIc-ZIqtM z74a9+BY(*k4qWI@04~hhQClIg){OT1=Hc0y-MCh>5UdB=-`yP@p&ts|T^fKFAn7_N zh8PY|h#id8o&+S+94+5#f$r$QX+g;;aqSX01}n1?Gd^Rd%(Omgn%9s4HE~wj3f%Mr zHdg;#w;gyNczE8+s*IoVAWlLaNe?U6*-{mlAR8d*Pf!v`%rGNg$OWFjA5Vx_oZw?J z)tG(-l|{?ImVjNJu}01=0$T?5$&58~)|jD+LTb;fI-G5U(zP5_3nVtB&g@I@k)^4@ zYRVg!xtu9a%?U2zr8b5{tX_wWxLzDwxd1ozP@ zO2bc(Q+|0uH(5wnpe{WuywEVz}O8)~C) zDodV9KRO!UpLy&RxG)QtIT|m`Oq;hOD9q#9%u+z7t|r#qc-`4Pq?_%%_RDs^L-%*z z(AEE&o{iUfaih~aXdJl0cLxD)3}ex_6W*o!{myQ`@h{tb`>KDfu0m$|kuRy6B+w5- z#3MLUb6$|#L}}!PoYKrFYR#%c5r;G$9CJ@*r9}9V%(V18&2)a|%Z#vrsHn&)d;DkE_!78O$AdAWB~U3r-6 WAzZ0|KUZx}ZBTYzmWd5Ar~L(kG-bM^E1TL-e*64}##)zd+w?0(RgH@B7~SzBl{!yYU~r@koTK2N$$jTE=K;`8T{2 zQNV%IkMtB~gd0ODH)b%Pslf|#01|E?TSRti$(C|<16dQ`~>EYS+}6(ZNDv zrnNZ%@{-&mFG!mlU=?=&my-8zGx-9Wo0+LZto*S5=1MOLPyGI!{RM92NaA`)@)wTa zesV-_?Q}c4?aq26*LRxx%}347F6*}U*xs|po!@$kndOJRV%~V{LRON|1kK&LqIQHl0UR@AoY^73U)G_tHf)S5vl)bwjxE}kCl+@IGBjB^h1@=<8fy9r0|qrUJ$s( zVfiHR;vo~^G&9g7mwqO4HF;(Dt_3w%26gCl%w k#qu&Hc}cG7?Ekf2)@O*Wg|O`29w(pFrH9zsR5D3o3_O;Z$OG2OOm5XLpLjoWT^!|Yh3 zB;?Q@yoi*&cuX#Wf52a$7q8-F4qiNY@-H~MDN+Z%7oPWfznNj?v-VwE+%6P!kn2_R zhx1hd_?5ufg(cjR6|I~sE)_B~dkn1{RcxrJC;p{j`)pRuLta)b$^VqXfg_42euoFZ z@t!iuP=&%64^SV`%syr}`>>ZCsWdxA2!dtls?uFQb#tk^AYDzm&rjWa>Y6DHRjMbL z05!@$VPA`mQ!*#SKJXkZ9LWsVMtNFHhfC6%N>imW9AVkhM@AneJB`dSyq`rti*(vA zbc=&Ye`*W}p1>Vw!X`YGC(0+7iQl5jdVal8wI7oD#!mbZUAx}OMcnClLFe#%I}CQc z&JBCQwUmTG-2>MTdtEo+@gMX8-HspQE5ln>$gH*MR&}*%*U9!~gDm|<@(m9!%8jiZ zhk4FR-;J!E6GbkyR;*UZZZ@io+Wq>YXJqxk#+qG0LS^A=?nadoOFm9$gal64B}Cvb z5;-?G@K_iKrQ>p;PHrcRT^4pp`~}b76`B`#oH)InFr*Nf;O-kPfF<85^fq%H?h?oM zD~eELf@P(jHa`I?$IFVhP(&K~SJ=e!l1*H~I?|DeW)Pc;zbTcg)5)Nb$hk!35-I;L Jv+;$D^%s<^qk#Yb diff --git a/backend/application/__pycache__/api_functions.cpython-310.pyc b/backend/application/__pycache__/api_functions.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..037557d982db75fbb49f5a852960a7e9fbd4ad93 GIT binary patch literal 5905 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 E1(Hh8Hvj+t delta 2228 zcmZ`)&2tn*6rY~2ot@pC?2=E-2TOp!1`;uppdnxYD+k_%I&<%P`;1NBJ07M))|N0Lv&Z^GQAhmNBkgS1Jb*J@%vc@z0km z*SsBg@FyqPGcyMf2~GaShM6t@V6$>cop!`9SQ9O1-q}{fq`UyJ<>goEK{hRaQXkAu z;yVOWxUaD8MeEg;7eya61xHh)0w_!zk{@c{7jTjon~^V~?TnmMXG-LMTT9F+_TtS* z49QrZ8?j*Dwkj&{5JLc!oXEa_# z-V6nWspA@|PK+Up103f<`o{S;a;esLOM31R3RMB)sCaP!DawcdzY zel2zjwROL?u{Wh`h$6mFLKsMI4yfCUZ&m)43E7#Q!1{#kdkr>MG(pGXA!1hknVmN= z-Qtw2*fZv?^{V}DuE+9G`Hel%A?lIvZD)`pRSp|H&`^+h90q@ipyNTuf;}N;YM4-UcfC_$$pW6 zPLKhM{RB$3>&0xRUNT!9<-Xq5!Idh$jIF!br}mZtujKli!2x~FG;pTy{1ffE!V7)7 zOs@9rQumJJ3UmtR+6_V3!9?C0zvwlN#AWUWe(ZP3ffvPPl7EsThSG&Ku>zY1O6gwV zCe}u}gD(oK2(b!)g^lB0S)gzeqt@JP#8enmTZx&z+ROJ9s(`(^N6u5pQw|wU2ejKw zWa{ZV*b-d^P}rP2?~KZ2XKCl5^N@|x^>+nLRkSPJ$>Oe{Ps=OCDf29zaZZNClbttl z*r#fot|D}mEzZNVl4?@)E_)C+4eAkX|0~B4kRx$kP4$S{RK>452TF#vj8|Ao5A8NF zYBMj`VJd(Z?6{zsq`IQuP_@F8?~Qbpkgy6%%STPr#S`h(26(hr0_bnGX4pDcm8H>R z|Lty6gxwaG=s|tMPwOv(hjq_RjHngVWB9oEjl_cQ1+=BxAB*%xurtxTAov$)sFFm5 zJzXE-I<-+EA5)(g5ZNt)dG|{!zQRIRWf!Y*M<+wo|QhU#0hpTaT4JS0(KDb zHo_%@TL?X}X>^*ts@4kl-wgb7sOzW1gh5Z=B2vwex<{7{gJ28=}9AS#4_2v8(qAvu+s)%tcZcRAmg-E)!XI@0n6 z6iMmV;4!vHL&XyyQ88mXjw7dFSNrYEcy4~a9l4028iDoV`kL>%g#1EfbvdBChNB+= z2qI`kMzl{U`9Opv> zNnJP|hWu{z{keV_ToK_27cAk52kNzjM}6thShGZHmW?&b=G>At7kRc8y0_32HfbgmCYOnyACQD;m&jWSo!1P@nr^@GJx21p2OzRWjo0jGfA}_n-&)B+K|9lX1Ah z1TI?psffdvm(af{kb_|(U a?H=P?&8+tYHo?m|1Fvv!G^S{fJ^LT5Q3XB# literal 0 HcmV?d00001 diff --git a/backend/application/__pycache__/logs_model.cpython-38.pyc b/backend/application/__pycache__/logs_model.cpython-38.pyc index 73e48a035bdc1f816e105e589a29d72604697b16..f7aa63ae4fa8ec91e7e58fe4572cfd1025803697 100644 GIT binary patch delta 20 acmbQhHGzvel$V!_0SL_Q-P_2`$_fB1Rs?YX delta 20 acmbQhHGzvel$V!_0SFR4U){*f$_fB2%><_a diff --git a/backend/application/__pycache__/responses.cpython-310.pyc b/backend/application/__pycache__/responses.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..05d2496d14f2ce4cf1ad434d52c00481d693b18d GIT binary patch literal 995 zcmY*XO>fgc5ZzDPNt05_HwYvILb9Ob4^)V%P!v=-5;-8{5{!2n+&Xr&>j+hHZ(R8Y z9GYYQ34eggUODxK#H|vD8M~>j`^vA_ z0!FI@&My{#mHTQ;_fyfj6&v6W@T=Z%3$Cu#0l!`H)Me-QOw zg@NNh;#QZpj*~35)(K>DQq89`>%64M_tJ^u6J0w0la7@(*0rrJ$4OBfq&k#trI{TP zP(-nuEQnwYLEn zW7PXAL_it*yg%zQpdBixxd+9a1a(<14}uHpMsNV@NNrwYQ)8Z3P_#}-Fi)PF=Ye?= z%=0hIdt6B{FE}@ko2PINRIs36r35Qmk@M}mmObRPJB<(mzx4DwkQ*Gw_z3u%%?d&X zAZ(c~#;XWd5Y`Z`BCI1^L%0s$x=Lrd)Jx^Pn#0`3`c15NYT3t4m$`*`)T~y$fxC5E zt?T(iy8#*d005OmMFlAOzqW1E_aU@|GzwX?6M9bW!BaUf43f?C_2B41-FS%+9XB;? WusJQ%Jku{Iq-+4tApvdk)wO@oEA3(c literal 0 HcmV?d00001 diff --git a/backend/application/__pycache__/routes.cpython-310.pyc b/backend/application/__pycache__/routes.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d5552d74ddb96749c6a2204124d593908dbe6747 GIT binary patch literal 6571 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 delta 2073 zcmZ`)OK%)S5T5RN?t8uO^&{SR{aRw<#10VA;EzQB8NyQ9DqYOaO4Ld?FE4pq#zC`;)0O^RlW9liNLG+ru(bz>Z4aB;PIhG8^1Ic!&*4zK4y>E0xg)n9d4mMwZt(ck2G) z(%KqKP3~M-cRX=}d?BXk6L}L>X&|RTysrR!Wrb`iVvBa?`0ap#5T>rG{F8vTzTz|5 z*Y5`!Gm6Tl?(2cRO*ReR0LCmTfgTv!s<=-_i}T8rFMSg;yG`endRUI5Fcufpo2tcC z@uNCHE2ikyrnS!%UKVd?3*#YlWB@>+28qJYB1y70!f}*nz@=!E@*(k)HWq!@_WJ5= z@Vju>rva2m5w3Gn4G6yjQQQes5W+NwD&95@I!)_>voXtggI7%63l8u;fM#s1;rWa8>hfxR$#wVv zRP-a1P)i(M#)*VMWGwDnu6n-155mkV0btZr#vP^NZ{tAOQYWxv{}^E^y!v11Mp zTl87QGb1pUWX0eK9IFUD2-r?sM=$^?D#x6*oIxv{p4<(rYlIAoN1-V?qKJ}_7jxm! z)F>{i;AU&rxVRA>d{)|#As@m87-Q48RCQ|1ljfV|y65o4Dw9EXo+Ew^&yka2Jn{<} z5t(TD!ZT>xeBAR0nnkDgW2k5y?w>$a385pK;(GKHId%8D=s7wtjJo3pX@qHjolwqaX|aW8QQuJ+f&#EbiRk_XM8iS`Zi{g_*Ky=Rs`hwDlR zonAS~o8-*h-;+C}TN=v1f~#tkmH6|xwB?`B(&){x^z?8$=lnG2E0K=e6oF`})w<7L z5Fe%oUy^=4=He_Gl{b=>mAHEoi_EDxP-W7`c0K;f(NN|(IWOMLJe8Y-hu2qp0^OrP zACaQ+0pTSPkCjPA{FRv;hN;qOd!|Dh{Q<2{;1QskW?G4KU;;+#QuRQpA{Rq{;B^h zg>$&(zi<5eTo1V@t|jy0QO-CJhE_(Q@`tUBLjN>EabQI$-$UlabpFv{td6GD;0#*l ztqq>V1Mpqu?H1=bnC`dYN?|C{;h*@Za6DPU4V~q8zi@QCx2a#MEqSY)g0`u`zXAD5 zG(+6+)*5xs@%EnyTg(*CZRxzR4%IS**2WQzAe=-vg>VMpJi;8pB*Olwa@2a=rricx nuQ@01I=nFee9x0)kR-J@3Fkp_AQ_M{NC9LP#5@Tw87Kb$VO*#x diff --git a/backend/application/__pycache__/sessionJWT.cpython-310.pyc b/backend/application/__pycache__/sessionJWT.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..2b9734d55e332e5e150906e5464e5f03510ce463 GIT binary patch literal 1288 zcmZ8h&2Jk;6rYd%vYi?m+J=HamMT>Ck_aR?R8@s2Mg$~-*r2F;ai=>|XPxz~nHe{= zwXTrpHUB{l>5)H(%Un72%nd1m_twD*jJ0oOcHigk_nxa8H`)Z&lRtkKLywR@@N#`| zxO@SR`4WUAk``n}QZl0{rFdrroAK0Z&b;tbUv{J~gI6>SWGJIoBn@RtwqcJXPe{D; z2KVq?WgpV#NkL&hy_`DQY?)NjmoN0nwUGTUd$cOg>~M-DDB$G@X?RM!|`{+ z$IkyI`Si2Tp{SN9CY8?Z@hom>EXVP(I@O4+XUWnF9d zB2#mlS7q#LtUT=?T;oj!&T9}1=VDn@LOQB`Bl=y?`s?04;4Ai@itI#{av%H_c_z@$ zzEQ@&{_WA>-hAo$nO4BWSS;-E*jAt&fW7$;1fvn{GDaBlrU;gRFgqo4#Y&{ ztPje{4iG?STtr#Py*Siwp<*DRRix5=xahZ0yaOV=HQa>R#vN*1>9l`PJ{LtU50QuF zRm>s(Ej3NLdKcXw%NubAPOiU+bB#vSGRP659uSA*1(!X)OS`m3Z*M3>mj6Q`HYd{9 z%-2mg)MN_th19L7Wi|bk!Vt5OYbC=ZIrx5b@D&U}m{rwDu1r&#MyCj|RzEM4vCeP0 z>i-G%vSXEfjN5ViBY-|e=P6CiOS2fBX%p{kWYNU)cJkaDrSYqxcpI9n$1taQY|Zm{>`dO9j8Y5+T>>L|@{@n|2>FGZy8~im53GC+Ac&wD z$!S6`4H>eiv?Fs(!GuJnp+s@KZp$4NIHZ(o(Lh&NJOG@NsQDNT71iP_5N}g3VQYGUeS2_+LBC{jYftQ#b0)B7P zM;HKH6ElM4=EX$tice;Iek!$?@Wmoib6%-JPnsgIybv6m+McH}wVm7Jyb~dL39tiT`ppV@PsM z4H9Wow6FnNWNGBWF!l&`CEoBHkFI8Lvu4^}d%zTXwPCsg4zRk%6c}Q&14GYj!TBAE zSX6`0m~8|s?j2fQS{C{l#G1mbC Date: Wed, 12 Jan 2022 22:57:01 +0100 Subject: [PATCH 02/12] commentaire sur les prints --- backend/application/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/application/__init__.py b/backend/application/__init__.py index e26ae65..9e7b2bb 100644 --- a/backend/application/__init__.py +++ b/backend/application/__init__.py @@ -20,8 +20,8 @@ def create_app(flask_env='development'): if app.config['SQLALCHEMY_DATABASE_URI_1'] is None or app.config['SQLALCHEMY_DATABASE_URI_2'] is None: print('No ENV Variable for DATABASE_URL_USERS or DATABASE_URL_LOGS') sys.exit(1) - #else: - # print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS']) + else: + print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS']) print('init_app') db.init_app(app) From 5780a181826d708b6cc6d12e52dfc911cb9c04f8 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Wed, 12 Jan 2022 23:14:05 +0100 Subject: [PATCH 03/12] test de la route register --- backend/test.py | 236 ++++++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 108 deletions(-) diff --git a/backend/test.py b/backend/test.py index b71faa3..1823861 100644 --- a/backend/test.py +++ b/backend/test.py @@ -45,126 +45,146 @@ class FlaskTestCase(BaseTestCase): # --- LOGIN --- - def test_login_NoFields_statusCode(self): - data0 = {} - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.status_code, 400) + # def test_login_NoFields_statusCode(self): + # data0 = {} + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.status_code, 400) - def test_login_NoFields_message(self): - data0 = {} - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.json['message'], 'Need email, password fields.') + # def test_login_NoFields_message(self): + # data0 = {} + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.json['message'], 'Need email, password fields.') - def test_login_emptyFields_statusCode(self): - data0 = { - "email": "", - "password": "blabla" - } - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.status_code, 400) + # def test_login_emptyFields_statusCode(self): + # data0 = { + # "email": "", + # "password": "blabla" + # } + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.status_code, 400) - def test_login_emptyFields_message(self): - data0 = { - "email": "", - "password": "blabla" - } - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.json['message'], 'Empty email and/or password fields.') + # def test_login_emptyFields_message(self): + # data0 = { + # "email": "", + # "password": "blabla" + # } + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.json['message'], 'Empty email and/or password fields.') - def test_login_wrongFields_statusCode(self): - data0 = { - "email": "nimp@gmail.com", - "password": "nimp" - } - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.status_code, 404) + # def test_login_wrongFields_statusCode(self): + # data0 = { + # "email": "nimp@gmail.com", + # "password": "nimp" + # } + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.status_code, 404) - def test_login_wrongFields_message(self): - data0 = { - "email": "nimp@gmail.com", - "password": "nimp" - } - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.json['message'], 'Email or password invalid') + # def test_login_wrongFields_message(self): + # data0 = { + # "email": "nimp@gmail.com", + # "password": "nimp" + # } + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.json['message'], 'Email or password invalid') - def test_login_success_statusCode(self): - data0 = { - "email": "riri@gmail.com", - "password": "ririPass" - } - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.status_code, 200) + # def test_login_success_statusCode(self): + # data0 = { + # "email": "riri@gmail.com", + # "password": "ririPass" + # } + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.status_code, 200) - def test_login_success_message(self): - data0 = { - "email": "riri@gmail.com", - "password": "ririPass" - } - response = self.client.post('/api/login', json=data0) - self.assertEqual(response.json['message'], 'User authenticated.') + # def test_login_success_message(self): + # data0 = { + # "email": "riri@gmail.com", + # "password": "ririPass" + # } + # response = self.client.post('/api/login', json=data0) + # self.assertEqual(response.json['message'], 'User authenticated.') # --- REGISTER --- - # def test_register_noFields_statusCode(self): - # data0 = {} - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.status_code, 400) + def test_register_noFields_statusCode(self): + data0 = {} + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.status_code, 400) - # def test_register_noFields_message(self): - # data0 = {} - # response = self.client.post('/api/register', json=data0) - # self.assertIn('Need', response.json['message']) + def test_register_noFields_message(self): + data0 = {} + response = self.client.post('/api/register', json=data0) + self.assertIn('Need', response.json['message']) - # def test_register_emptyFields_statusCode(self): - # data0 = { - # "email": "", - # "password": "blabla", - # "nickname": "blabla" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.status_code, 400) + def test_register_emptyFields_statusCode(self): + data0 = { + "email": "", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.status_code, 400) - # def test_register_emptyFields_message(self): - # data0 = { - # "email": "", - # "password": "blabla", - # "nickname": "blabla" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertIn('Need', response.json['message']) + def test_register_emptyFields_message(self): + data0 = { + "email": "", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.json['message'], 'Empty email and/or password and/or nickname fields.') - # def test_register_alreadyExist_statusCode(self): - # data0 = json.dumps({ - # "email": "riri@gmail.com", - # "password": "blabla", - # "nickname": "blabla" - # }) - # response = self.client.post('/api/register', json=data0) - # self.assertIn('already exist', response.message) + def test_register_alreadyExist_statusCode(self): + data0 = { + "email": "riri@gmail.com", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.status_code, 500) + def test_register_alreadyExist_statusCode(self): + data0 = { + "email": "riri@gmail.com", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertIn('already exist', response.json['message']) + + + def test_register_success_statusCode(self): + data0 = { + "email": "loulou@gmail.com", + "password": "loulouPass", + "nickname": "Loulou" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.status_code, 200) + + + def test_register_success_message(self): + data0 = { + "email": "loulou@gmail.com", + "password": "loulouPass", + "nickname": "Loulou" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.json['message'], 'User registered.') - # def test_register_success(self): - # data0 = json.dumps({ - # "email": "loulou@gmail.com", - # "password": "loulouPass", - # "nickname": "Loulou" - # }) - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.message, 'User registered.') # # --- LOGOUT --- @@ -188,7 +208,7 @@ class FlaskTestCase(BaseTestCase): # self.login('riri@gmail.com', 'ririPass') # data0 = json.dumps({}) # response = self.client.put('/api/user/update', data=data0) - # self.assertIn('Need', response.message) + # self.assertIn('Need', response.json['message']) # def test_self_update_empty_fields(self): # self.login('riri@gmail.com', 'ririPass') @@ -197,7 +217,7 @@ class FlaskTestCase(BaseTestCase): # "password": "blabla" # }) # response = self.client.put('/api/user/update', data=data0) - # self.assertEqual(response.message, 'Empty nickname and/or password fields.') + # self.assertEqual(response.json['message'], 'Empty nickname and/or password fields.') # def test_self_update_success(self): # self.login('riri@gmail.com', 'ririPass') @@ -222,26 +242,26 @@ class FlaskTestCase(BaseTestCase): # def test_self_delete_last_admin(self): # self.login('daisy@gmail.com', 'daisyPass') # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.message, 'Can\'t delete last admin') + # self.assertEqual(response.json['message'], 'Can\'t delete last admin') # # --- admin: CREATE USER --- # def test_admin_create_not_connected(self): # data0 = json.dumps({}) # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.message, 'User not authenticated.') + # self.assertEqual(response.json['message'], 'User not authenticated.') # def test_admin_create_no_permission(self): # self.login('riri@gmail.com', 'ririPass') # data0 = json.dumps({}) # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.message, 'User does not have permission.') + # self.assertEqual(response.json['message'], 'User does not have permission.') # def test_admin_create_no_fields(self): # self.login('daisy@gmail.com', 'daisyPass') # data0 = json.dumps({}) # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertIn('Need', response.message) + # self.assertIn('Need', response.json['message']) # def test_admin_create_empty_fields(self): # self.login('daisy@gmail.com', 'daisyPass') @@ -252,7 +272,7 @@ class FlaskTestCase(BaseTestCase): # "is_admin": true, # }) # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.message, 'Empty email and/or nickname and/or password and/or is_admin fields.') + # self.assertEqual(response.json['message'], 'Empty email and/or nickname and/or password and/or is_admin fields.') # def test_admin_create_already_exist(self): # self.login('daisy@gmail.com', 'daisyPass') @@ -262,7 +282,7 @@ class FlaskTestCase(BaseTestCase): # "nickname": "blabla", # }) # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertIn('already exist', response.message) + # self.assertIn('already exist', response.json['message']) # def test_admin_create_success(self): # self.login('daisy@gmail.com', 'daisyPass') @@ -273,26 +293,26 @@ class FlaskTestCase(BaseTestCase): # "is_admin": true, # }) # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.message, 'User registered.') + # self.assertEqual(response.json['message'], 'User registered.') # # --- admin: UPDATE USER --- # def test_admin_update_not_connected(self): # data0 = json.dumps({}) # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.message, 'User not authenticated.') + # self.assertEqual(response.json['message'], 'User not authenticated.') # def test_admin_update_no_permission(self): # self.login('riri@gmail.com', 'ririPass') # data0 = json.dumps({}) # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.message, 'User does not have permission.') + # self.assertEqual(response.json['message'], 'User does not have permission.') # def test_admin_update_no_fields(self): # self.login('daisy@gmail.com', 'daisyPass') # data0 = json.dumps({}) # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertIn('Need', response.message) + # self.assertIn('Need', response.json['message']) # def test_admin_update_empty_fields(self): # self.login('daisy@gmail.com', 'daisyPass') @@ -302,7 +322,7 @@ class FlaskTestCase(BaseTestCase): # "is_admin": false, # }) # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.message, 'Empty is_admin and/or password fields.') + # self.assertEqual(response.json['message'], 'Empty is_admin and/or password fields.') # def test_admin_update_not_exists(self): # self.login('daisy@gmail.com', 'daisyPass') @@ -312,7 +332,7 @@ class FlaskTestCase(BaseTestCase): # "is_admin": false, # }) # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.message, 'User do not exist.') + # self.assertEqual(response.json['message'], 'User do not exist.') # def test_admin_update_success(self): # self.login('daisy@gmail.com', 'daisyPass') @@ -328,24 +348,24 @@ class FlaskTestCase(BaseTestCase): # def test_admin_delete_not_connected(self): # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.message, 'User not authenticated.') + # self.assertEqual(response.json['message'], 'User not authenticated.') # def test_admin_delete_no_permission(self): # self.login('riri@gmail.com', 'ririPass') # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.message, 'User does not have permission.') + # self.assertEqual(response.json['message'], 'User does not have permission.') # def test_admin_delete_no_fields(self): # self.login('daisy@gmail.com', 'daisyPass') # data0 = json.dumps({}) # response = self.client.delete('/api/admin/delete/user') - # self.assertIn('Need', response.message) + # self.assertIn('Need', response.json['message']) # def test_admin_delete_not_exists(self): # self.login('daisy@gmail.com', 'daisyPass') # data0 = json.dumps({"id": 99}) # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.message, 'User do not exist.') + # self.assertEqual(response.json['message'], 'User do not exist.') # def test_admin_delete_success(self): # self.login('daisy@gmail.com', 'daisyPass') From 9bfab1cc34fe677b0d2432d61fe77ced1f837847 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Wed, 12 Jan 2022 23:24:10 +0100 Subject: [PATCH 04/12] tests de la route logout --- backend/test.py | 159 +++++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 77 deletions(-) diff --git a/backend/test.py b/backend/test.py index 1823861..824d978 100644 --- a/backend/test.py +++ b/backend/test.py @@ -36,12 +36,13 @@ class FlaskTestCase(BaseTestCase): # -- UTILS --- - # def login(self, email, password): - # data0 = json.dumps({ - # "email": email, - # "password": password - # }) - # response = self.client.post('/api/login', data=data0) + def login(self, email, password): + data0 = { + "email": email, + "password": password + } + response = self.client.post('/api/login', json=data0) + return response # --- LOGIN --- @@ -114,88 +115,92 @@ class FlaskTestCase(BaseTestCase): # --- REGISTER --- - def test_register_noFields_statusCode(self): - data0 = {} - response = self.client.post('/api/register', json=data0) - self.assertEqual(response.status_code, 400) + # def test_register_noFields_statusCode(self): + # data0 = {} + # response = self.client.post('/api/register', json=data0) + # self.assertEqual(response.status_code, 400) - def test_register_noFields_message(self): - data0 = {} - response = self.client.post('/api/register', json=data0) - self.assertIn('Need', response.json['message']) + # def test_register_noFields_message(self): + # data0 = {} + # response = self.client.post('/api/register', json=data0) + # self.assertIn('Need', response.json['message']) - def test_register_emptyFields_statusCode(self): - data0 = { - "email": "", - "password": "blabla", - "nickname": "blabla" - } - response = self.client.post('/api/register', json=data0) - self.assertEqual(response.status_code, 400) + # def test_register_emptyFields_statusCode(self): + # data0 = { + # "email": "", + # "password": "blabla", + # "nickname": "blabla" + # } + # response = self.client.post('/api/register', json=data0) + # self.assertEqual(response.status_code, 400) - def test_register_emptyFields_message(self): - data0 = { - "email": "", - "password": "blabla", - "nickname": "blabla" - } - response = self.client.post('/api/register', json=data0) - self.assertEqual(response.json['message'], 'Empty email and/or password and/or nickname fields.') + # def test_register_emptyFields_message(self): + # data0 = { + # "email": "", + # "password": "blabla", + # "nickname": "blabla" + # } + # response = self.client.post('/api/register', json=data0) + # self.assertEqual(response.json['message'], 'Empty email and/or password and/or nickname fields.') - def test_register_alreadyExist_statusCode(self): - data0 = { - "email": "riri@gmail.com", - "password": "blabla", - "nickname": "blabla" - } - response = self.client.post('/api/register', json=data0) + # def test_register_alreadyExist_statusCode(self): + # data0 = { + # "email": "riri@gmail.com", + # "password": "blabla", + # "nickname": "blabla" + # } + # response = self.client.post('/api/register', json=data0) + # self.assertEqual(response.status_code, 500) + + + # def test_register_alreadyExist_statusCode(self): + # data0 = { + # "email": "riri@gmail.com", + # "password": "blabla", + # "nickname": "blabla" + # } + # response = self.client.post('/api/register', json=data0) + # self.assertIn('already exist', response.json['message']) + + + # def test_register_success_statusCode(self): + # data0 = { + # "email": "loulou@gmail.com", + # "password": "loulouPass", + # "nickname": "Loulou" + # } + # response = self.client.post('/api/register', json=data0) + # self.assertEqual(response.status_code, 200) + + + # def test_register_success_message(self): + # data0 = { + # "email": "loulou@gmail.com", + # "password": "loulouPass", + # "nickname": "Loulou" + # } + # response = self.client.post('/api/register', json=data0) + # self.assertEqual(response.json['message'], 'User registered.') + + + # --- LOGOUT --- + + def test_logout_fail_(self): + response = self.client.delete('/api/logout') self.assertEqual(response.status_code, 500) - def test_register_alreadyExist_statusCode(self): - data0 = { - "email": "riri@gmail.com", - "password": "blabla", - "nickname": "blabla" - } - response = self.client.post('/api/register', json=data0) - self.assertIn('already exist', response.json['message']) - - - def test_register_success_statusCode(self): - data0 = { - "email": "loulou@gmail.com", - "password": "loulouPass", - "nickname": "Loulou" - } - response = self.client.post('/api/register', json=data0) - self.assertEqual(response.status_code, 200) - - - def test_register_success_message(self): - data0 = { - "email": "loulou@gmail.com", - "password": "loulouPass", - "nickname": "Loulou" - } - response = self.client.post('/api/register', json=data0) - self.assertEqual(response.json['message'], 'User registered.') - - - # # --- LOGOUT --- - - # def test_logout_fail(self): - # response = self.client.delete('/api/logout') - # self.assertEqual(response.status_code, 500) - - # def test_logout_success(self): - # self.login_user() - # response = self.client.delete('/api/logout') - # self.assertEqual(response.status_code, 200) + def test_logout_success(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + response = self.client.delete('/api/logout') + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) # # --- SELF UPDATE --- From 35c1ecf5e3d3ab588d12509d41f34399073569f3 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Wed, 12 Jan 2022 23:47:52 +0100 Subject: [PATCH 05/12] test de la route self update --- backend/test.py | 111 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 33 deletions(-) diff --git a/backend/test.py b/backend/test.py index 824d978..75dfa0d 100644 --- a/backend/test.py +++ b/backend/test.py @@ -189,49 +189,94 @@ class FlaskTestCase(BaseTestCase): # --- LOGOUT --- - def test_logout_fail_(self): - response = self.client.delete('/api/logout') + # def test_logout_fail_(self): + # response = self.client.delete('/api/logout') + # self.assertEqual(response.status_code, 500) + + + # def test_logout_success(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # response = self.client.delete('/api/logout') + # self.assertEqual(response.status_code, 200) + # else: + # self.assertEqual(True, False) + + + + # # --- SELF UPDATE --- + + def test_selfUpdate_notConnected_statusCode(self): + data0 = {} + response = self.client.put('/api/user/update', json=data0) self.assertEqual(response.status_code, 500) - def test_logout_success(self): + def test_selfUpdate_notConnected_message(self): + data0 = {} + response = self.client.put('/api/user/update', json=data0) + self.assertEqual(response.json['message'], 'User not authenticated.') + + + def test_selfUpdate_noFields_statusCode(self): response = self.login("riri@gmail.com", "ririPass") if response.status_code == 200: - response = self.client.delete('/api/logout') + data0 = {} + response = self.client.put('/api/user/update', json=data0) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_selfUpdate_noFields_message(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + data0 = {} + response = self.client.put('/api/user/update', json=data0) + self.assertIn('Need', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_selfUpdate_emptyFields_statusCode(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + data0 = { + "nickname": "", + "password": "blabla" + } + response = self.client.put('/api/user/update', json=data0) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_selfUpdate_emptyFields_message(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + data0 = { + "nickname": "", + "password": "blabla" + } + response = self.client.put('/api/user/update', json=data0) + self.assertEqual(response.json['message'], 'Empty nickname and/or password fields.') + else: + self.assertEqual(True, False) + + + def test_self_update_success_statusCode(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + data0 = { + "nickname": "Ririri", + "password": "ririPass" + } + response = self.client.put('/api/user/update', json=data0) self.assertEqual(response.status_code, 200) else: self.assertEqual(True, False) - # # --- SELF UPDATE --- - # def test_self_update_not_connected(self): - # data0 = json.dumps({}) - # response = self.client.put('/api/user/update', data=data0) - # self.assertEqual(response.status_code, 500) - - # def test_self_update_no_fields(self): - # self.login('riri@gmail.com', 'ririPass') - # data0 = json.dumps({}) - # response = self.client.put('/api/user/update', data=data0) - # self.assertIn('Need', response.json['message']) - - # def test_self_update_empty_fields(self): - # self.login('riri@gmail.com', 'ririPass') - # data0 = json.dumps({ - # "nickname": "", - # "password": "blabla" - # }) - # response = self.client.put('/api/user/update', data=data0) - # self.assertEqual(response.json['message'], 'Empty nickname and/or password fields.') - - # def test_self_update_success(self): - # self.login('riri@gmail.com', 'ririPass') - # data0 = json.dumps({ - # "nickname": "Ririri", - # "password": "ririPass" - # }) - # response = self.client.put('/api/user/update', data=data0) - # self.assertEqual(response.status_code, 200) # # --- SELF DELETE --- From 3baa58a67db2cf06fc4cdea7ad155d036751ad13 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Thu, 13 Jan 2022 00:39:22 +0100 Subject: [PATCH 06/12] tests pour la route admin/create/user --- backend/test.py | 339 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 231 insertions(+), 108 deletions(-) diff --git a/backend/test.py b/backend/test.py index 75dfa0d..b09a3d0 100644 --- a/backend/test.py +++ b/backend/test.py @@ -206,144 +206,267 @@ class FlaskTestCase(BaseTestCase): # # --- SELF UPDATE --- - def test_selfUpdate_notConnected_statusCode(self): - data0 = {} - response = self.client.put('/api/user/update', json=data0) - self.assertEqual(response.status_code, 500) + # def test_selfUpdate_notConnected_statusCode(self): + # data0 = {} + # response = self.client.put('/api/user/update', json=data0) + # self.assertEqual(response.status_code, 500) - def test_selfUpdate_notConnected_message(self): - data0 = {} - response = self.client.put('/api/user/update', json=data0) - self.assertEqual(response.json['message'], 'User not authenticated.') + # def test_selfUpdate_notConnected_message(self): + # data0 = {} + # response = self.client.put('/api/user/update', json=data0) + # self.assertEqual(response.json['message'], 'User not authenticated.') - def test_selfUpdate_noFields_statusCode(self): - response = self.login("riri@gmail.com", "ririPass") - if response.status_code == 200: - data0 = {} - response = self.client.put('/api/user/update', json=data0) - self.assertEqual(response.status_code, 400) - else: - self.assertEqual(True, False) + # def test_selfUpdate_noFields_statusCode(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # data0 = {} + # response = self.client.put('/api/user/update', json=data0) + # self.assertEqual(response.status_code, 400) + # else: + # self.assertEqual(True, False) - def test_selfUpdate_noFields_message(self): - response = self.login("riri@gmail.com", "ririPass") - if response.status_code == 200: - data0 = {} - response = self.client.put('/api/user/update', json=data0) - self.assertIn('Need', response.json['message']) - else: - self.assertEqual(True, False) + # def test_selfUpdate_noFields_message(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # data0 = {} + # response = self.client.put('/api/user/update', json=data0) + # self.assertIn('Need', response.json['message']) + # else: + # self.assertEqual(True, False) - def test_selfUpdate_emptyFields_statusCode(self): - response = self.login("riri@gmail.com", "ririPass") - if response.status_code == 200: - data0 = { - "nickname": "", - "password": "blabla" - } - response = self.client.put('/api/user/update', json=data0) - self.assertEqual(response.status_code, 400) - else: - self.assertEqual(True, False) + # def test_selfUpdate_emptyFields_statusCode(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # data0 = { + # "nickname": "", + # "password": "blabla" + # } + # response = self.client.put('/api/user/update', json=data0) + # self.assertEqual(response.status_code, 400) + # else: + # self.assertEqual(True, False) - def test_selfUpdate_emptyFields_message(self): - response = self.login("riri@gmail.com", "ririPass") - if response.status_code == 200: - data0 = { - "nickname": "", - "password": "blabla" - } - response = self.client.put('/api/user/update', json=data0) - self.assertEqual(response.json['message'], 'Empty nickname and/or password fields.') - else: - self.assertEqual(True, False) + # def test_selfUpdate_emptyFields_message(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # data0 = { + # "nickname": "", + # "password": "blabla" + # } + # response = self.client.put('/api/user/update', json=data0) + # self.assertEqual(response.json['message'], 'Empty nickname and/or password fields.') + # else: + # self.assertEqual(True, False) - def test_self_update_success_statusCode(self): - response = self.login("riri@gmail.com", "ririPass") - if response.status_code == 200: - data0 = { - "nickname": "Ririri", - "password": "ririPass" - } - response = self.client.put('/api/user/update', json=data0) - self.assertEqual(response.status_code, 200) - else: - self.assertEqual(True, False) + # def test_self_update_success_statusCode(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # data0 = { + # "nickname": "Ririri", + # "password": "ririPass" + # } + # response = self.client.put('/api/user/update', json=data0) + # self.assertEqual(response.status_code, 200) + # else: + # self.assertEqual(True, False) # # --- SELF DELETE --- - # def test_self_delete_not_connected(self): + # def test_selfDelete_notConnected_statusCode(self): # response = self.client.delete('/api/user/delete') # self.assertEqual(response.status_code, 500) - # def test_self_delete_success(self): - # self.login('donald@gmail.com', 'donaldPass') - # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.status_code, 200) - # def test_self_delete_last_admin(self): - # self.login('daisy@gmail.com', 'daisyPass') + # def test_selfDelete_notConnected_message(self): # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.json['message'], 'Can\'t delete last admin') + # self.assertEqual(response.json['message'], 'User not authenticated.') + + + # def test_selfDelete_success_statusCode(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # response = self.client.delete('/api/user/delete') + # self.assertEqual(response.status_code, 200) + # else: + # self.assertEqual(True, False) + + + # def test_selfDelete_success_message(self): + # response = self.login("riri@gmail.com", "ririPass") + # if response.status_code == 200: + # response = self.client.delete('/api/user/delete') + # self.assertEqual(response.json['message'], 'User deleted.') + # else: + # self.assertEqual(True, False) + + + # def test_selfDelete_last_admin_statusCode(self): + # response = self.login("donald@gmail.com", "donaldPass") + # if response.status_code == 200: + # response = self.client.delete('/api/user/delete') + # if response.status_code == 200: + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.delete('/api/user/delete') + # self.assertEqual(response.status_code, 400) + # self.assertEqual(True, False) + + + # def test_selfDelete_last_admin_message(self): + # response = self.login("donald@gmail.com", "donaldPass") + # if response.status_code == 200: + # response = self.client.delete('/api/user/delete') + # if response.status_code == 200: + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.delete('/api/user/delete') + # self.assertEqual(response.json['message'], 'Can\'t delete last admin') + # self.assertEqual(True, False) + # # --- admin: CREATE USER --- - # def test_admin_create_not_connected(self): - # data0 = json.dumps({}) - # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.json['message'], 'User not authenticated.') + def test_adminCreate_notConnected_statusCode(self): + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.status_code, 500) - # def test_admin_create_no_permission(self): - # self.login('riri@gmail.com', 'ririPass') - # data0 = json.dumps({}) - # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.json['message'], 'User does not have permission.') - # def test_admin_create_no_fields(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({}) - # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertIn('Need', response.json['message']) + def test_adminCreate_notConnected_message(self): + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.json['message'], 'User not authenticated.') - # def test_admin_create_empty_fields(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({ - # "email": "", - # "nickname": "Mickey", - # "password": "mickeyPass", - # "is_admin": true, - # }) - # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.json['message'], 'Empty email and/or nickname and/or password and/or is_admin fields.') - # def test_admin_create_already_exist(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({ - # "email": "riri@gmail.com", - # "passord": "blabla", - # "nickname": "blabla", - # }) - # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertIn('already exist', response.json['message']) + def test_adminCreate_noPermission_statusCode(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminCreate_noPermission_message(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.json['message'], 'User does not have permission.') + else: + self.assertEqual(True, False) + + + def test_adminCreate_noFields_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_adminCreate_noFields_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertIn('Need', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_adminCreate_emptyFields_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_adminCreate_emptyFields_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.json['message'], 'Empty email and/or nickname and/or password and/or is_admin fields.') + else: + self.assertEqual(True, False) + + + def test_adminCreate_alreadyExist_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "riri@gmail.com", + "passord": "blabla", + "nickname": "blabla", + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminCreate_alreadyExist_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "riri@gmail.com", + "passord": "blabla", + "nickname": "blabla", + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertIn('already exist', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_adminCreate_success_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "mickey@gmail.com", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) + + + def test_adminCreate_success_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "mickey@gmail.com", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.json['message'], 'User registered.') + else: + self.assertEqual(True, False) - # def test_admin_create_success(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({ - # "email": "mickey@gmail.com", - # "nickname": "Mickey", - # "password": "mickeyPass", - # "is_admin": true, - # }) - # response = self.client.post('/api/admin/create/user', data=data0) - # self.assertEqual(response.json['message'], 'User registered.') # # --- admin: UPDATE USER --- From 0dbba6f94a76baaa90958767ba75c9dc31ac7f76 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Thu, 13 Jan 2022 01:22:43 +0100 Subject: [PATCH 07/12] tests pour la route admin/update/user --- backend/test.py | 280 +++++++++++++++++++++++++++++++----------------- 1 file changed, 183 insertions(+), 97 deletions(-) diff --git a/backend/test.py b/backend/test.py index b09a3d0..7baf4a6 100644 --- a/backend/test.py +++ b/backend/test.py @@ -334,188 +334,274 @@ class FlaskTestCase(BaseTestCase): # # --- admin: CREATE USER --- - def test_adminCreate_notConnected_statusCode(self): - response = self.client.post('/api/admin/create/user', json={}) + # def test_adminCreate_notConnected_statusCode(self): + # response = self.client.post('/api/admin/create/user', json={}) + # self.assertEqual(response.status_code, 500) + + + # def test_adminCreate_notConnected_message(self): + # response = self.client.post('/api/admin/create/user', json={}) + # self.assertEqual(response.json['message'], 'User not authenticated.') + + + # def test_adminCreate_noPermission_statusCode(self): + # response = self.login('riri@gmail.com', 'ririPass') + # if response.status_code == 200: + # response = self.client.post('/api/admin/create/user', json={}) + # self.assertEqual(response.status_code, 500) + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_noPermission_message(self): + # response = self.login('riri@gmail.com', 'ririPass') + # if response.status_code == 200: + # response = self.client.post('/api/admin/create/user', json={}) + # self.assertEqual(response.json['message'], 'User does not have permission.') + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_noFields_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.post('/api/admin/create/user', json={}) + # self.assertEqual(response.status_code, 400) + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_noFields_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.post('/api/admin/create/user', json={}) + # self.assertIn('Need', response.json['message']) + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_emptyFields_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "email": "", + # "nickname": "Mickey", + # "password": "mickeyPass", + # "is_admin": True, + # } + # response = self.client.post('/api/admin/create/user', json=data0) + # self.assertEqual(response.status_code, 400) + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_emptyFields_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "email": "", + # "nickname": "Mickey", + # "password": "mickeyPass", + # "is_admin": True, + # } + # response = self.client.post('/api/admin/create/user', json=data0) + # self.assertEqual(response.json['message'], 'Empty email and/or nickname and/or password and/or is_admin fields.') + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_alreadyExist_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "email": "riri@gmail.com", + # "passord": "blabla", + # "nickname": "blabla", + # } + # response = self.client.post('/api/admin/create/user', json=data0) + # self.assertEqual(response.status_code, 500) + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_alreadyExist_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "email": "riri@gmail.com", + # "passord": "blabla", + # "nickname": "blabla", + # } + # response = self.client.post('/api/admin/create/user', json=data0) + # self.assertIn('already exist', response.json['message']) + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_success_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "email": "mickey@gmail.com", + # "nickname": "Mickey", + # "password": "mickeyPass", + # "is_admin": True, + # } + # response = self.client.post('/api/admin/create/user', json=data0) + # self.assertEqual(response.status_code, 200) + # else: + # self.assertEqual(True, False) + + + # def test_adminCreate_success_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "email": "mickey@gmail.com", + # "nickname": "Mickey", + # "password": "mickeyPass", + # "is_admin": True, + # } + # response = self.client.post('/api/admin/create/user', json=data0) + # self.assertEqual(response.json['message'], 'User registered.') + # else: + # self.assertEqual(True, False) + + + # # --- admin: UPDATE USER --- + + def test_adminUpdate_notConnected_statusCode(self): + response = self.client.put('/api/admin/update/user', json={}) self.assertEqual(response.status_code, 500) - def test_adminCreate_notConnected_message(self): - response = self.client.post('/api/admin/create/user', json={}) + def test_adminUpdate_notConnected_message(self): + response = self.client.put('/api/admin/update/user', json={}) self.assertEqual(response.json['message'], 'User not authenticated.') - def test_adminCreate_noPermission_statusCode(self): + def test_adminUpdate_noPermission_statusCode(self): response = self.login('riri@gmail.com', 'ririPass') if response.status_code == 200: - response = self.client.post('/api/admin/create/user', json={}) + response = self.client.put('/api/admin/update/user', json={}) self.assertEqual(response.status_code, 500) else: self.assertEqual(True, False) - def test_adminCreate_noPermission_message(self): + def test_adminUpdate_noPermission_message(self): response = self.login('riri@gmail.com', 'ririPass') if response.status_code == 200: - response = self.client.post('/api/admin/create/user', json={}) + response = self.client.put('/api/admin/update/user', json={}) self.assertEqual(response.json['message'], 'User does not have permission.') else: self.assertEqual(True, False) - def test_adminCreate_noFields_statusCode(self): + def test_adminUpdate_noFields_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - response = self.client.post('/api/admin/create/user', json={}) + response = self.client.put('/api/admin/update/user', json={}) self.assertEqual(response.status_code, 400) else: self.assertEqual(True, False) - def test_adminCreate_noFields_message(self): + def test_adminUpdate_noFields_message(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - response = self.client.post('/api/admin/create/user', json={}) + response = self.client.put('/api/admin/update/user', json={}) self.assertIn('Need', response.json['message']) else: self.assertEqual(True, False) - def test_adminCreate_emptyFields_statusCode(self): + def test_adminUpdate_emptyFields_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: data0 = { - "email": "", - "nickname": "Mickey", - "password": "mickeyPass", - "is_admin": True, + "id": 1, + "password": "", + "is_admin": False, } - response = self.client.post('/api/admin/create/user', json=data0) + response = self.client.put('/api/admin/update/user', json=data0) self.assertEqual(response.status_code, 400) else: self.assertEqual(True, False) - def test_adminCreate_emptyFields_message(self): + def test_adminUpdate_emptyFields_message(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: data0 = { - "email": "", - "nickname": "Mickey", - "password": "mickeyPass", - "is_admin": True, + "id": 1, + "password": "", + "is_admin": False, } - response = self.client.post('/api/admin/create/user', json=data0) - self.assertEqual(response.json['message'], 'Empty email and/or nickname and/or password and/or is_admin fields.') + response = self.client.put('/api/admin/update/user', json=data0) + self.assertEqual(response.json['message'], 'Empty is_admin and/or password fields.') else: self.assertEqual(True, False) - def test_adminCreate_alreadyExist_statusCode(self): + def test_adminUpdate_notExists_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: data0 = { - "email": "riri@gmail.com", - "passord": "blabla", - "nickname": "blabla", + "id": 99, + "password": "blabla", + "is_admin": False } - response = self.client.post('/api/admin/create/user', json=data0) + response = self.client.put('/api/admin/update/user', json=data0) self.assertEqual(response.status_code, 500) else: - self.assertEqual(True, False) + self.assertEqual(True, False) - def test_adminCreate_alreadyExist_message(self): + def test_adminUpdate_notExists_message(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: data0 = { - "email": "riri@gmail.com", - "passord": "blabla", - "nickname": "blabla", + "id": 99, + "password": "blabla", + "is_admin": False } - response = self.client.post('/api/admin/create/user', json=data0) - self.assertIn('already exist', response.json['message']) + response = self.client.put('/api/admin/update/user', json=data0) + self.assertEqual(response.json['message'], 'User do not exist.') else: - self.assertEqual(True, False) + self.assertEqual(True, False) - def test_adminCreate_success_statusCode(self): + def test_adminUpdate_success_message(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: data0 = { - "email": "mickey@gmail.com", - "nickname": "Mickey", - "password": "mickeyPass", - "is_admin": True, + "id": 1, + "password": "roroPass", + "is_admin": False, } - response = self.client.post('/api/admin/create/user', json=data0) + response = self.client.put('/api/admin/update/user', json=data0) self.assertEqual(response.status_code, 200) else: self.assertEqual(True, False) - def test_adminCreate_success_message(self): + def test_adminUpdate_success_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: data0 = { - "email": "mickey@gmail.com", - "nickname": "Mickey", - "password": "mickeyPass", - "is_admin": True, + "id": 1, + "password": "roroPass", + "is_admin": False, } - response = self.client.post('/api/admin/create/user', json=data0) - self.assertEqual(response.json['message'], 'User registered.') + response = self.client.put('/api/admin/update/user', json=data0) + self.assertIn("updated", response.json['message']) else: self.assertEqual(True, False) - # # --- admin: UPDATE USER --- - # def test_admin_update_not_connected(self): - # data0 = json.dumps({}) - # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.json['message'], 'User not authenticated.') - # def test_admin_update_no_permission(self): - # self.login('riri@gmail.com', 'ririPass') - # data0 = json.dumps({}) - # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.json['message'], 'User does not have permission.') - - # def test_admin_update_no_fields(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({}) - # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertIn('Need', response.json['message']) - - # def test_admin_update_empty_fields(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({ - # "id": 1, - # "password": "", - # "is_admin": false, - # }) - # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.json['message'], 'Empty is_admin and/or password fields.') - - # def test_admin_update_not_exists(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({ - # "id": 99, - # "password": "", - # "is_admin": false, - # }) - # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.json['message'], 'User do not exist.') - - # def test_admin_update_success(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({ - # "id": 1, - # "password": "roroPass", - # "is_admin": false, - # }) - # response = self.client.put('/api/admin/update/user', data=data0) - # self.assertEqual(response.status_code, 200) # # --- admin: DELETE USER --- From 9fabef3235b5d0150e8aaf8ef38219b799cfe51a Mon Sep 17 00:00:00 2001 From: MiharyR Date: Thu, 13 Jan 2022 02:01:31 +0100 Subject: [PATCH 08/12] tests pour la route admin/delete/user --- backend/test.py | 262 +++++++++++++++++++++++++++++------------------- 1 file changed, 159 insertions(+), 103 deletions(-) diff --git a/backend/test.py b/backend/test.py index 7baf4a6..30b326e 100644 --- a/backend/test.py +++ b/backend/test.py @@ -470,168 +470,224 @@ class FlaskTestCase(BaseTestCase): # # --- admin: UPDATE USER --- - def test_adminUpdate_notConnected_statusCode(self): - response = self.client.put('/api/admin/update/user', json={}) + # def test_adminUpdate_notConnected_statusCode(self): + # response = self.client.put('/api/admin/update/user', json={}) + # self.assertEqual(response.status_code, 500) + + + # def test_adminUpdate_notConnected_message(self): + # response = self.client.put('/api/admin/update/user', json={}) + # self.assertEqual(response.json['message'], 'User not authenticated.') + + + # def test_adminUpdate_noPermission_statusCode(self): + # response = self.login('riri@gmail.com', 'ririPass') + # if response.status_code == 200: + # response = self.client.put('/api/admin/update/user', json={}) + # self.assertEqual(response.status_code, 500) + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_noPermission_message(self): + # response = self.login('riri@gmail.com', 'ririPass') + # if response.status_code == 200: + # response = self.client.put('/api/admin/update/user', json={}) + # self.assertEqual(response.json['message'], 'User does not have permission.') + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_noFields_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.put('/api/admin/update/user', json={}) + # self.assertEqual(response.status_code, 400) + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_noFields_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.put('/api/admin/update/user', json={}) + # self.assertIn('Need', response.json['message']) + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_emptyFields_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "id": 1, + # "password": "", + # "is_admin": False, + # } + # response = self.client.put('/api/admin/update/user', json=data0) + # self.assertEqual(response.status_code, 400) + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_emptyFields_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "id": 1, + # "password": "", + # "is_admin": False, + # } + # response = self.client.put('/api/admin/update/user', json=data0) + # self.assertEqual(response.json['message'], 'Empty is_admin and/or password fields.') + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_notExists_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "id": 99, + # "password": "blabla", + # "is_admin": False + # } + # response = self.client.put('/api/admin/update/user', json=data0) + # self.assertEqual(response.status_code, 500) + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_notExists_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "id": 99, + # "password": "blabla", + # "is_admin": False + # } + # response = self.client.put('/api/admin/update/user', json=data0) + # self.assertEqual(response.json['message'], 'User do not exist.') + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_success_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "id": 1, + # "password": "roroPass", + # "is_admin": False, + # } + # response = self.client.put('/api/admin/update/user', json=data0) + # self.assertEqual(response.status_code, 200) + # else: + # self.assertEqual(True, False) + + + # def test_adminUpdate_success_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = { + # "id": 1, + # "password": "roroPass", + # "is_admin": False, + # } + # response = self.client.put('/api/admin/update/user', json=data0) + # self.assertIn("updated", response.json['message']) + # else: + # self.assertEqual(True, False) + + + # # --- admin: DELETE USER --- + + def test_adminDelete_notConnected_statusCode(self): + response = self.client.delete('/api/admin/delete/user') self.assertEqual(response.status_code, 500) - def test_adminUpdate_notConnected_message(self): - response = self.client.put('/api/admin/update/user', json={}) + def test_adminDelete_notConnected_message(self): + response = self.client.delete('/api/admin/delete/user') self.assertEqual(response.json['message'], 'User not authenticated.') - def test_adminUpdate_noPermission_statusCode(self): + def test_adminDelete_noPermission_statusCode(self): response = self.login('riri@gmail.com', 'ririPass') if response.status_code == 200: - response = self.client.put('/api/admin/update/user', json={}) + response = self.client.delete('/api/admin/delete/user') self.assertEqual(response.status_code, 500) else: self.assertEqual(True, False) - def test_adminUpdate_noPermission_message(self): + def test_adminDelete_noPermission_message(self): response = self.login('riri@gmail.com', 'ririPass') if response.status_code == 200: - response = self.client.put('/api/admin/update/user', json={}) + response = self.client.delete('/api/admin/delete/user') self.assertEqual(response.json['message'], 'User does not have permission.') else: self.assertEqual(True, False) - def test_adminUpdate_noFields_statusCode(self): + def test_adminDelete_noFields_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - response = self.client.put('/api/admin/update/user', json={}) + response = self.client.delete('/api/admin/delete/user', json={}) self.assertEqual(response.status_code, 400) else: self.assertEqual(True, False) - def test_adminUpdate_noFields_message(self): + def test_adminDelete_no_fields(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - response = self.client.put('/api/admin/update/user', json={}) + response = self.client.delete('/api/admin/delete/user', json={}) self.assertIn('Need', response.json['message']) else: self.assertEqual(True, False) - def test_adminUpdate_emptyFields_statusCode(self): + def test_adminDelete_notExists_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - data0 = { - "id": 1, - "password": "", - "is_admin": False, - } - response = self.client.put('/api/admin/update/user', json=data0) - self.assertEqual(response.status_code, 400) - else: - self.assertEqual(True, False) - - - def test_adminUpdate_emptyFields_message(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - data0 = { - "id": 1, - "password": "", - "is_admin": False, - } - response = self.client.put('/api/admin/update/user', json=data0) - self.assertEqual(response.json['message'], 'Empty is_admin and/or password fields.') - else: - self.assertEqual(True, False) - - - def test_adminUpdate_notExists_statusCode(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - data0 = { - "id": 99, - "password": "blabla", - "is_admin": False - } - response = self.client.put('/api/admin/update/user', json=data0) + data0 = {"id": 99} + response = self.client.delete('/api/admin/delete/user', json=data0) self.assertEqual(response.status_code, 500) else: - self.assertEqual(True, False) + self.assertEqual(True, False) - def test_adminUpdate_notExists_message(self): + def test_adminDelete_notExists_message(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - data0 = { - "id": 99, - "password": "blabla", - "is_admin": False - } - response = self.client.put('/api/admin/update/user', json=data0) + data0 = {"id": 99} + response = self.client.delete('/api/admin/delete/user', json=data0) self.assertEqual(response.json['message'], 'User do not exist.') else: - self.assertEqual(True, False) + self.assertEqual(True, False) - def test_adminUpdate_success_message(self): + def test_adminDelete_success_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - data0 = { - "id": 1, - "password": "roroPass", - "is_admin": False, - } - response = self.client.put('/api/admin/update/user', json=data0) + data0 = {"id": 2} + response = self.client.delete('/api/admin/delete/user', json=data0) self.assertEqual(response.status_code, 200) else: self.assertEqual(True, False) - def test_adminUpdate_success_statusCode(self): + def test_adminDelete_success_message(self): response = self.login('daisy@gmail.com', 'daisyPass') if response.status_code == 200: - data0 = { - "id": 1, - "password": "roroPass", - "is_admin": False, - } - response = self.client.put('/api/admin/update/user', json=data0) - self.assertIn("updated", response.json['message']) + data0 = {"id": 2} + response = self.client.delete('/api/admin/delete/user', json=data0) + self.assertEqual(response.json['message'], 'User deleted.') else: self.assertEqual(True, False) - - - - # # --- admin: DELETE USER --- - - # def test_admin_delete_not_connected(self): - # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.json['message'], 'User not authenticated.') - - # def test_admin_delete_no_permission(self): - # self.login('riri@gmail.com', 'ririPass') - # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.json['message'], 'User does not have permission.') - - # def test_admin_delete_no_fields(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({}) - # response = self.client.delete('/api/admin/delete/user') - # self.assertIn('Need', response.json['message']) - - # def test_admin_delete_not_exists(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({"id": 99}) - # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.json['message'], 'User do not exist.') - - # def test_admin_delete_success(self): - # self.login('daisy@gmail.com', 'daisyPass') - # data0 = json.dumps({"id": 2}) - # response = self.client.delete('/api/admin/delete/user', data=data0) - # self.assertEqual(response.status_code, 200) - # # --- LIST OF USER --- # def test_list_of_users_fail(self): From 2b9d495c9624667dc4da3bbcdcfc947cf718bb79 Mon Sep 17 00:00:00 2001 From: MiharyR Date: Thu, 13 Jan 2022 02:29:50 +0100 Subject: [PATCH 09/12] tests pour la route get/user --- backend/test.py | 187 +++++++++++++++++++++++++----------------------- 1 file changed, 96 insertions(+), 91 deletions(-) diff --git a/backend/test.py b/backend/test.py index 30b326e..c63e632 100644 --- a/backend/test.py +++ b/backend/test.py @@ -44,6 +44,7 @@ class FlaskTestCase(BaseTestCase): response = self.client.post('/api/login', json=data0) return response + # --- LOGIN --- # def test_login_NoFields_statusCode(self): @@ -112,18 +113,15 @@ class FlaskTestCase(BaseTestCase): # self.assertEqual(response.json['message'], 'User authenticated.') - # --- REGISTER --- # def test_register_noFields_statusCode(self): - # data0 = {} - # response = self.client.post('/api/register', json=data0) + # response = self.client.post('/api/register', json={}) # self.assertEqual(response.status_code, 400) # def test_register_noFields_message(self): - # data0 = {} - # response = self.client.post('/api/register', json=data0) + # response = self.client.post('/api/register', json={}) # self.assertIn('Need', response.json['message']) @@ -602,102 +600,109 @@ class FlaskTestCase(BaseTestCase): # # --- admin: DELETE USER --- - def test_adminDelete_notConnected_statusCode(self): - response = self.client.delete('/api/admin/delete/user') + # def test_adminDelete_notConnected_statusCode(self): + # response = self.client.delete('/api/admin/delete/user') + # self.assertEqual(response.status_code, 500) + + + # def test_adminDelete_notConnected_message(self): + # response = self.client.delete('/api/admin/delete/user') + # self.assertEqual(response.json['message'], 'User not authenticated.') + + + # def test_adminDelete_noPermission_statusCode(self): + # response = self.login('riri@gmail.com', 'ririPass') + # if response.status_code == 200: + # response = self.client.delete('/api/admin/delete/user') + # self.assertEqual(response.status_code, 500) + # else: + # self.assertEqual(True, False) + + + # def test_adminDelete_noPermission_message(self): + # response = self.login('riri@gmail.com', 'ririPass') + # if response.status_code == 200: + # response = self.client.delete('/api/admin/delete/user') + # self.assertEqual(response.json['message'], 'User does not have permission.') + # else: + # self.assertEqual(True, False) + + + # def test_adminDelete_noFields_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.delete('/api/admin/delete/user', json={}) + # self.assertEqual(response.status_code, 400) + # else: + # self.assertEqual(True, False) + + + # def test_adminDelete_no_fields(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # response = self.client.delete('/api/admin/delete/user', json={}) + # self.assertIn('Need', response.json['message']) + # else: + # self.assertEqual(True, False) + + + # def test_adminDelete_notExists_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = {"id": 99} + # response = self.client.delete('/api/admin/delete/user', json=data0) + # self.assertEqual(response.status_code, 500) + # else: + # self.assertEqual(True, False) + + + # def test_adminDelete_notExists_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = {"id": 99} + # response = self.client.delete('/api/admin/delete/user', json=data0) + # self.assertEqual(response.json['message'], 'User do not exist.') + # else: + # self.assertEqual(True, False) + + + # def test_adminDelete_success_statusCode(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = {"id": 2} + # response = self.client.delete('/api/admin/delete/user', json=data0) + # self.assertEqual(response.status_code, 200) + # else: + # self.assertEqual(True, False) + + + # def test_adminDelete_success_message(self): + # response = self.login('daisy@gmail.com', 'daisyPass') + # if response.status_code == 200: + # data0 = {"id": 2} + # response = self.client.delete('/api/admin/delete/user', json=data0) + # self.assertEqual(response.json['message'], 'User deleted.') + # else: + # self.assertEqual(True, False) + + + # # --- LIST OF USER --- + + def test_listOfUsers_fail(self): + response = self.client.get('/api/users') self.assertEqual(response.status_code, 500) - def test_adminDelete_notConnected_message(self): - response = self.client.delete('/api/admin/delete/user') - self.assertEqual(response.json['message'], 'User not authenticated.') - - - def test_adminDelete_noPermission_statusCode(self): + def test_listOfUsers_success(self): response = self.login('riri@gmail.com', 'ririPass') if response.status_code == 200: - response = self.client.delete('/api/admin/delete/user') - self.assertEqual(response.status_code, 500) - else: - self.assertEqual(True, False) - - - def test_adminDelete_noPermission_message(self): - response = self.login('riri@gmail.com', 'ririPass') - if response.status_code == 200: - response = self.client.delete('/api/admin/delete/user') - self.assertEqual(response.json['message'], 'User does not have permission.') - else: - self.assertEqual(True, False) - - - def test_adminDelete_noFields_statusCode(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - response = self.client.delete('/api/admin/delete/user', json={}) - self.assertEqual(response.status_code, 400) - else: - self.assertEqual(True, False) - - - def test_adminDelete_no_fields(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - response = self.client.delete('/api/admin/delete/user', json={}) - self.assertIn('Need', response.json['message']) - else: - self.assertEqual(True, False) - - - def test_adminDelete_notExists_statusCode(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - data0 = {"id": 99} - response = self.client.delete('/api/admin/delete/user', json=data0) - self.assertEqual(response.status_code, 500) - else: - self.assertEqual(True, False) - - - def test_adminDelete_notExists_message(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - data0 = {"id": 99} - response = self.client.delete('/api/admin/delete/user', json=data0) - self.assertEqual(response.json['message'], 'User do not exist.') - else: - self.assertEqual(True, False) - - - def test_adminDelete_success_statusCode(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - data0 = {"id": 2} - response = self.client.delete('/api/admin/delete/user', json=data0) + response = self.client.get('/api/users?order_by=nickname') + print(response.json["data"]) self.assertEqual(response.status_code, 200) else: self.assertEqual(True, False) - def test_adminDelete_success_message(self): - response = self.login('daisy@gmail.com', 'daisyPass') - if response.status_code == 200: - data0 = {"id": 2} - response = self.client.delete('/api/admin/delete/user', json=data0) - self.assertEqual(response.json['message'], 'User deleted.') - else: - self.assertEqual(True, False) - - - # # --- LIST OF USER --- - - # def test_list_of_users_fail(self): - # response = self.client.get('/api/users') - # self.assertEqual(response.status_code, 500) - - # def test_list_of_users_success(self): - # self.login('riri@gmail.com', 'ririPass') - # response = self.client.get('/api/users') - # self.assertEqual(response.status_code, 200) if __name__ == '__main__': From 9566d11dd78d7f9c87e1dad2117ee8238ca1b49e Mon Sep 17 00:00:00 2001 From: MiharyR Date: Thu, 13 Jan 2022 02:39:48 +0100 Subject: [PATCH 10/12] tests de toutes les routes - seul 2 tests ne doivent pas passer (user/delete) --- backend/test.py | 1192 ++++++++++++++++++++++++----------------------- 1 file changed, 597 insertions(+), 595 deletions(-) diff --git a/backend/test.py b/backend/test.py index c63e632..ef9d2df 100644 --- a/backend/test.py +++ b/backend/test.py @@ -45,648 +45,651 @@ class FlaskTestCase(BaseTestCase): return response + # --- LOGIN --- - # def test_login_NoFields_statusCode(self): - # data0 = {} - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.status_code, 400) + def test_login_NoFields_statusCode(self): + data0 = {} + response = self.client.post('/api/login', json={}) + self.assertEqual(response.status_code, 400) - # def test_login_NoFields_message(self): - # data0 = {} - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.json['message'], 'Need email, password fields.') + def test_login_NoFields_message(self): + data0 = {} + response = self.client.post('/api/login', json={}) + self.assertEqual(response.json['message'], 'Need email, password fields.') - # def test_login_emptyFields_statusCode(self): - # data0 = { - # "email": "", - # "password": "blabla" - # } - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.status_code, 400) + def test_login_emptyFields_statusCode(self): + data0 = { + "email": "", + "password": "blabla" + } + response = self.client.post('/api/login', json=data0) + self.assertEqual(response.status_code, 400) - # def test_login_emptyFields_message(self): - # data0 = { - # "email": "", - # "password": "blabla" - # } - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.json['message'], 'Empty email and/or password fields.') + def test_login_emptyFields_message(self): + data0 = { + "email": "", + "password": "blabla" + } + response = self.client.post('/api/login', json=data0) + self.assertEqual(response.json['message'], 'Empty email and/or password fields.') - # def test_login_wrongFields_statusCode(self): - # data0 = { - # "email": "nimp@gmail.com", - # "password": "nimp" - # } - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.status_code, 404) + def test_login_wrongFields_statusCode(self): + data0 = { + "email": "nimp@gmail.com", + "password": "nimp" + } + response = self.client.post('/api/login', json=data0) + self.assertEqual(response.status_code, 404) - # def test_login_wrongFields_message(self): - # data0 = { - # "email": "nimp@gmail.com", - # "password": "nimp" - # } - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.json['message'], 'Email or password invalid') + def test_login_wrongFields_message(self): + data0 = { + "email": "nimp@gmail.com", + "password": "nimp" + } + response = self.client.post('/api/login', json=data0) + self.assertEqual(response.json['message'], 'Email or password invalid') - # def test_login_success_statusCode(self): - # data0 = { - # "email": "riri@gmail.com", - # "password": "ririPass" - # } - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.status_code, 200) + def test_login_success_statusCode(self): + data0 = { + "email": "riri@gmail.com", + "password": "ririPass" + } + response = self.client.post('/api/login', json=data0) + self.assertEqual(response.status_code, 200) - # def test_login_success_message(self): - # data0 = { - # "email": "riri@gmail.com", - # "password": "ririPass" - # } - # response = self.client.post('/api/login', json=data0) - # self.assertEqual(response.json['message'], 'User authenticated.') + def test_login_success_message(self): + data0 = { + "email": "riri@gmail.com", + "password": "ririPass" + } + response = self.client.post('/api/login', json=data0) + self.assertEqual(response.json['message'], 'User authenticated.') + # --- REGISTER --- - # def test_register_noFields_statusCode(self): - # response = self.client.post('/api/register', json={}) - # self.assertEqual(response.status_code, 400) + def test_register_noFields_statusCode(self): + response = self.client.post('/api/register', json={}) + self.assertEqual(response.status_code, 400) - # def test_register_noFields_message(self): - # response = self.client.post('/api/register', json={}) - # self.assertIn('Need', response.json['message']) + def test_register_noFields_message(self): + response = self.client.post('/api/register', json={}) + self.assertIn('Need', response.json['message']) - # def test_register_emptyFields_statusCode(self): - # data0 = { - # "email": "", - # "password": "blabla", - # "nickname": "blabla" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.status_code, 400) + def test_register_emptyFields_statusCode(self): + data0 = { + "email": "", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.status_code, 400) - # def test_register_emptyFields_message(self): - # data0 = { - # "email": "", - # "password": "blabla", - # "nickname": "blabla" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.json['message'], 'Empty email and/or password and/or nickname fields.') + def test_register_emptyFields_message(self): + data0 = { + "email": "", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.json['message'], 'Empty email and/or password and/or nickname fields.') - # def test_register_alreadyExist_statusCode(self): - # data0 = { - # "email": "riri@gmail.com", - # "password": "blabla", - # "nickname": "blabla" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.status_code, 500) + def test_register_alreadyExist_statusCode(self): + data0 = { + "email": "riri@gmail.com", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.status_code, 500) - # def test_register_alreadyExist_statusCode(self): - # data0 = { - # "email": "riri@gmail.com", - # "password": "blabla", - # "nickname": "blabla" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertIn('already exist', response.json['message']) + def test_register_alreadyExist_statusCode(self): + data0 = { + "email": "riri@gmail.com", + "password": "blabla", + "nickname": "blabla" + } + response = self.client.post('/api/register', json=data0) + self.assertIn('already exist', response.json['message']) - # def test_register_success_statusCode(self): - # data0 = { - # "email": "loulou@gmail.com", - # "password": "loulouPass", - # "nickname": "Loulou" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.status_code, 200) + def test_register_success_statusCode(self): + data0 = { + "email": "loulou@gmail.com", + "password": "loulouPass", + "nickname": "Loulou" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.status_code, 200) - # def test_register_success_message(self): - # data0 = { - # "email": "loulou@gmail.com", - # "password": "loulouPass", - # "nickname": "Loulou" - # } - # response = self.client.post('/api/register', json=data0) - # self.assertEqual(response.json['message'], 'User registered.') + def test_register_success_message(self): + data0 = { + "email": "loulou@gmail.com", + "password": "loulouPass", + "nickname": "Loulou" + } + response = self.client.post('/api/register', json=data0) + self.assertEqual(response.json['message'], 'User registered.') + # --- LOGOUT --- - # def test_logout_fail_(self): - # response = self.client.delete('/api/logout') - # self.assertEqual(response.status_code, 500) + def test_logout_fail_(self): + response = self.client.delete('/api/logout') + self.assertEqual(response.status_code, 500) - # def test_logout_success(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # response = self.client.delete('/api/logout') - # self.assertEqual(response.status_code, 200) - # else: - # self.assertEqual(True, False) + def test_logout_success(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + response = self.client.delete('/api/logout') + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) - # # --- SELF UPDATE --- - - # def test_selfUpdate_notConnected_statusCode(self): - # data0 = {} - # response = self.client.put('/api/user/update', json=data0) - # self.assertEqual(response.status_code, 500) + # --- SELF UPDATE --- + def test_selfUpdate_notConnected_statusCode(self): + response = self.client.put('/api/user/update', json={}) + self.assertEqual(response.status_code, 500) - # def test_selfUpdate_notConnected_message(self): - # data0 = {} - # response = self.client.put('/api/user/update', json=data0) - # self.assertEqual(response.json['message'], 'User not authenticated.') - - - # def test_selfUpdate_noFields_statusCode(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # data0 = {} - # response = self.client.put('/api/user/update', json=data0) - # self.assertEqual(response.status_code, 400) - # else: - # self.assertEqual(True, False) - - - # def test_selfUpdate_noFields_message(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # data0 = {} - # response = self.client.put('/api/user/update', json=data0) - # self.assertIn('Need', response.json['message']) - # else: - # self.assertEqual(True, False) - - - # def test_selfUpdate_emptyFields_statusCode(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # data0 = { - # "nickname": "", - # "password": "blabla" - # } - # response = self.client.put('/api/user/update', json=data0) - # self.assertEqual(response.status_code, 400) - # else: - # self.assertEqual(True, False) - - - # def test_selfUpdate_emptyFields_message(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # data0 = { - # "nickname": "", - # "password": "blabla" - # } - # response = self.client.put('/api/user/update', json=data0) - # self.assertEqual(response.json['message'], 'Empty nickname and/or password fields.') - # else: - # self.assertEqual(True, False) + def test_selfUpdate_notConnected_message(self): + response = self.client.put('/api/user/update', json={}) + self.assertEqual(response.json['message'], 'User not authenticated.') - # def test_self_update_success_statusCode(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # data0 = { - # "nickname": "Ririri", - # "password": "ririPass" - # } - # response = self.client.put('/api/user/update', json=data0) - # self.assertEqual(response.status_code, 200) - # else: - # self.assertEqual(True, False) - - - - # # --- SELF DELETE --- - # def test_selfDelete_notConnected_statusCode(self): - # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.status_code, 500) - - - # def test_selfDelete_notConnected_message(self): - # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.json['message'], 'User not authenticated.') - - - # def test_selfDelete_success_statusCode(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.status_code, 200) - # else: - # self.assertEqual(True, False) - - - # def test_selfDelete_success_message(self): - # response = self.login("riri@gmail.com", "ririPass") - # if response.status_code == 200: - # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.json['message'], 'User deleted.') - # else: - # self.assertEqual(True, False) - - - # def test_selfDelete_last_admin_statusCode(self): - # response = self.login("donald@gmail.com", "donaldPass") - # if response.status_code == 200: - # response = self.client.delete('/api/user/delete') - # if response.status_code == 200: - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.status_code, 400) - # self.assertEqual(True, False) - - - # def test_selfDelete_last_admin_message(self): - # response = self.login("donald@gmail.com", "donaldPass") - # if response.status_code == 200: - # response = self.client.delete('/api/user/delete') - # if response.status_code == 200: - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.delete('/api/user/delete') - # self.assertEqual(response.json['message'], 'Can\'t delete last admin') - # self.assertEqual(True, False) - - - # # --- admin: CREATE USER --- - - # def test_adminCreate_notConnected_statusCode(self): - # response = self.client.post('/api/admin/create/user', json={}) - # self.assertEqual(response.status_code, 500) - - - # def test_adminCreate_notConnected_message(self): - # response = self.client.post('/api/admin/create/user', json={}) - # self.assertEqual(response.json['message'], 'User not authenticated.') - - - # def test_adminCreate_noPermission_statusCode(self): - # response = self.login('riri@gmail.com', 'ririPass') - # if response.status_code == 200: - # response = self.client.post('/api/admin/create/user', json={}) - # self.assertEqual(response.status_code, 500) - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_noPermission_message(self): - # response = self.login('riri@gmail.com', 'ririPass') - # if response.status_code == 200: - # response = self.client.post('/api/admin/create/user', json={}) - # self.assertEqual(response.json['message'], 'User does not have permission.') - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_noFields_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.post('/api/admin/create/user', json={}) - # self.assertEqual(response.status_code, 400) - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_noFields_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.post('/api/admin/create/user', json={}) - # self.assertIn('Need', response.json['message']) - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_emptyFields_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "email": "", - # "nickname": "Mickey", - # "password": "mickeyPass", - # "is_admin": True, - # } - # response = self.client.post('/api/admin/create/user', json=data0) - # self.assertEqual(response.status_code, 400) - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_emptyFields_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "email": "", - # "nickname": "Mickey", - # "password": "mickeyPass", - # "is_admin": True, - # } - # response = self.client.post('/api/admin/create/user', json=data0) - # self.assertEqual(response.json['message'], 'Empty email and/or nickname and/or password and/or is_admin fields.') - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_alreadyExist_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "email": "riri@gmail.com", - # "passord": "blabla", - # "nickname": "blabla", - # } - # response = self.client.post('/api/admin/create/user', json=data0) - # self.assertEqual(response.status_code, 500) - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_alreadyExist_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "email": "riri@gmail.com", - # "passord": "blabla", - # "nickname": "blabla", - # } - # response = self.client.post('/api/admin/create/user', json=data0) - # self.assertIn('already exist', response.json['message']) - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_success_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "email": "mickey@gmail.com", - # "nickname": "Mickey", - # "password": "mickeyPass", - # "is_admin": True, - # } - # response = self.client.post('/api/admin/create/user', json=data0) - # self.assertEqual(response.status_code, 200) - # else: - # self.assertEqual(True, False) - - - # def test_adminCreate_success_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "email": "mickey@gmail.com", - # "nickname": "Mickey", - # "password": "mickeyPass", - # "is_admin": True, - # } - # response = self.client.post('/api/admin/create/user', json=data0) - # self.assertEqual(response.json['message'], 'User registered.') - # else: - # self.assertEqual(True, False) - - - # # --- admin: UPDATE USER --- - - # def test_adminUpdate_notConnected_statusCode(self): - # response = self.client.put('/api/admin/update/user', json={}) - # self.assertEqual(response.status_code, 500) - - - # def test_adminUpdate_notConnected_message(self): - # response = self.client.put('/api/admin/update/user', json={}) - # self.assertEqual(response.json['message'], 'User not authenticated.') - - - # def test_adminUpdate_noPermission_statusCode(self): - # response = self.login('riri@gmail.com', 'ririPass') - # if response.status_code == 200: - # response = self.client.put('/api/admin/update/user', json={}) - # self.assertEqual(response.status_code, 500) - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_noPermission_message(self): - # response = self.login('riri@gmail.com', 'ririPass') - # if response.status_code == 200: - # response = self.client.put('/api/admin/update/user', json={}) - # self.assertEqual(response.json['message'], 'User does not have permission.') - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_noFields_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.put('/api/admin/update/user', json={}) - # self.assertEqual(response.status_code, 400) - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_noFields_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.put('/api/admin/update/user', json={}) - # self.assertIn('Need', response.json['message']) - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_emptyFields_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "id": 1, - # "password": "", - # "is_admin": False, - # } - # response = self.client.put('/api/admin/update/user', json=data0) - # self.assertEqual(response.status_code, 400) - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_emptyFields_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "id": 1, - # "password": "", - # "is_admin": False, - # } - # response = self.client.put('/api/admin/update/user', json=data0) - # self.assertEqual(response.json['message'], 'Empty is_admin and/or password fields.') - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_notExists_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "id": 99, - # "password": "blabla", - # "is_admin": False - # } - # response = self.client.put('/api/admin/update/user', json=data0) - # self.assertEqual(response.status_code, 500) - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_notExists_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "id": 99, - # "password": "blabla", - # "is_admin": False - # } - # response = self.client.put('/api/admin/update/user', json=data0) - # self.assertEqual(response.json['message'], 'User do not exist.') - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_success_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "id": 1, - # "password": "roroPass", - # "is_admin": False, - # } - # response = self.client.put('/api/admin/update/user', json=data0) - # self.assertEqual(response.status_code, 200) - # else: - # self.assertEqual(True, False) - - - # def test_adminUpdate_success_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = { - # "id": 1, - # "password": "roroPass", - # "is_admin": False, - # } - # response = self.client.put('/api/admin/update/user', json=data0) - # self.assertIn("updated", response.json['message']) - # else: - # self.assertEqual(True, False) - - - # # --- admin: DELETE USER --- - - # def test_adminDelete_notConnected_statusCode(self): - # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.status_code, 500) - - - # def test_adminDelete_notConnected_message(self): - # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.json['message'], 'User not authenticated.') - - - # def test_adminDelete_noPermission_statusCode(self): - # response = self.login('riri@gmail.com', 'ririPass') - # if response.status_code == 200: - # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.status_code, 500) - # else: - # self.assertEqual(True, False) - - - # def test_adminDelete_noPermission_message(self): - # response = self.login('riri@gmail.com', 'ririPass') - # if response.status_code == 200: - # response = self.client.delete('/api/admin/delete/user') - # self.assertEqual(response.json['message'], 'User does not have permission.') - # else: - # self.assertEqual(True, False) - - - # def test_adminDelete_noFields_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.delete('/api/admin/delete/user', json={}) - # self.assertEqual(response.status_code, 400) - # else: - # self.assertEqual(True, False) - - - # def test_adminDelete_no_fields(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # response = self.client.delete('/api/admin/delete/user', json={}) - # self.assertIn('Need', response.json['message']) - # else: - # self.assertEqual(True, False) - - - # def test_adminDelete_notExists_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = {"id": 99} - # response = self.client.delete('/api/admin/delete/user', json=data0) - # self.assertEqual(response.status_code, 500) - # else: - # self.assertEqual(True, False) - - - # def test_adminDelete_notExists_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = {"id": 99} - # response = self.client.delete('/api/admin/delete/user', json=data0) - # self.assertEqual(response.json['message'], 'User do not exist.') - # else: - # self.assertEqual(True, False) - - - # def test_adminDelete_success_statusCode(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = {"id": 2} - # response = self.client.delete('/api/admin/delete/user', json=data0) - # self.assertEqual(response.status_code, 200) - # else: - # self.assertEqual(True, False) - - - # def test_adminDelete_success_message(self): - # response = self.login('daisy@gmail.com', 'daisyPass') - # if response.status_code == 200: - # data0 = {"id": 2} - # response = self.client.delete('/api/admin/delete/user', json=data0) - # self.assertEqual(response.json['message'], 'User deleted.') - # else: - # self.assertEqual(True, False) - - - # # --- LIST OF USER --- + def test_selfUpdate_noFields_statusCode(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + response = self.client.put('/api/user/update', json={}) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_selfUpdate_noFields_message(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + response = self.client.put('/api/user/update', json={}) + self.assertIn('Need', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_selfUpdate_emptyFields_statusCode(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + data0 = { + "nickname": "", + "password": "blabla" + } + response = self.client.put('/api/user/update', json=data0) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_selfUpdate_emptyFields_message(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + data0 = { + "nickname": "", + "password": "blabla" + } + response = self.client.put('/api/user/update', json=data0) + self.assertEqual(response.json['message'], 'Empty nickname and/or password fields.') + else: + self.assertEqual(True, False) + + + def test_self_update_success_statusCode(self): + response = self.login("riri@gmail.com", "ririPass") + if response.status_code == 200: + data0 = { + "nickname": "Ririri", + "password": "ririPass" + } + response = self.client.put('/api/user/update', json=data0) + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) + + + + # --- SELF DELETE --- + + def test_selfDelete_notConnected_statusCode(self): + response = self.client.delete('/api/user/delete') + self.assertEqual(response.status_code, 500) + + + def test_selfDelete_notConnected_message(self): + response = self.client.delete('/api/user/delete') + self.assertEqual(response.json['message'], 'User not authenticated.') + + + def test_selfDelete_success_statusCode(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.delete('/api/user/delete') + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) + + + def test_selfDelete_success_message(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.delete('/api/user/delete') + self.assertEqual(response.json['message'], 'User deleted.') + else: + self.assertEqual(True, False) + + + def test_selfDelete_last_admin_statusCode(self): + response = response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.delete('/api/user/delete') + if response.status_code == 200: + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.delete('/api/user/delete') + self.assertEqual(response.status_code, 400) + self.assertEqual(True, False) + + + def test_selfDelete_last_admin_message(self): + response = self.login('donald@gmail.com', 'donaldPass') + if response.status_code == 200: + response = self.client.delete('/api/user/delete') + if response.status_code == 200: + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.delete('/api/user/delete') + self.assertEqual(response.json['message'], 'Can\'t delete last admin') + self.assertEqual(True, False) + + + + # --- admin: CREATE USER --- + + def test_adminCreate_notConnected_statusCode(self): + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.status_code, 500) + + + def test_adminCreate_notConnected_message(self): + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.json['message'], 'User not authenticated.') + + + def test_adminCreate_noPermission_statusCode(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminCreate_noPermission_message(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.json['message'], 'User does not have permission.') + else: + self.assertEqual(True, False) + + + def test_adminCreate_noFields_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_adminCreate_noFields_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.post('/api/admin/create/user', json={}) + self.assertIn('Need', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_adminCreate_emptyFields_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_adminCreate_emptyFields_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.json['message'], 'Empty email and/or nickname and/or password and/or is_admin fields.') + else: + self.assertEqual(True, False) + + + def test_adminCreate_alreadyExist_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "riri@gmail.com", + "passord": "blabla", + "nickname": "blabla", + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminCreate_alreadyExist_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "riri@gmail.com", + "passord": "blabla", + "nickname": "blabla", + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertIn('already exist', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_adminCreate_success_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "mickey@gmail.com", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) + + + def test_adminCreate_success_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "email": "mickey@gmail.com", + "nickname": "Mickey", + "password": "mickeyPass", + "is_admin": True, + } + response = self.client.post('/api/admin/create/user', json=data0) + self.assertEqual(response.json['message'], 'User registered.') + else: + self.assertEqual(True, False) + + + + # --- admin: UPDATE USER --- + + def test_adminUpdate_notConnected_statusCode(self): + response = self.client.put('/api/admin/update/user', json={}) + self.assertEqual(response.status_code, 500) + + + def test_adminUpdate_notConnected_message(self): + response = self.client.put('/api/admin/update/user', json={}) + self.assertEqual(response.json['message'], 'User not authenticated.') + + + def test_adminUpdate_noPermission_statusCode(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.put('/api/admin/update/user', json={}) + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminUpdate_noPermission_message(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.put('/api/admin/update/user', json={}) + self.assertEqual(response.json['message'], 'User does not have permission.') + else: + self.assertEqual(True, False) + + + def test_adminUpdate_noFields_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.put('/api/admin/update/user', json={}) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_adminUpdate_noFields_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.put('/api/admin/update/user', json={}) + self.assertIn('Need', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_adminUpdate_emptyFields_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "id": 1, + "password": "", + "is_admin": False, + } + response = self.client.put('/api/admin/update/user', json=data0) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_adminUpdate_emptyFields_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "id": 1, + "password": "", + "is_admin": False, + } + response = self.client.put('/api/admin/update/user', json=data0) + self.assertEqual(response.json['message'], 'Empty is_admin and/or password fields.') + else: + self.assertEqual(True, False) + + + def test_adminUpdate_notExists_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "id": 99, + "password": "blabla", + "is_admin": False + } + response = self.client.put('/api/admin/update/user', json=data0) + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminUpdate_notExists_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "id": 99, + "password": "blabla", + "is_admin": False + } + response = self.client.put('/api/admin/update/user', json=data0) + self.assertEqual(response.json['message'], 'User do not exist.') + else: + self.assertEqual(True, False) + + + def test_adminUpdate_success_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "id": 1, + "password": "roroPass", + "is_admin": False, + } + response = self.client.put('/api/admin/update/user', json=data0) + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) + + + def test_adminUpdate_success_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = { + "id": 1, + "password": "roroPass", + "is_admin": False, + } + response = self.client.put('/api/admin/update/user', json=data0) + self.assertIn("updated", response.json['message']) + else: + self.assertEqual(True, False) + + + + # --- admin: DELETE USER --- + + def test_adminDelete_notConnected_statusCode(self): + response = self.client.delete('/api/admin/delete/user') + self.assertEqual(response.status_code, 500) + + + def test_adminDelete_notConnected_message(self): + response = self.client.delete('/api/admin/delete/user') + self.assertEqual(response.json['message'], 'User not authenticated.') + + + def test_adminDelete_noPermission_statusCode(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.delete('/api/admin/delete/user') + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminDelete_noPermission_message(self): + response = self.login('riri@gmail.com', 'ririPass') + if response.status_code == 200: + response = self.client.delete('/api/admin/delete/user') + self.assertEqual(response.json['message'], 'User does not have permission.') + else: + self.assertEqual(True, False) + + + def test_adminDelete_noFields_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.delete('/api/admin/delete/user', json={}) + self.assertEqual(response.status_code, 400) + else: + self.assertEqual(True, False) + + + def test_adminDelete_no_fields(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + response = self.client.delete('/api/admin/delete/user', json={}) + self.assertIn('Need', response.json['message']) + else: + self.assertEqual(True, False) + + + def test_adminDelete_notExists_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = {"id": 99} + response = self.client.delete('/api/admin/delete/user', json=data0) + self.assertEqual(response.status_code, 500) + else: + self.assertEqual(True, False) + + + def test_adminDelete_notExists_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = {"id": 99} + response = self.client.delete('/api/admin/delete/user', json=data0) + self.assertEqual(response.json['message'], 'User do not exist.') + else: + self.assertEqual(True, False) + + + def test_adminDelete_success_statusCode(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = {"id": 2} + response = self.client.delete('/api/admin/delete/user', json=data0) + self.assertEqual(response.status_code, 200) + else: + self.assertEqual(True, False) + + + def test_adminDelete_success_message(self): + response = self.login('daisy@gmail.com', 'daisyPass') + if response.status_code == 200: + data0 = {"id": 2} + response = self.client.delete('/api/admin/delete/user', json=data0) + self.assertEqual(response.json['message'], 'User deleted.') + else: + self.assertEqual(True, False) + + + + # --- LIST OF USER --- def test_listOfUsers_fail(self): response = self.client.get('/api/users') @@ -697,7 +700,6 @@ class FlaskTestCase(BaseTestCase): response = self.login('riri@gmail.com', 'ririPass') if response.status_code == 200: response = self.client.get('/api/users?order_by=nickname') - print(response.json["data"]) self.assertEqual(response.status_code, 200) else: self.assertEqual(True, False) From 22f6d316b44efa179dfe8847cc4c03c6264031ab Mon Sep 17 00:00:00 2001 From: MiharyR Date: Thu, 13 Jan 2022 12:13:04 +0100 Subject: [PATCH 11/12] connexion avec le backend pour la page login --- frontend/src/app/app.module.ts | 2 ++ .../services/message/message.service.ts | 33 +++++++++++++++++-- .../common/services/profil/profil.service.ts | 31 +++++++++++++++-- .../login/page-login/page-login.component.ts | 27 +++++++-------- frontend/src/environments/environment.ts | 3 +- 5 files changed, 78 insertions(+), 18 deletions(-) diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index c87f35c..ebfbd59 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -28,6 +28,7 @@ import { PageRegistryComponent } from './user/page-registry/page-registry.compon import { PopupDeleteProfilComponent } from './common/components/popup-delete-profil/popup-delete-profil.component'; import {MatSortModule} from "@angular/material/sort"; import { PopupUpdatePersonAdminComponent } from './admin/userList/popup-update-person-admin/popup-update-person-admin.component'; +import {HttpClientModule} from "@angular/common/http"; @@ -51,6 +52,7 @@ import { PopupUpdatePersonAdminComponent } from './admin/userList/popup-update-p AppRoutingModule, FormsModule, BrowserAnimationsModule, + HttpClientModule, MatFormFieldModule, MatInputModule, MatButtonModule, diff --git a/frontend/src/app/common/services/message/message.service.ts b/frontend/src/app/common/services/message/message.service.ts index b22bacf..e67dc5a 100644 --- a/frontend/src/app/common/services/message/message.service.ts +++ b/frontend/src/app/common/services/message/message.service.ts @@ -1,9 +1,38 @@ import { Injectable } from '@angular/core'; +import {HttpClient, HttpParams} from "@angular/common/http"; +import {Observable} from "rxjs"; +import {environment} from "../../../../environments/environment"; @Injectable({ providedIn: 'root' }) -export class MessageService { +export class MessageService +{ + + constructor( private http: HttpClient ) { } + + post(url: string, data: any): Observable + { + const urlComplete = environment.debutUrl + url ; + return this.http.post(urlComplete, data, {withCredentials: true}); + } + + get(url: string, params:HttpParams = new HttpParams()): Observable + { + const urlComplete = environment.debutUrl + url ; + return this.http.get(urlComplete,{ withCredentials: true, params: params }); + } + + put(url: string, data: any): Observable + { + const urlComplete = environment.debutUrl + url ; + return this.http.put(urlComplete, data, {withCredentials: true}); + } + + delete(url: string): Observable + { + const urlComplete = environment.debutUrl + url ; + return this.http.delete(urlComplete,{withCredentials: true}); + } - constructor() { } } diff --git a/frontend/src/app/common/services/profil/profil.service.ts b/frontend/src/app/common/services/profil/profil.service.ts index 213c1f3..0d209c0 100644 --- a/frontend/src/app/common/services/profil/profil.service.ts +++ b/frontend/src/app/common/services/profil/profil.service.ts @@ -3,7 +3,34 @@ import { Injectable } from '@angular/core'; @Injectable({ providedIn: 'root' }) -export class ProfilService { +export class ProfilService +{ + + getId(): number | null + { + let idString = localStorage.getItem('id'); + if(idString === null) return null; + else return parseInt(idString); + } + + setId(id: number): void + { + localStorage.setItem('id', id.toString()); + } + + getIsAdmin(): boolean + { + let isAdminString = localStorage.getItem('isAdmin'); + if(isAdminString === "T") return true; + else return false; + } + + setIsAdmin(isAdmin: boolean): void + { + let isAdminString = "" ; + if(isAdmin) isAdminString = "T"; + else isAdminString = "F"; + localStorage.setItem('isAdmin', isAdminString); + } - constructor() { } } diff --git a/frontend/src/app/login/page-login/page-login.component.ts b/frontend/src/app/login/page-login/page-login.component.ts index 0076521..6dbfc62 100644 --- a/frontend/src/app/login/page-login/page-login.component.ts +++ b/frontend/src/app/login/page-login/page-login.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; import {Router} from "@angular/router"; import {MessageService} from "../../common/services/message/message.service"; -import {HashageService} from "../../common/services/hashage/hashage.service"; +import {ProfilService} from "../../common/services/profil/profil.service"; @@ -20,7 +20,7 @@ export class PageLoginComponent constructor( private messageService: MessageService, private router: Router, - private hashageService: HashageService ) { } + private profilService: ProfilService ) { } // Appuie sur le bouton "seConnecter" @@ -29,30 +29,31 @@ export class PageLoginComponent this.checkField(); if(!this.hasError) { - let data = { + const data = { email: this.email, - hash_pass: this.hashageService.run(this.password) + password: this.password }; - console.log(data); - /* this.messageService - .sendMessage('user/auth', data) - .subscribe( retour => this.callbackSeConnecter(retour)) - */ + .post('login', data) + .subscribe( retour => this.onSeConnecterCallback(retour), err => this.onSeConnecterCallback(err)); } } // Callback de "onSeConnecter" - callbackSeConnecter(retour: any): void + onSeConnecterCallback(retour: any): void { - if(retour.status !== 200) + console.log(retour); + if(retour.status !== "success") { - this.errorMessage = retour.error.data.reason; + this.errorMessage = retour.message; this.hasError = true; } else { - //this.router.navigateByUrl( '/search' ); + this.profilService.setId(retour.data.id); + this.profilService.setIsAdmin(retour.data.is_admin) + if(!retour.data.is_admin) this.router.navigateByUrl('admin/userList'); + else this.router.navigateByUrl('user/userList'); } } diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index f56ff47..d219c15 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -3,7 +3,8 @@ // The list of file replacements can be found in `angular.json`. export const environment = { - production: false + production: false, + debutUrl: "http://127.0.0.1:5000/api/" }; /* From 6b9a6d7c73c8158788ea38f643f6d3c97133f61a Mon Sep 17 00:00:00 2001 From: MiharyR Date: Thu, 13 Jan 2022 14:46:01 +0100 Subject: [PATCH 12/12] =?UTF-8?q?connexion=20avec=20le=20back=20(non=20tes?= =?UTF-8?q?t=C3=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page-user-list.component.html | 2 +- .../page-user-list.component.ts | 70 ++++++++++++------- .../popup-create-person.component.ts | 12 +++- .../components/navbar/navbar.component.html | 4 +- .../components/navbar/navbar.component.ts | 10 ++- .../page-profil/page-profil.component.html | 4 +- .../page-profil/page-profil.component.ts | 64 ++++++++--------- .../popup-delete-profil.component.ts | 47 ++++++++++++- .../popup-update-profil.component.ts | 41 ++++++----- .../services/message/message.service.ts | 2 +- .../common/services/profil/profil.service.ts | 10 ++- .../login/page-login/page-login.component.ts | 4 +- .../page-register/page-register.component.ts | 32 ++++----- .../page-registry/page-registry.component.ts | 43 +++++++----- 14 files changed, 215 insertions(+), 130 deletions(-) diff --git a/frontend/src/app/admin/userList/page-user-list/page-user-list.component.html b/frontend/src/app/admin/userList/page-user-list/page-user-list.component.html index 81abaa9..483b6db 100644 --- a/frontend/src/app/admin/userList/page-user-list/page-user-list.component.html +++ b/frontend/src/app/admin/userList/page-user-list/page-user-list.component.html @@ -4,7 +4,7 @@
-
diff --git a/frontend/src/app/admin/userList/page-user-list/page-user-list.component.ts b/frontend/src/app/admin/userList/page-user-list/page-user-list.component.ts index dcb2dc8..b398b65 100644 --- a/frontend/src/app/admin/userList/page-user-list/page-user-list.component.ts +++ b/frontend/src/app/admin/userList/page-user-list/page-user-list.component.ts @@ -1,6 +1,5 @@ import {AfterViewInit, Component, ViewChild} from '@angular/core'; import {MatTableDataSource} from "@angular/material/table"; -import {FictitiousDatasService} from "../../../common/services/fictitiousDatas/fictitious-datas.service"; import {MatSort} from "@angular/material/sort"; import {MatPaginator} from "@angular/material/paginator"; import {MatDialog} from "@angular/material/dialog"; @@ -8,6 +7,7 @@ import {PopupCreatePersonComponent} from "../popup-create-person/popup-create-pe import {MatSnackBar} from "@angular/material/snack-bar"; import {PopupUpdatePersonAdminComponent} from "../popup-update-person-admin/popup-update-person-admin.component"; import {PopupDeleteProfilComponent} from "../../../common/components/popup-delete-profil/popup-delete-profil.component"; +import {MessageService} from "../../../common/services/message/message.service"; @@ -25,24 +25,34 @@ export class PageUserListComponent implements AfterViewInit configSnackBar = { duration: 2000, panelClass: "custom-class" }; - constructor( private fictitiousDatasService: FictitiousDatasService, + constructor( private messageService: MessageService, public dialog: MatDialog, private snackBar: MatSnackBar) { } ngAfterViewInit(): void { - // Faux code - let tabPerson = this.fictitiousDatasService.getTabPerson(5); + this.messageService + .get('users?order_by=nickname') + .subscribe(retour => this.ngAfterViewInitCallback(retour), err => this.ngAfterViewInitCallback(err)); + } - // Vrai code ... - tabPerson = tabPerson.map( person => { - if(!person.is_admin) return Object.assign(person, {role: "utilisateur"}); - else return Object.assign(person, {role: "admin"}); - }); - this.dataSource = new MatTableDataSource(tabPerson); - this.dataSource.sort = this.sort; - this.dataSource.paginator = this.paginator; + + ngAfterViewInitCallback(retour: any): void + { + if(retour.status !== "success") { + console.log(retour); + } + else { + let tabPerson: { id: number, email: string, nickname: string, is_admin: boolean }[] = retour.data; + tabPerson = tabPerson.map( person => { + if(!person.is_admin) return Object.assign(person, {role: "utilisateur"}); + else return Object.assign(person, {role: "admin"}); + }); + this.dataSource = new MatTableDataSource(tabPerson); + this.dataSource.sort = this.sort; + this.dataSource.paginator = this.paginator; + } } @@ -53,20 +63,21 @@ export class PageUserListComponent implements AfterViewInit } - // Appuie sur le bouton "add" - onAdd(): void + // Appuie sur le bouton "create" + onCreate(): void { const config = { width: '50%' }; this.dialog .open(PopupCreatePersonComponent, config) .afterClosed() - .subscribe( person => { + .subscribe( retour => { - if((person === null) || (person === undefined)) { + if((retour === null) || (retour === undefined)) + { this.snackBar.open( "Opération annulée", "", this.configSnackBar); } else { - this.dataSource.data.push(person); + this.dataSource.data.push(retour.data); this.dataSource.data = this.dataSource.data; this.dataSource = this.dataSource; this.snackBar.open( "L'utilisateur a bien été créé ✔", "", this.configSnackBar); @@ -85,17 +96,18 @@ export class PageUserListComponent implements AfterViewInit this.dialog .open(PopupUpdatePersonAdminComponent, config) .afterClosed() - .subscribe( personUpdated => { + .subscribe( retour => { - if((personUpdated === null) || (personUpdated === undefined)) { - this.snackBar.open( "Opération annulée", "", this.configSnackBar); + if((retour === null) || (retour === undefined)) + { + this.snackBar.open("Opération annulée", "", this.configSnackBar); } else { const index = this.dataSource.data.findIndex( elt => (elt.id === personToUpdate.id)); - this.dataSource.data.splice(index, 1, personUpdated); + this.dataSource.data.splice(index, 1, retour.data); this.dataSource.data = this.dataSource.data; this.dataSource = this.dataSource; - this.snackBar.open( "L'utilisateur a bien été modifié ✔", "", this.configSnackBar); + this.snackBar.open("L'utilisateur a bien été modifié ✔", "", this.configSnackBar); } }); @@ -115,19 +127,23 @@ export class PageUserListComponent implements AfterViewInit this.dialog .open(PopupDeleteProfilComponent, config) .afterClosed() - .subscribe( personUpdated => { + .subscribe( retour => { - if((personUpdated === null) || (personUpdated === undefined)) { - this.snackBar.open( "Opération annulée", "", this.configSnackBar); + if((retour === null) || (retour === undefined)) + { + this.snackBar.open("Opération annulée", "", this.configSnackBar); + } + else if(retour.status === "error") + { + this.snackBar.open(retour.message, "", this.configSnackBar); } else { const index = this.dataSource.data.findIndex( elt => (elt.id === personToDelete.id)); this.dataSource.data.splice(index, 1); this.dataSource.data = this.dataSource.data; this.dataSource = this.dataSource; - this.snackBar.open( "L'utilisateur a bien été supprimé ✔", "", this.configSnackBar); + this.snackBar.open("L'utilisateur a bien été supprimé ✔", "", this.configSnackBar); } - }); } diff --git a/frontend/src/app/admin/userList/popup-create-person/popup-create-person.component.ts b/frontend/src/app/admin/userList/popup-create-person/popup-create-person.component.ts index 48db16b..23f6a13 100644 --- a/frontend/src/app/admin/userList/popup-create-person/popup-create-person.component.ts +++ b/frontend/src/app/admin/userList/popup-create-person/popup-create-person.component.ts @@ -52,13 +52,19 @@ export class PopupCreatePersonComponent // Callback de 'onValider' onValiderCallback(retour: any) { - if(retour.status === 'error') + if(retour.status === 'success') + { + this.dialogRef.close(retour); + } + else if(retour.status === 'error') { console.log(retour); - this.dialogRef.close(null); + this.errorMessage = retour.message; + this.hasError = true; } else { - this.dialogRef.close(this.person); + console.log(retour); + this.dialogRef.close(null); } } diff --git a/frontend/src/app/common/components/navbar/navbar.component.html b/frontend/src/app/common/components/navbar/navbar.component.html index 4c06dd1..2d09333 100644 --- a/frontend/src/app/common/components/navbar/navbar.component.html +++ b/frontend/src/app/common/components/navbar/navbar.component.html @@ -66,7 +66,7 @@ - @@ -100,7 +100,7 @@ - diff --git a/frontend/src/app/common/components/navbar/navbar.component.ts b/frontend/src/app/common/components/navbar/navbar.component.ts index 1e1e6b5..ab28821 100644 --- a/frontend/src/app/common/components/navbar/navbar.component.ts +++ b/frontend/src/app/common/components/navbar/navbar.component.ts @@ -1,4 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; +import {ProfilService} from "../../services/profil/profil.service"; @Component({ selector: 'app-navbar', @@ -9,9 +10,14 @@ export class NavbarComponent implements OnInit { @Input() pour = "login"; - constructor() { } + constructor(private profilService: ProfilService) { } ngOnInit(): void {} - onDeconnexion(): void {} + onDeconnexion(): void + { + this.profilService.setId(-1); + this.profilService.setIsAdmin(false); + } + } diff --git a/frontend/src/app/common/components/page-profil/page-profil.component.html b/frontend/src/app/common/components/page-profil/page-profil.component.html index d98804a..ad7d8a3 100644 --- a/frontend/src/app/common/components/page-profil/page-profil.component.html +++ b/frontend/src/app/common/components/page-profil/page-profil.component.html @@ -23,8 +23,8 @@
Rôle:
- utilisateur - admin + utilisateur + admin
diff --git a/frontend/src/app/common/components/page-profil/page-profil.component.ts b/frontend/src/app/common/components/page-profil/page-profil.component.ts index 90f67bd..f1f8349 100644 --- a/frontend/src/app/common/components/page-profil/page-profil.component.ts +++ b/frontend/src/app/common/components/page-profil/page-profil.component.ts @@ -2,9 +2,11 @@ import { Component, OnInit } from '@angular/core'; import {MatDialog} from "@angular/material/dialog"; import {MatSnackBar} from "@angular/material/snack-bar"; import {PopupUpdateProfilComponent} from "../popup-update-profil/popup-update-profil.component"; -import {FictitiousDatasService} from "../../services/fictitiousDatas/fictitious-datas.service"; import {Router} from "@angular/router"; import {PopupDeleteProfilComponent} from "../popup-delete-profil/popup-delete-profil.component"; +import {MessageService} from "../../services/message/message.service"; +import {HttpParams} from "@angular/common/http"; +import {ProfilService} from "../../services/profil/profil.service"; @@ -19,31 +21,42 @@ export class PageProfilComponent implements OnInit id: "", nickname: "", email: "", - hash_pass: "", is_admin: false, }; from: string = "" ; + configSnackbar = { duration: 3000, panelClass: "custom-class" }; - constructor( public dialog: MatDialog, + constructor( private messageService: MessageService, + private profilService: ProfilService, + public dialog: MatDialog, private snackBar: MatSnackBar, - private fictitiousDatasService: FictitiousDatasService, private router: Router ) { } ngOnInit(): void { - // faux code - if(this.router.url.startsWith("/user")) { - this.person = this.fictitiousDatasService.getUser(); - this.from = "user" ; - } - else if(this.router.url.startsWith("/admin")){ - this.person = this.fictitiousDatasService.getAdmin(); - this.from = "admin" ; - } + if(this.router.url.startsWith("/user")) this.from = "user" ; + else if(this.router.url.startsWith("/admin")) this.from = "admin" ; - // Vrai code ... + let params = new HttpParams() + params = params.set("order", ""); + params = params.set("id", this.profilService.getId()); + this.messageService + .get("user", params) + .subscribe(ret => this.ngOnInitCallback(ret), err => this.ngOnInitCallback(err)); + } + + + // Callback de ngOnInit + ngOnInitCallback(retour: any): void + { + if(retour.status !== "success") { + console.log(retour); + } + else { + this.person = retour.data[0]; + } } @@ -64,15 +77,8 @@ export class PageProfilComponent implements OnInit // Callback de onModifier onModifierCallback(retour: any): void { - if((retour === null) || (retour === undefined)) - { - const config = { duration: 1000, panelClass: "custom-class" }; - this.snackBar.open( "Opération annulé", "", config); - } - else - { - this.person = retour; - } + if((retour === null) || (retour === undefined)) this.snackBar.open( "Opération annulé", "", this.configSnackbar); + else if(retour.status === "success") this.person = retour.data; } @@ -96,15 +102,9 @@ export class PageProfilComponent implements OnInit // Callback de onSupprimer onSupprimerCallback(retour: any): void { - if((retour === null) || (retour === undefined)) - { - const config = { duration: 1000, panelClass: "custom-class" }; - this.snackBar.open( "Opération annulé", "", config); - } - else - { - this.router.navigateByUrl("/login"); - } + if((retour === null) || (retour === undefined)) this.snackBar.open( "Opération annulé", "", this.configSnackbar); + else if(retour.status === "error") this.snackBar.open(retour.message, "", this.configSnackbar); + else if(retour.status === "success") this.router.navigateByUrl("/login"); } } diff --git a/frontend/src/app/common/components/popup-delete-profil/popup-delete-profil.component.ts b/frontend/src/app/common/components/popup-delete-profil/popup-delete-profil.component.ts index e5efad8..2b3065a 100644 --- a/frontend/src/app/common/components/popup-delete-profil/popup-delete-profil.component.ts +++ b/frontend/src/app/common/components/popup-delete-profil/popup-delete-profil.component.ts @@ -1,5 +1,7 @@ import {Component, Inject, OnInit} from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; +import {MessageService} from "../../services/message/message.service"; +import {HttpParams} from "@angular/common/http"; @@ -10,19 +12,58 @@ import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; }) export class PopupDeleteProfilComponent implements OnInit { + id: number; me: boolean = false; // on se supprime soi-même email: string = ""; - constructor( public dialogRef: MatDialogRef, + + constructor( private messageService: MessageService, + public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any ) { } + ngOnInit(): void { + this.id = this.data.id; this.me = this.data.me; this.email = this.data.email; } - onValider(): void { - this.dialogRef.close(true); + + // Appuie sur 'valider' + onValider(): void + { + if(this.me) + { + this.messageService + .delete("user/delete") + .subscribe(ret => this.onValiderCallback(ret), err => this.onValiderCallback(err)); + } + else { + let params = new HttpParams(); + params = params.set("id", this.id); + this.messageService + .delete("admin/delete", params) + .subscribe(ret => this.onValiderCallback(ret), err => this.onValiderCallback(err)); + } + } + + + // Callback de onValider + onValiderCallback(retour: any): void + { + if(retour.status === "success") + { + this.dialogRef.close(retour); + } + else if(retour.status === "error") + { + console.log(retour); + this.dialogRef.close(retour); + } + else { + console.log(retour); + this.dialogRef.close(null); + } } } diff --git a/frontend/src/app/common/components/popup-update-profil/popup-update-profil.component.ts b/frontend/src/app/common/components/popup-update-profil/popup-update-profil.component.ts index 9753ac7..4d92bc2 100644 --- a/frontend/src/app/common/components/popup-update-profil/popup-update-profil.component.ts +++ b/frontend/src/app/common/components/popup-update-profil/popup-update-profil.component.ts @@ -1,7 +1,7 @@ import {Component, Inject, OnInit} from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; import {CheckEmailService} from "../../services/checkEmail/check-email.service"; -import {HashageService} from "../../services/hashage/hashage.service"; +import {MessageService} from "../../services/message/message.service"; @@ -20,10 +20,10 @@ export class PopupUpdateProfilComponent implements OnInit errorMessage: string = "" ; - constructor( public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - private checkEmailService: CheckEmailService, - private hashageService: HashageService ) { } + constructor( private checkEmailService: CheckEmailService, + private messageService: MessageService, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any ) { } ngOnInit(): void @@ -33,7 +33,6 @@ export class PopupUpdateProfilComponent implements OnInit id: person.id, nickname: person.nickname, email: person.email, - hash_pass: person.hash_pass, is_admin: person.is_admin }; } @@ -45,13 +44,14 @@ export class PopupUpdateProfilComponent implements OnInit this.checkField(); if(!this.hasError) { - if(this.changePassword) this.personCopy.hash_pass = this.hashageService.run(this.newPassword); - const data = { user: this.personCopy }; - - // ... - - // Faux code - this.onValiderCallback({ status: "success"}); + let data: any = {nickname: this.personCopy.nickname}; + if(this.changePassword) data = { + nickname: this.personCopy.nickname, + password: this.newPassword + }; + this.messageService + .put("user/update", data) + .subscribe(ret => this.onValiderCallback(ret), err => this.onValiderCallback(err)); } } @@ -59,14 +59,19 @@ export class PopupUpdateProfilComponent implements OnInit // Callback de 'onValider' onValiderCallback(retour: any) { - if(retour.status === 'error') + if(retour.status === "success") + { + this.dialogRef.close(retour); + } + else if(retour.status === "error") { console.log(retour); - this.dialogRef.close(null); + this.errorMessage = retour.message; + this.hasError = true; } - else - { - this.dialogRef.close(this.personCopy); + else { + console.log(retour); + this.dialogRef.close(null); } } diff --git a/frontend/src/app/common/services/message/message.service.ts b/frontend/src/app/common/services/message/message.service.ts index e67dc5a..4c4ec1c 100644 --- a/frontend/src/app/common/services/message/message.service.ts +++ b/frontend/src/app/common/services/message/message.service.ts @@ -29,7 +29,7 @@ export class MessageService return this.http.put(urlComplete, data, {withCredentials: true}); } - delete(url: string): Observable + delete(url: string, params:HttpParams = new HttpParams()): Observable { const urlComplete = environment.debutUrl + url ; return this.http.delete(urlComplete,{withCredentials: true}); diff --git a/frontend/src/app/common/services/profil/profil.service.ts b/frontend/src/app/common/services/profil/profil.service.ts index 0d209c0..4f1c55a 100644 --- a/frontend/src/app/common/services/profil/profil.service.ts +++ b/frontend/src/app/common/services/profil/profil.service.ts @@ -6,10 +6,16 @@ import { Injectable } from '@angular/core'; export class ProfilService { - getId(): number | null + constructor() + { + this.setId(-1); + this.setIsAdmin(false); + } + + getId(): number { let idString = localStorage.getItem('id'); - if(idString === null) return null; + if(idString === null) return -1; else return parseInt(idString); } diff --git a/frontend/src/app/login/page-login/page-login.component.ts b/frontend/src/app/login/page-login/page-login.component.ts index 6dbfc62..d855ba1 100644 --- a/frontend/src/app/login/page-login/page-login.component.ts +++ b/frontend/src/app/login/page-login/page-login.component.ts @@ -43,16 +43,16 @@ export class PageLoginComponent // Callback de "onSeConnecter" onSeConnecterCallback(retour: any): void { - console.log(retour); if(retour.status !== "success") { + console.log(retour); this.errorMessage = retour.message; this.hasError = true; } else { this.profilService.setId(retour.data.id); this.profilService.setIsAdmin(retour.data.is_admin) - if(!retour.data.is_admin) this.router.navigateByUrl('admin/userList'); + if(retour.data.is_admin) this.router.navigateByUrl('admin/userList'); else this.router.navigateByUrl('user/userList'); } } diff --git a/frontend/src/app/register/page-register/page-register.component.ts b/frontend/src/app/register/page-register/page-register.component.ts index d3ccf85..6638448 100644 --- a/frontend/src/app/register/page-register/page-register.component.ts +++ b/frontend/src/app/register/page-register/page-register.component.ts @@ -4,6 +4,7 @@ import {Router} from "@angular/router"; import {CheckEmailService} from "../../common/services/checkEmail/check-email.service"; import {MatDialog} from "@angular/material/dialog"; import {PopupConfirmRegisterComponent} from "../popup-confirm-register/popup-confirm-register.component"; +import {MessageService} from "../../common/services/message/message.service"; @@ -27,8 +28,8 @@ export class PageRegisterComponent errorMessage: string = ""; - constructor( private hashageService: HashageService, - private checkEmailService: CheckEmailService, + constructor( private checkEmailService: CheckEmailService, + private messageService: MessageService, private router: Router, public dialog: MatDialog ) { } @@ -39,18 +40,14 @@ export class PageRegisterComponent this.checkField(); if(!this.hasError) { - this.person.hash_pass = this.hashageService.run(this.password); - - // FAUX CODE - const retour = { status: "succes", data: {} }; - this.onValiderCallback(retour); - - // VRAI CODE - /* + const data = { + email: this.person.email, + nickname: this.person.nickname, + is_admin: false + }; this.messageService - .sendMessage('register', this.user) - .subscribe(retour => this.onValiderCallback(retour)); - */ + .post('register', data) + .subscribe( retour => this.onValiderCallback(retour), err => this.onValiderCallback(err)); } } @@ -58,16 +55,17 @@ export class PageRegisterComponent // Callback de "onValider" onValiderCallback(retour: any): void { - if(retour.status === "error") + if(retour.status !== "success") { console.log(retour); + this.errorMessage = retour.message; + this.hasError = true; } - else - { + else { this.dialog .open(PopupConfirmRegisterComponent, {}) .afterClosed() - .subscribe(retour => this.router.navigateByUrl("/")); + .subscribe(retour => this.router.navigateByUrl("/login")); } } diff --git a/frontend/src/app/user/page-registry/page-registry.component.ts b/frontend/src/app/user/page-registry/page-registry.component.ts index 6d0e1b9..6fca3ed 100644 --- a/frontend/src/app/user/page-registry/page-registry.component.ts +++ b/frontend/src/app/user/page-registry/page-registry.component.ts @@ -2,8 +2,7 @@ import {AfterViewInit, Component, ViewChild} from '@angular/core'; import {MatTableDataSource} from "@angular/material/table"; import {MatSort} from "@angular/material/sort"; import {MatPaginator} from "@angular/material/paginator"; -import {FictitiousDatasService} from "../../common/services/fictitiousDatas/fictitious-datas.service"; -import {MatDialog} from "@angular/material/dialog"; +import {MessageService} from "../../common/services/message/message.service"; @@ -15,33 +14,41 @@ import {MatDialog} from "@angular/material/dialog"; export class PageRegistryComponent implements AfterViewInit { displayedColumns: string[] = [ "nickname", "email", "role" ]; - dataSource: MatTableDataSource; + dataSource: MatTableDataSource = new MatTableDataSource(); @ViewChild(MatSort) sort: MatSort; @ViewChild(MatPaginator) paginator: MatPaginator; - constructor( private fictitiousDatasService: FictitiousDatasService, - public dialog: MatDialog ) { } + constructor( private messageService: MessageService ) { } ngAfterViewInit(): void { - // Faux code - let tabPerson = this.fictitiousDatasService.getTabPerson(5); - - // Vrai code ... - - tabPerson = tabPerson.map( person => { - if(!person.is_admin) return Object.assign(person, {role: "utilisateur"}); - else return Object.assign(person, {role: "admin"}); - }); - this.dataSource = new MatTableDataSource(tabPerson); - this.dataSource.sort = this.sort; - this.dataSource.paginator = this.paginator; + this.messageService + .get('users?order_by=nickname') + .subscribe(retour => this.ngAfterViewInitCallback(retour), err => this.ngAfterViewInitCallback(err)); } - applyFilter(event: Event) + ngAfterViewInitCallback(retour: any): void + { + if(retour.status !== "success") { + console.log(retour); + } + else { + let tabPerson: { id: number, email: string, nickname: string, is_admin: boolean }[] = retour.data; + tabPerson = tabPerson.map( person => { + if(!person.is_admin) return Object.assign(person, {role: "utilisateur"}); + else return Object.assign(person, {role: "admin"}); + }); + this.dataSource = new MatTableDataSource(tabPerson); + this.dataSource.sort = this.sort; + this.dataSource.paginator = this.paginator; + } + } + + + applyFilter(event: Event): void { const filterValue = (event.target as HTMLInputElement).value; this.dataSource.filter = filterValue.trim().toLowerCase();