From 080059837b56007eb7d65db1b36bd734a9653430 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sat, 5 Oct 2019 18:39:01 +0530
Subject: [PATCH 01/14] feat: amazon OAuth (conditional)

---
 app/config/providers.php  |   5 ++
 app/controllers/auth.php  |   3 +
 src/Auth/OAuth/Amazon.php | 127 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+)
 create mode 100644 src/Auth/OAuth/Amazon.php

diff --git a/app/config/providers.php b/app/config/providers.php
index b45ca52a74..7cfe0c9440 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -61,4 +61,9 @@ return [
         'icon' => 'icon-apple',
         'enabled' => false,
     ],
+    'amazon' => [
+        'developers' => 'https://www.dropbox.com/developers/documentation',
+        'icon' => 'icon-amazon',
+        'enabled' => true,
+    ],
 ];
diff --git a/app/controllers/auth.php b/app/controllers/auth.php
index 75d7da05f2..22c4aaacae 100644
--- a/app/controllers/auth.php
+++ b/app/controllers/auth.php
@@ -730,6 +730,9 @@ $utopia->get('/v1/auth/oauth/:provider/redirect')
             $defaultState = ['success' => $project->getAttribute('url', ''), 'failure' => ''];
             $validateURL = new URL();
 
+            // Uncomment this while testing amazon oAuth
+            $state = html_entity_decode($state);
+
             if (!empty($state)) {
                 try {
                     $state = array_merge($defaultState, json_decode($state, true));
diff --git a/src/Auth/OAuth/Amazon.php b/src/Auth/OAuth/Amazon.php
new file mode 100644
index 0000000000..d280b02765
--- /dev/null
+++ b/src/Auth/OAuth/Amazon.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Auth\OAuth;
+
+use Auth\OAuth;
+
+// Reference Material
+// https://developer.amazon.com/docs/login-with-amazon/authorization-code-grant.html
+// https://developer.amazon.com/docs/login-with-amazon/register-web.html
+class Amazon extends OAuth
+{
+    /**
+     * @var array
+     */
+    protected $user = [];
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'amazon';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLoginURL(): string
+    {
+        return 'https://www.amazon.com/ap/oa?' .
+            'client_id='.urlencode($this->appID).
+            '&redirect_uri='.urlencode($this->callback).
+            '&response_type=code'.
+            '&state='.urlencode(json_encode($this->state)).
+            '&scope=profile';
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
+    public function getAccessToken(string $code): string
+    {
+
+        $headers[] = 'Content-Type: application/x-www-form-urlencoded;charset=UTF-8';
+        $accessToken = $this->request(
+            'POST',
+            'https://api.amazon.com/auth/o2/token',
+            $headers,
+            'code=' . urlencode($code) .
+            '&client_id=' . urlencode($this->appID) .
+            '&client_secret=' . urlencode($this->appSecret).
+            '&redirect_uri='.urlencode($this->callback).
+            '&grant_type=authorization_code'
+        );
+        $accessToken = json_decode($accessToken, true);
+
+        if (isset($accessToken['access_token'])) {
+            return $accessToken['access_token'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserID(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['user_id'])) {
+            return $user['user_id'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserEmail(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['email'])) {
+            return $user['email'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserName(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['name'])) {
+            return $user['name'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return array
+     */
+    protected function getUser(string $accessToken): array
+    {
+        if (empty($this->user)) {
+            $user = $this->request('GET', 'https://api.amazon.com/user/profile?access_token='.urlencode($accessToken));
+            $this->user = json_decode($user, true);
+        }
+        return $this->user;
+    }
+}

From 0d53d260daa085195f5f990437c251f7f40d0f07 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sat, 5 Oct 2019 18:42:46 +0530
Subject: [PATCH 02/14] feat: lint fix

---
 app/controllers/auth.php  | 2 +-
 src/Auth/OAuth/Amazon.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/auth.php b/app/controllers/auth.php
index 22c4aaacae..a904c1abd6 100644
--- a/app/controllers/auth.php
+++ b/app/controllers/auth.php
@@ -731,7 +731,7 @@ $utopia->get('/v1/auth/oauth/:provider/redirect')
             $validateURL = new URL();
 
             // Uncomment this while testing amazon oAuth
-            $state = html_entity_decode($state);
+            // $state = html_entity_decode($state);
 
             if (!empty($state)) {
                 try {
diff --git a/src/Auth/OAuth/Amazon.php b/src/Auth/OAuth/Amazon.php
index d280b02765..0b52f681f9 100644
--- a/src/Auth/OAuth/Amazon.php
+++ b/src/Auth/OAuth/Amazon.php
@@ -42,7 +42,6 @@ class Amazon extends OAuth
      */
     public function getAccessToken(string $code): string
     {
-
         $headers[] = 'Content-Type: application/x-www-form-urlencoded;charset=UTF-8';
         $accessToken = $this->request(
             'POST',

From 39faf2f05b82cd884e6ca0b392076f69da19cec4 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sat, 5 Oct 2019 18:43:28 +0530
Subject: [PATCH 03/14] chore: disabled amazon oAuth

---
 app/config/providers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/providers.php b/app/config/providers.php
index 7cfe0c9440..d4c05b9a9d 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -64,6 +64,6 @@ return [
     'amazon' => [
         'developers' => 'https://www.dropbox.com/developers/documentation',
         'icon' => 'icon-amazon',
-        'enabled' => true,
+        'enabled' => false,
     ],
 ];

From 965a68afd381c7e80ae07644013c73a9952f5418 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sat, 5 Oct 2019 18:46:07 +0530
Subject: [PATCH 04/14] chore: added Amazon OAuth Docs

---
 src/Auth/OAuth/Amazon.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Auth/OAuth/Amazon.php b/src/Auth/OAuth/Amazon.php
index 0b52f681f9..d9cf84e73f 100644
--- a/src/Auth/OAuth/Amazon.php
+++ b/src/Auth/OAuth/Amazon.php
@@ -7,6 +7,7 @@ use Auth\OAuth;
 // Reference Material
 // https://developer.amazon.com/docs/login-with-amazon/authorization-code-grant.html
 // https://developer.amazon.com/docs/login-with-amazon/register-web.html
+// https://developer.amazon.com/docs/login-with-amazon/obtain-customer-profile.html
 class Amazon extends OAuth
 {
     /**

From d126ebc787c93333ed1cb1d8ac7400958cbf7987 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 02:05:30 +0530
Subject: [PATCH 05/14] chore: added amazon image

---
 public/images/oauth/amazon.png | Bin 0 -> 4989 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/images/oauth/amazon.png

diff --git a/public/images/oauth/amazon.png b/public/images/oauth/amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ce2da81e0a6929c408a1cbb0f05e7b9c3fb5d07
GIT binary patch
literal 4989
zcmai2cTm$oxBbxsq$Pkf=|u=dIzo^hgwT`@0s<zKD4_)iMVd;Lk^s^KQ4|EJB7)Kt
z4IPwjXd+EIN(m4Mk8j>zZ|2Q>v$K2l-n(aacINE8Gn;hF!ieP}-$eibSm4Gmt8+yD
zr!!EWk7qH|H0MC;rDv`O0PoV7PTc9vZDEA5l{o-}Ujcxa#{h7A?uz*X0Kp0Xu;vB;
z&|CoE_Ah9%ynY_IaM#ob2Aut;y=Z-tdG2BKH+ICF<M~R!6)5}Qy?Z{P4}zN;(l1=3
z;}jLs!Ew(60J{$yre_mM+$;#ovKh<kXy2YC-Pv>*lQA8cQF-D+W1_&<#X_Kg!n7<G
zl9&`N)2|3BISQElPBJMr;wVnyO-bX?`t|WXjQ^TKVt27Fj^QE8fW?TDEmqE@uY$C7
zx}5Gbqc-U>6X!C6E3YBfK(||)wz2Kx8NcQ@7%kmuQSD2?j&gB22MuE?J65Zhr;j+@
zmW2PSnW#2O1N1V0_HeTLz(&?fLCCLLOYdK2Wh9CyjmvM^O<)M|I3lQnU0+n6`&AZ7
zP@5REW4u5yFiKNvgdqZy3va;Er)(|ll-e3Reavmq!6kjG8!axv2p=gNi?l36LifVR
z^V0;os+k=MVL)?jEnV%y*WZlpj{ehbAUvj~%SEH*?(ry`+ck7+LcXcCQd}2i(nry7
z2gh(`U~a(f>rDUqQ^!4b=l#`T!5f3Y2G@cLF|)56MMXtCpy(3w%*3}9(td5ry;E(w
zRsV+BMZ^)0?)6=u;R3@U8Y}1LaZi(fy(LXBiCh;<uSU`8TCwjbUW6f2M09)2Bp3en
z_JZ5VW1AC^h%MpWUQO8#V~PYWo&61Yq0o=7#O~NE8o(f586PN$1`b-6+bH2rdPwc$
zUoK}q_m3cKrbo0X^K4r!+xV`Wqhy+V0$QYP5y6W{<nd*RI$I7)*Y?jL+R{_m&7#E-
zhpn1i+I5Sozmt`ahfDC-K(WVC<x<fb@<X!Wdysgk$NaPoVWYAlv@0hsyK*QSgXCnH
zUi8#fgbEPD@I8mcnp=z=45|wAShX*;$gnyX@z8YdnHYI$ICqjRfR(?!Ap_xZykz1i
zI`~Pv4((*zqp{GE{tk>U{p(<KLiuL;uUBfjHtSm}nUo$Rp24@`s1m1q<uOBJf*4*3
z(Z9W`!K}reWGMDdTlHH*+|WuSc9YQ5O6EoMruP*sN~m#K1roF;>-T5awD-7=>LwwB
zVY1_v{8IVYF^~81>R!Vi6{*_g@n)OTt=OM^GTH5|#DzdlR~+BUCVJDa#!<)Jr%Jqc
z9oml&KHck+sSL{h<kD(>ZRI+Dn)CJb7KtZZcB%XpFc-m&$^5r{EB(iv86J&i$0Y3<
z$tS%a@I7L$>Uwn0Zp#Dm9?e;h=<k#dabhxabH4&L4CS|bG@g9Dn=_bqM6`ZVaf7un
z4rE2wCoaJVi390;T8cm4F6Aq<Zc-k;sIWIfW+VJgO6k#wbA!Wyou29$qi467JO2di
zC3-uCpaOoeVdv%*f}9vqF{zj(UB!65m9>V;?ZI@SNXZwd+qH7j(|nI9=vR_pS=DLu
z6xOll^~?MD#1$TE;Zc1=%D082KCdA@d#5Vn$iEu*%nQk5tFMewZNd^~+tL)X%}O7>
z3<0|Dt1IoOG4WD&?3HI~QHsaMLDZm_Ko*rj4X=v=pvco=Cfy@DEp2*yqRA7Qv8Q5e
zf~cUq;@4{?eGQ%Oavx%)KmSev|A<>D__S2TJrVVB$ryn#ur{^6U#mJgJ1&^^6`E0Q
zQ(qNHNEwmO3l;>Bf7!Bn<Yge)R-Q=|ke&%|y5w#G#I^Q?HRMWKMWK3i!@2>SGhLD>
z`s0?<$9E+j#Mg|zIq%7=lN_=Dklyz*r%l)xb(^aou&?$>4sl9%>BqUuwQIUo_D5~f
zfZW%0;2AhLNMcd%lo6tSO?~C3d%00!Y$7z_0vAw=;C6^NlmsKqs3b(Kz-$PAA9rdx
zK({F1=JL_e&3=|U!A5jFy|Wx(_+9>Ymv4%Alxa;5^W9^O&v!CNmHSM{9(OB?oGGok
zn%=y9>&hALoSs}9M9Zp;7RW{2-;OmX8Xt>pYK|hcJtDKI^85NE!w@}L5TDDO0<fH^
zlJ(=B@3vaTwKhq5a{Vx+58<aqHEsKi15*t`>VYa;>i{HH(R?DvWkQ`4KJ8M0hl1Hu
z%RWCWu>*N++%j0m@N$hhO0|tR*y3(bC}2%+r=_M0O<cj7OtPtFi##k*0%dz>9UczT
zbLsrx^1*y`)~?|O!A;;Q49%0e@F@3k<mxO<LOVHAa{@iN2>Ev@hs#vNaJ%V|YuWgd
zGq%24iDq?sz0aaYzfU?_+1+DupVC^#ONUTd66^ZwC44T6Q&EF7X0E;>Ijj^>WoKnz
z8cyG9<wSZ#IjOTV99GR@b_$fIxPEwNDQZ7(ILckK{4n;^RxBYWC(9=5schK6Qt-2e
z@afYXK?_3%X%0{tq54_7@Z|WN#oeDjjsJS9EboT<wj8|m8!U`mUbXJ+Gifde96ZWT
zeKt`^P7L$!9*Aml6Zx&hrd@~V@{(AR$bM@6M)b#IC1xl*bbjc}<9BGVSTGSnXDZPh
z9|c~f$(Dvk*6(L_Ww$!mYz&zsCrou-yA!dL$u`4O__@#|q8yn$EKdN14=pm6E{Yt{
zpV#eE9r?V{JPF7k?-K%)viT4rNZy?J{^_?(M0bGwTk5r*7mhT{rV_uL9-?I?eEpkU
z9Gz+5uTex79ZK8F^#)MO8)Uik$9xor#lwd7*n|?bN?RcxA8()Dx;f?Zx4xJ+QtG_(
zK{=_ct6m8Z76xE<1v+++->X_i)5iTMJmMaf7viO4*YCULmDZ_f-7x@CM8K+z@ha7Y
zw7%oIomP;_<5T*)QjY*JMgSyvljqr{BMkWdee}Vhcjk}u%18Y=gRzfG)S~(to;^Yr
zV0!EP6LIhU4QKes%S!-0$Du~nrr#CnwcWsRVn3`IvomaZ&BQZP+=cw;kxr4Mv6lT=
zdSQ>b=QMX`+GucIY+~}k1`x*gte3%h-L3R&2J#_J>;Z#psw!=5YmwOTe_DWXMpNfI
z_r8WKRN&xlBR{=hb}1^p8tkFGLra^2o~&aDU-h>MiXyE@K6AQFR&lV(=vq2Kdd*<^
z=BNRY-KV>}#tv&AX0E;&TEArF8Ibl`JiV*+;FVl(1e-sh$tVq$)gYU?`}F>`>y&;|
zL&G+Tcnd?f!XCX~nCPfr&+L3qUB^R<R36phFAbZrY2x5jK0h|2?T_1fA|<7$4CCN<
z5dP)5CTXK}>7ZF-;dG<&X~y)`iLF+8U-Gw_-B^fDZ6e_I4~5W6-0(DISS5woS3cNI
zeir4>NCFIy%)AKw?)J8$Es2T9n(~sdRfXfCY_L8jee#{~{nWXWzwczXrgHF9TR$w}
zi==VCro&^W^ShYvAi)F&Bcp_=&F6~ff0OxZLC{vT*UX!u%>Z@gPW5=3Xkt<pU+KuI
zYK^Q`#PKNAwvvFG1FwBwT^p2??-FtF$$3!QD;IO+af)Py6$7Ba+_@QOVw<~lH(Ba6
zGG$-mc0wnEAi62yGuyV~j!=V~N@{0E4<K&<<JAAt6t#J6xiqtfQvaJ#1l+N*f1W0E
zJGKKg(oCB$g9AagM^r?RAsnTs+v4mpLW(DKrdJ;hP7n4lF+s(iJFU2AMV(BB7Q43C
z1l(c}d93ccw3g462D@Kz1MU2`|GeU_C3ZzrEZ@)PVl}#9pX$8-g+sa2JUin;%Sgm8
zcadUT-K1;%VVkCH(LvIHg6LZQI2UuFR^*!Ikd}6U^QPbSN%@HXUYTot>4yZO=ktj1
zrlp%j+F|-PT}=R5m~PM)M&_s?EfTZ3yvJR_gk41I*2J76nkSwRW)WLW_>`qIJRbGU
zBj@_rpX~(utP;8Vdu8~HMa^iZ^}i3cM#Mx{Wclxr4^-{7Nh^l2qD4d`6bu(l0%Di}
zDlo|Q7R)NB(DKjr$&%+U_}dG)6k2!bqoc3yYx>WYTJ<Nji`eSMe}e&DC8U1uc}5Cp
z-a1}IGx;_%LS=;SVVf!R*z4pk6%w7&vVB%UgyMJ2QEJiio4d_LUbI$K?3I{b`nLn>
zMq;{EB$cNnK}OHN`x?W9!Q@$Q&YFR#kdqUNPNm}+7_8xP)nH_2(y;g*NuNO(?O2{Q
zve^`L(61RCy3T8TB}Aw3Z38h>G;HRCPG;8G*4ZxKtTg7&d_;7>`o2Ar$Rsx_-Lua#
z?`XCqpJ~4nO)!+!7d3~OVeV~N86ABcUcIJn(nVvbvtKcHE^oz;VT>a#5?=k*nTEQN
zqSkA|B`0&(IoE^X<bkuvACv6$X1lo*6<8@syT&VMtb2DTUvc}b>Ckg+bH~UKpRVlR
z9;G95&4~G7?rgRSDW^K`d5`yA#D>!_%5w&g_2;H+mgtmCM@WC!F*TB($7`C(jD|hr
zI!|tR@cvRdb<b5geklibTpWdh?9^mxQC+b=Sx;~M!0j1-Q;GbA(@L~>IIY1SIq^J_
z%qoCljL(2`@HQ0;-i`jz?Y@L~Ym{33b~KnJO-uMB&QUD*vyqUWkm_BB;3bA1T5&ho
zaV4Dz2Rc|)cpt;4_w2<jW`zMgnCQ>v_h#LLRg^pB26Dajj#TYWB-rxDG}63Jdpm1}
zB&YUL3tf~>r)KkaaVP-x)~JC5Vb^!l86+}^ym-$!zOD;pd!YYjSr8jrZynNNi^)+M
z_=z^AjX^$3m^-xWY9l3XbS%oq$UD-CzYw}Y7l;wSfs={@FoZkp)0S!?R;1(krAEO}
z)ScH`ET|G(fbIoxc(S0AuB}lcbk~O|V7eXZhDQajGnGB8_Wgs`9w~@#PhQ;`vW*u9
z;c9PTJ{lG14O3H#DewiNE(}$5CwIdydVR}MoM`!eIP3RC)74zX2d?51kd*@Ai%yFE
zcPZ`nZ5VY&|G$%m)gq!oFPiLz%*LWpnUw_cyyFiZV_UhV8k>9w=CP1DT0mx&8t7J;
z*eM4zHj*{$U*iLWdtAP~qMVA55?AFepNaP;UeY4g{cYD5lHaw7tn!}rxj7KlgmuW-
zl!S1WUKR4vjeDVtvmsV3e@Rvi;dkb)aLw~RY%XMAROZSJ{nYfCdFx6>n(l}DUxR=S
ziX(|5wj>7f4U!l2$ZIdmydrugz)kMj^+cX2vTx9kX8xOgt-DQr(>_CG@0p`7)%kM8
zDn)Tg`)k-QmsilWV5n`<G0XF--7gR4&EFkAO(LL0f3l`z)~eh*D*MDnSL#d$tRB#K
z`d`ECjSnue3c&;Vck0?nIXzGiBa9V>AF`|WImzUGyJDdeNdFUpl1LQC9t%hyTsm)J
z)73j26@N+zrdGaL6=D1t@!s-uzh1*cQ$RcS9!2Fxz1+`3w)f~7V?!LO-#^nhvo_h{
zndU}I5pOIXJ6E7q{eC%NjOkOSYsA3r;6L~&>2jNFWi^QwDSC+&?Lurj4U-Aa(tJ>+
zL6r!*O}vt%0t6c2Eu9yn1Q(<Pyf`QLDAEJggN0P3&BtfxVT&Z2$+X7Xcrj0Ml(LOq
z!`PcndPC`px+#~-n(-(l0ZI3!_@X-@2WZ2EW#sZD9$~?g^;CS*wLZ^jmB7JM4Ll!%
zL$brlt&PyyNb)Ya=(?BTW!z;mteEwRSmJBpDe=535PZNQ>+()uLQyky{`*|b)Bbsn
zrUaD5Vz_6CsVT9vo?S_Rqdd{L;R&+Y*bvtAXoC|T+l{+irh!|HG5(UV$_n_i6xkh*
zIVBSYZ&Z7gasarzms<O#D}0n*#fjElmv5(}+6(O2)Hj5|ya2JM!F%TNyh}|<exvCW
zvWe*v4L(wEivt7~*0TaJ;`G1Kd`C!fy`77@8zZ}rC^oc#m1bsdsLw>cQN<>`IWFkP
zsyI&=ViU~?9=&%}s_*a+k4JOwyN1|5&#So2B2|gN1pq)sQoP)}OW#6*wwV!Yrtzy~
zw|ovf4RsLtvn*}@x84eM%Z%D?3oxVaA-~6)BSQbbn=R7}HrO;VWz5X>_2aFY2MGCp
zV}tz;Q~VM-E6DWJSS0kh_lbIxH{xU`!P7h43>#Dp6Ue(@;!(FFDvax$kwD>VW5w^W
z4!CRyDh^l&r!}wnc&#3$<ReALE5q>9!O}&w+Ctd?@Mqb-q?6vdO4C|SbKq7aG#n<b
z|7AniJ%h7#X%WP$BoNGvJr3Sh5K|yJYJWbLq9s%hgAF#_6Y%p;peo=gKj~Zx=g83Y
zFEBC~W=~Sn1lMzj$c!T;^_38x&;YDjd1jz6YQX7bL_z>IZ~5v1>s)|*kwyZxcsrW?
z3zV||qOa(BEIlr!{|e#4Co%u-sNI{bp#%Z?-sfCHp?|`XvIB81<ARgn^H>uMj=GZn
zH6TL|>FCwFSR44?&BZf7c}PAjjPODD{3}W#$j~7O=^o?(MFe`B1E8d!s3E7QAg7>a
zqo4#;P==~rlTlEEDkyw@b#>(b5YT=|lxNugLs0u)0#{Pu)Hwlw8(P4s_1zx+51a8|
AeE<Le

literal 0
HcmV?d00001


From 0422fe75a7d98039cf2612de4820060d5cdb2ac6 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 02:15:28 +0530
Subject: [PATCH 06/14] feat: start vk oAuth

---
 src/Auth/OAuth/Apple.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Auth/OAuth/Apple.php b/src/Auth/OAuth/Apple.php
index 2c9a99b8da..fbe4b65b1a 100644
--- a/src/Auth/OAuth/Apple.php
+++ b/src/Auth/OAuth/Apple.php
@@ -124,7 +124,7 @@ class Apple extends OAuth
     {
         if (empty($this->user)) {
             $headers[] = 'Authorization: Bearer '. urlencode($accessToken);
-            $user = $this->request('POST', 'https://api.dropboxapi.com/2/users/get_current_account', $headers);
+            $user = $this->request('POST', '', $headers);
             $this->user = json_decode($user, true);
         }
 

From da9504a14c49fa5b2e70e3b7cbe172e157a41498 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 02:17:28 +0530
Subject: [PATCH 07/14] chore: corrected apple Image size

---
 app/config/providers.php      |   7 ++++++-
 public/images/oauth/apple.png | Bin 1683 -> 1360 bytes
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/config/providers.php b/app/config/providers.php
index d4c05b9a9d..fe54486a03 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -57,7 +57,7 @@ return [
         'enabled' => true,
     ],
     'apple' => [
-        'developers' => 'https://www.dropbox.com/developers/documentation',
+        'developers' => 'https://developer.apple.com/',
         'icon' => 'icon-apple',
         'enabled' => false,
     ],
@@ -66,4 +66,9 @@ return [
         'icon' => 'icon-amazon',
         'enabled' => false,
     ],
+    'amazon' => [
+        'developers' => 'https://www.dropbox.com/developers/documentation',
+        'icon' => 'icon-amazon',
+        'enabled' => false,
+    ],
 ];
diff --git a/public/images/oauth/apple.png b/public/images/oauth/apple.png
index ca56e16bc8a523c01a7aef8ee98a37b1bf11b570..b0fdfd14f055970a22144a33cef8f0d79747b60d 100644
GIT binary patch
literal 1360
zcmV-W1+V&vP)<h;3K|Lk000e1NJLTq003kF003kN1ONa4+Us5400004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002
zVoOIv0RM-N%)bBt010qNS#tmY0AK(B0AB#8wP^DI000McNliru;|c{7F9Ba(C`bSR
z1Vc$gK~#9!?V8_fTU8vuKlx>UXiSYuJJK5GYL`lv$*PnhmZ4NP!3U9o`ZNU*@xe!5
z1pfiS2Q4Bf6JLgt`D+XrG&)dMV{N6<jjn6ER;_K*t?8O3O_MaazKoG(SeJ9Y%~d#`
z`;;H&obTt{d(OG%doLIa27|$1Fc=I5gTY`h>>!S+x9B9m{WRm{ccOOdtKz`VGxQVV
zDp^iQR_(5$hMNdSIYJnKJXRIk7R1A0zNUzE{mAf<-65%IJjq~*hQ%^(+8tEoI0^F|
zg%S;mNsibZR;4)b(@$=TMvhb5ZFgXm;^rx?Y|*fY^QzrpRgRZqW#=QyY3{K*tV(eb
z;qsPYZZSo#4NI{m9$q3<B2i?PSMW$Tv-1n0lYJ$v6u88@94G((6LH|XaT%rgp7%IM
zO1>F+ky<>YDc<;Okpqg%GROeGFpiU5G~p)AGAnZZC4+}nx@o5gFK*JzGeL|=vN(B=
z1LRm>h74i4X`>k*F0v$9WQrk1So<%CxQNilV}$TghYKi@VU-19e9I6^6saXd554TC
z5ihr0Z`UGEk~l-0;0M<274h;i&lARr^QPZYEV004R%l@ly9xZmY_-8GC+R0H(5;Hx
z$J@-6trF!&mK6DI|6yT~;28Vu(rBTd#J`4kt4E5DX|qG)F5Y2POvA!rg}10t3&yEd
z41hlRxKp%i)>&p#w8mSYlL67QVKK&0{MFWQ@P^>%u&@~AIclq|0T1wvsKy_>rgxX2
zIz|rBDcCJ3zT&vv=ui`Jv6o$fA`^VZHN7g-L;^J964S^r%7|_yY9b+8#57=z0W$W8
z1Zff!S!7JV5;YMYcL<84NZ2J(FS_T>OKg1AL>!_y5SPTnp(au&*~;ou%k6fFtdkQI
z@k=D@)I`?wwxwmX&|{a#B3A@O{5+z+E~$ykvnVJ69rW5G5*HQ;@d6ROD%2*v0$p?q
zCiff!sb@qd1F1TL-%B?>F%j_4Mk7<Ks7~yvB1JlB6%>IQ+S$W35^6V)sv=1`ct|*N
z?4g}UaWSouKvfmlWH((jh>8F-5M-Q-l^0Y`2mQ)~xCX#Q&Z`tt7n$HElHwW}Mwzaz
z$R=kP7Z<s}Ih0=Q(8)CZMvM(njWkgP)r#tfWcZX}QIShTRc}XiL?Ff~mc=xZoFOLJ
zFO{&5&&ys0P(Pv^uuB8rY0isiO!1=5^`XC8{*xLa+F6xVKH&q=eWwDAd`MdBY-IV;
zzQ=B*9ON`vWsM>+{f(6rhd8^<pwE)o=7H%L&+6yN<nmKb@H&rEU-FH`Uko!%f;2_y
z@w1mMLR(605aWHmprG5l+>LmYt6bnPVd{VcGYs=1!_1M!0vyy4<Y9U^NGlDvSYw8>
zoaASTESc<EQvo^%;boIm=9wgZQ;1Fiv=YRNlXd19XGt^ygTY`h7z_r3!C){L42GTI
zZ<tb~JHAfwH2?qrC3HntbYx+4WjbSWWnpw>05UK!IV~|TEig4yF*iChGdeRkD=;-W
zFfh|Qc*Ot!03~!qSaf7zbY(hiZ)9m^c>ppnF*z+UFfA}MR53I<H8naiGAl4OIxsN7
SOdy8<0000<MNUMnLSTaMzfLp&

literal 1683
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


From ff4e8785bf5306aee4c35b92e627bb6f65317c48 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 02:18:27 +0530
Subject: [PATCH 08/14] feat: added vk to providers

---
 app/config/providers.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/config/providers.php b/app/config/providers.php
index fe54486a03..e268426287 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -66,9 +66,9 @@ return [
         'icon' => 'icon-amazon',
         'enabled' => false,
     ],
-    'amazon' => [
-        'developers' => 'https://www.dropbox.com/developers/documentation',
-        'icon' => 'icon-amazon',
+    'vk' => [
+        'developers' => 'https://vk.com/dev',
+        'icon' => 'icon-vk',
         'enabled' => false,
     ],
 ];

From ea2fc826372aa01603e95ea763bb5f21b6f012bf Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 02:20:02 +0530
Subject: [PATCH 09/14] chore: updated amazon developers url

---
 app/config/providers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/providers.php b/app/config/providers.php
index e268426287..5ebbf51651 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -62,7 +62,7 @@ return [
         'enabled' => false,
     ],
     'amazon' => [
-        'developers' => 'https://www.dropbox.com/developers/documentation',
+        'developers' => 'https://developer.amazon.com/apps-and-games/services-and-apis',
         'icon' => 'icon-amazon',
         'enabled' => false,
     ],

From 99dd990a6c8634d522bf84949690f1cc07a1dc98 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 16:30:05 +0530
Subject: [PATCH 10/14] feat: vk OAuth Done

---
 app/config/providers.php |   2 +-
 src/Auth/OAuth/Vk.php    | 154 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 src/Auth/OAuth/Vk.php

diff --git a/app/config/providers.php b/app/config/providers.php
index 5ebbf51651..444519ba26 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -69,6 +69,6 @@ return [
     'vk' => [
         'developers' => 'https://vk.com/dev',
         'icon' => 'icon-vk',
-        'enabled' => false,
+        'enabled' => true,
     ],
 ];
diff --git a/src/Auth/OAuth/Vk.php b/src/Auth/OAuth/Vk.php
new file mode 100644
index 0000000000..46f2742ac1
--- /dev/null
+++ b/src/Auth/OAuth/Vk.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Auth\OAuth;
+
+use Auth\OAuth;
+
+// Reference Material
+// https://vk.com/dev/first_guide
+// https://vk.com/dev/auth_sites
+// https://vk.com/dev/api_requests
+// https://plugins.miniorange.com/guide-to-configure-vkontakte-as-oauth-server
+
+class Vk extends OAuth
+{
+    /**
+     * @var array
+     */
+    protected $user = [];
+
+    /**
+     * @var string
+     */
+    protected $version = '5.101';
+
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'vk';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLoginURL(): string
+    {
+        return 'https://oauth.vk.com/authorize?' .
+            'client_id='.urlencode($this->appID).
+            '&redirect_uri='.urlencode($this->callback).
+            '&response_type=code'.
+            '&state='.urlencode(json_encode($this->state)). 
+            '&v='.urlencode($this->version).
+            '&scope=openid+email';
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
+    public function getAccessToken(string $code): string
+    {
+
+        $headers[] = 'Content-Type: application/x-www-form-urlencoded;charset=UTF-8';
+        $accessToken = $this->request(
+            'POST',
+            'https://oauth.vk.com/access_token?',
+            $headers,
+            'code=' . urlencode($code) .
+            '&client_id=' . urlencode($this->appID) .
+            '&client_secret=' . urlencode($this->appSecret).
+            '&redirect_uri='.urlencode($this->callback)
+        );
+        $accessToken = json_decode($accessToken, true);
+
+        if(isset($accessToken['email'])){
+            $this->user['email'] = $accessToken['email'];
+        }
+
+        if(isset($accessToken['user_id'])){
+            $this->user['user_id'] = $accessToken['user_id'];
+        }
+
+        if (isset($accessToken['access_token'])) {
+            return $accessToken['access_token'];
+        }
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserID(string $accessToken): string
+    {
+
+        $user = $this->getUser($accessToken); 
+
+        if (isset($user['user_id'])) {
+            return $user['user_id'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserEmail(string $accessToken): string
+    {
+
+        $user = $this->getUser($accessToken); 
+
+        if (isset($user['email'])) {
+            return $user['email'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserName(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['name'])) {
+            return $user['name'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return array
+     */
+    protected function getUser(string $accessToken): array
+    {
+        if (empty($this->user['name'])) {
+            $user = $this->request(
+                'GET', 
+                'https://api.vk.com/method/users.get?'.
+                'v='.urlencode($this->version).
+                '&fields=id,name,email,first_name,last_name'.
+                '&access_token='.urlencode($accessToken)
+            );
+            
+            $user = json_decode($user, true);
+            $this->user['name'] = $user['response'][0]['first_name'] ." ".$user['response'][0]['last_name'];
+            
+        }
+        return $this->user;
+    }
+}

From cb0ca885c1cb8e51bd07483e72cf9136bd358a91 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 16:31:34 +0530
Subject: [PATCH 11/14] chore: lint fix

---
 src/Auth/OAuth/Vk.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Auth/OAuth/Vk.php b/src/Auth/OAuth/Vk.php
index 46f2742ac1..ad860aff84 100644
--- a/src/Auth/OAuth/Vk.php
+++ b/src/Auth/OAuth/Vk.php
@@ -40,7 +40,7 @@ class Vk extends OAuth
             'client_id='.urlencode($this->appID).
             '&redirect_uri='.urlencode($this->callback).
             '&response_type=code'.
-            '&state='.urlencode(json_encode($this->state)). 
+            '&state='.urlencode(json_encode($this->state)).
             '&v='.urlencode($this->version).
             '&scope=openid+email';
     }
@@ -52,7 +52,6 @@ class Vk extends OAuth
      */
     public function getAccessToken(string $code): string
     {
-
         $headers[] = 'Content-Type: application/x-www-form-urlencoded;charset=UTF-8';
         $accessToken = $this->request(
             'POST',
@@ -65,11 +64,11 @@ class Vk extends OAuth
         );
         $accessToken = json_decode($accessToken, true);
 
-        if(isset($accessToken['email'])){
+        if (isset($accessToken['email'])) {
             $this->user['email'] = $accessToken['email'];
         }
 
-        if(isset($accessToken['user_id'])){
+        if (isset($accessToken['user_id'])) {
             $this->user['user_id'] = $accessToken['user_id'];
         }
 
@@ -86,8 +85,7 @@ class Vk extends OAuth
      */
     public function getUserID(string $accessToken): string
     {
-
-        $user = $this->getUser($accessToken); 
+        $user = $this->getUser($accessToken);
 
         if (isset($user['user_id'])) {
             return $user['user_id'];
@@ -103,8 +101,7 @@ class Vk extends OAuth
      */
     public function getUserEmail(string $accessToken): string
     {
-
-        $user = $this->getUser($accessToken); 
+        $user = $this->getUser($accessToken);
 
         if (isset($user['email'])) {
             return $user['email'];
@@ -138,7 +135,7 @@ class Vk extends OAuth
     {
         if (empty($this->user['name'])) {
             $user = $this->request(
-                'GET', 
+                'GET',
                 'https://api.vk.com/method/users.get?'.
                 'v='.urlencode($this->version).
                 '&fields=id,name,email,first_name,last_name'.
@@ -147,7 +144,6 @@ class Vk extends OAuth
             
             $user = json_decode($user, true);
             $this->user['name'] = $user['response'][0]['first_name'] ." ".$user['response'][0]['last_name'];
-            
         }
         return $this->user;
     }

From 8a200a409ed9dc09200687b1d982d0e26a4a3c7f Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 17:27:39 +0530
Subject: [PATCH 12/14] chore: added vk icon

---
 public/images/oauth/vk.png | Bin 0 -> 3163 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/images/oauth/vk.png

diff --git a/public/images/oauth/vk.png b/public/images/oauth/vk.png
new file mode 100644
index 0000000000000000000000000000000000000000..481303ab7cd4e3081831a63ff6629799896a1e6b
GIT binary patch
literal 3163
zcmb_eX*kqh8~$1Pr|gw%5wc{N3}YMnGGgpTO15k@8T%4rWXae<Vn}GLQ5mv?A^SE+
zGJmpUCp$?P`}R(s-cRqh_j<1L+~<DIxj&riT+i~{%tVj*BF{wt0GQ$WFa#A{{w@Yu
zsy_>-rK18pQp;Ei04iQG9y^|+asg+3gfReML;)Z?5&#aVq3~q@cmf81RR;i2P6q%^
zZ+xA(D)rzWCqq3LaQ4@78{el;BNx2&@B2}adJ}j6e5iiBP2HULha2mjpS$=EqmneX
zWAzgNFdD#NT6fT6>u-YHZAlz4<c!aOfsOT{4==lmnYfFw!10l(4L<w@k;+lR65{9R
zs|aJ^W_NU5d2^%g($ZfMyfbD{$VRwwGan_Hm#P3tx-Cbe-JP<iH6;^(Kc6_ar@k?j
z@m)i-uYLFT)crD_<lm-}hQy7mjO|GXvM)m=9!6h^f6lxEG#U9ix^_nu3Ua1J+gkDb
zzlgIwMuZkl52SAz05FI2%{FQ655Zs<Vo`<5iDzwa-Fopdv@tuj0D|SBMXA%NSy^L$
z2i~L)2l^vVHnN!YOsdC;M$`HNWDCW5Ctu5M_(+lRx1pV}^2BVEn`b-@6OBuKTlBtz
zODMwi&lk(Q{M?$dpjBxQUxl9i@r>rlxlVA%Qmg>|K}e?|>!fOhQ@XGL<hteDdz&^r
z-f`H=KtWsiA@dW>Kbgm4G9(dF=n@gToh~9G6J2(^J+pD<6D~;jj4muf`)~n3VP4Ce
zq+1!UV#DhoT<nd|+Oyu-PKBJVKSAhdB%Ooz@ECXS(OmR%j`mo@KhUB6-#5O!EIle$
zaViS7P^SYr!84GN322C`$17RT>+->ytnyW~np!Py`R&U12lu&tjxr`Moi!j&Zag_&
z)%x(@o>a-{Dy84c6MA~662p}32qkLq;IrJA=`?xbx$=cED_%!!=EXOsB_SkGXZc6T
zCRb$pz!;&oxVNzWn*DqH<JKx)@s$BR+Y|G!swk<8n3q|o>4su<;E*p+tEJL+G<9gY
zPCcz0QtA&&3MCS51w6(4_SUg!nog-IT!s*vbaXpbw}b$1{uq24LKKt@ee|oltyW~9
zOBWu=z*{p!S77DC064g={~&y7gCUkn4Ng$s`);rN@Du_=>m7Uay_1?Aw`<c2il-xQ
z<!IdU99>zeO`YH4J~Flc5w=AuM5%rzlZt!FZ*OPsA`(>@o805>#Pp^w&`Sf|w;?ZU
zqB#^SoZWCb=Jv=$%Dj1z>ncTQ1P6Upm>2%=D`hG?HVvfUu9iKZ4**=|_@xOxL<=o|
z_WQb-=-oEcYi>gy>uov-(`Og)1sK^23e28)efiasP;uMf;$p_ex~sBPn3nEzs5GyA
zx}qi`!O_pgf4kHov}`s~1^I)oa`Ay8>i4|t!YeE-BWB?DIOhvijze4qK3>q8xW5+M
z1t3c2X>wL>IuzF0^^cbCpbhl~<*aVsjdd86y)$Fu*X0jtuf#?n5MRJ&Ke?TSHeE1F
zmvFS|+wCF9-JHjcC1FcjnA#MvacO#?pMPI{7Ge`3K=%K6mq{kA{NAk`YXwz-0{g>K
zW=0Ht?M-|q=eb5=H@;68=QL?^e#W<RESQp{@XSar2>|TFmb~4Nz4IB9ael+x6`mP3
zpPd}5g?}D?HMm-CrcaOpSt)qAD?KXQK<Jh>c4baa_U8_Nx94QY5Cz3hK#=Go(<=9|
zQEzd$2~w=xO7*@uu6eO<CF$pv1^%lPmjOx7YZ@gjNXCpN8~BXOe(~91)eZbiNL;JS
znD$}*p`Uu^zgM?N%t!8mkUmlRBpeg=WPZFdF2Y`1yuRZWua$)FtCtK@7#&NcG^6HR
zwq)|xHF7}H@o;GP6!e~4wm;&_UY+(qKku8wUupsBGY|-;;<b9A;hu*U?@Vv9CrY+X
zv_xb#98cB3-$tMR=o0<VoI!#Ct>{@i9s1`Q61|YRl4zY+SD$$WS-S!IdVN|wbz{#(
zn8Y0r^|5Z0V{h0vzeIbe#qn8^TuDpd_=}-_n5=V13=q3t-2BURBhfD!fvd~=td{9`
ziCsXm?Gk}o{5j-ToE5pTV*JxN=X8D!odlcw<ILmgKyr6xzow%WSv%k;e{*O-*My*(
z6Qd{}sIm8cGESa`P4i^5kHW}J6J#{y-&EhIlE@I7UbW!7ra{mcpDm~r6cEBJXJ?QO
znxuTA@U4goAuY&KTLlr<_=I*g+(p`KQ1F{<%+4GP;Ts*CD0kfpwHJiWyz-pE2%F{g
zlJIHb6X|=|`u=ju=+m%84zq)qkgxCiO2sWx0tE^L;??$>ItAKT!?ts>V%}hbSe!uZ
zrLmS4+?gt$DU(?*K4!^?Whl}x2yz<n?gY6}W{{ltNQqAHHN(Cl@sQ9Rp?@c~u1i^=
z;<wCn)>fCM{g&qw9912=K<wQR=0uhwy>M?;SKmcH@DXPB?YAea)2b*K_$0K-kD1aa
zsB;B}lF$j9kjqm+Z5pZM00JUGYPWrwMxf$=K={+<t|cGh1uU2Gk9cGvzr4^*7f<~K
z;3@@nxFMAx7vSR9+uFkbz=R8krp0?VSfoYssWk-;?hz@8PgW-%_uE0jKS@!1C21X)
zSchvCiK7z@P4`rCD%}iTldq3(z?Cu*uoBfqUQ?5`J1O7sd2B3k5@L@QQBNi6%B*G9
z$NEVXXxTNKP~aR*^nQorcp%>?-Y@O4Jv8!(&&%1_U}S})FD361I~Sg&)%3x!!&fn5
zd}Tt=DCc=bfJ;Zvb+vYO+D2LAT6OfqXW``53}LkU$u9M?Fs}-Am>2;i9XMsu2IcvY
zZ+t4Nd!NP9Ft&x;_nmo_zEBDTTanY);4w!$q}l2T5x#qb(r9u!Os&ZC9^^qM_v>8r
z&|05`A(ir8DHj===Zv6tU)b?#@UWF>g+~cIj|e5F?2#Ec7D$%@SmI=1lHzd@Q<gQx
z_4S^(k$LNH1g0sstp^Q6=k3zYk|5@)2{=?8o-o^QvCeuL;HIZEyT@~1!<0UW9zRz$
zB1I@-qG?%4`$Hb_P#GRvEWkHSun4h_YO9~L90ytGJu<guy{laiaS|y*B9~g5;Wy$t
z*GuMJW1cmjJJU0J%m&hkNeee3nr$1swMpgPQY#Y<t3_-%p&nhxC1t42<X$~CT}{HP
ztmtB6`R==Zk%RR~A1u<MkR3oOZPX<bjIj_w@jK~zy>#1#(FaeK-j2-MC3noN)#%N^
zqj^XxGi?YW9R9ZK%h@D0zFDC-|D)tB`K;?Sk-1Ns^*Atb)fgsf8}`$%vSRzw0h(1c
zX2(SYWw*cZkZyhgXqKt+QtDuh_8=xqPD69R`Xs~%8+cm^*2N7(B*~^Dum01hM!B`k
zqexhOeuPpJt?^jFzXrKDwp7lZTt08|PQ@BbU#{t4$j07k7cX`^+h1q1cvln`fb6&w
zp;V8qm1PDAb#L?7r#xs~l`Z4GY>-{oJbYEw)o@8(oLV7v>s5Fiz<o$&v(=8G)H@2Q
z`#<))&?|XwnkyXe)5w6x%d;N}r}$-~8^~QVA5;xJKJ4Zb(BCp_cY6uv>{9}xE;Aju
z7M!sn`6e&?8$>#a%EsQazyZ{>l7E$#miXi7Os#S4&ypC~pBT`Yzd29({`y{UX42N0
zpQIpZ)`{dcHJB`2(zp_(xVH`+yH@k7x6F?HXIeVsGm}3HE7RTVSN5oyZA9wx&UFZ9
z9hnHr9DnO!x2Z4XI!a4pgyp1HeZZ~ZG+Z!{z)Ywl>+y`MLjz82-C%rTs}&|s{0|Dk
zlYFgrVnzHUs-xB9%2Nkv!o(irdiyfiUlLpnVQo36IL(WBvXFb>!=Bb=_Js&#G48^K
zUxr0Y^%UtzrqeUp;n%vqYue=I+Xj*t4RvlwF@G-qzmYRK{+6_Rp|GMn>Yy#+uWRM+
z;^_ZS+1d9Y6#!YV3=|{-27wjs$S5kyDk#gyNP-oV!C)?1`M;C-e+3?1F0PM){<pxD
S=7lL$0Kj!kV5Qm)5&r?kKI}gL

literal 0
HcmV?d00001


From 62c0046f81f036e2a683f57051bfb41c6c34fc3b Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 18:26:44 +0530
Subject: [PATCH 13/14] feat: implemented abstract method parseState

---
 app/config/providers.php  |  2 +-
 app/controllers/auth.php  | 36 ++++++++++++++++++------------------
 src/Auth/OAuth.php        | 13 +++++++++++++
 src/Auth/OAuth/Amazon.php | 10 ++++++++++
 4 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/app/config/providers.php b/app/config/providers.php
index 444519ba26..140dbeaf6f 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -64,7 +64,7 @@ return [
     'amazon' => [
         'developers' => 'https://developer.amazon.com/apps-and-games/services-and-apis',
         'icon' => 'icon-amazon',
-        'enabled' => false,
+        'enabled' => true,
     ],
     'vk' => [
         'developers' => 'https://vk.com/dev',
diff --git a/app/controllers/auth.php b/app/controllers/auth.php
index a904c1abd6..849f783113 100644
--- a/app/controllers/auth.php
+++ b/app/controllers/auth.php
@@ -733,24 +733,6 @@ $utopia->get('/v1/auth/oauth/:provider/redirect')
             // Uncomment this while testing amazon oAuth
             // $state = html_entity_decode($state);
 
-            if (!empty($state)) {
-                try {
-                    $state = array_merge($defaultState, json_decode($state, true));
-                } catch (\Exception $exception) {
-                    throw new Exception('Failed to parse login state params as passed from OAuth provider');
-                }
-            } else {
-                $state = $defaultState;
-            }
-
-            if (!$validateURL->isValid($state['success'])) {
-                throw new Exception('Invalid redirect URL for success login', 400);
-            }
-
-            if (!empty($state['failure']) && !$validateURL->isValid($state['failure'])) {
-                throw new Exception('Invalid redirect URL for failure login', 400);
-            }
-
             $appId = $project->getAttribute('usersOauth'.ucfirst($provider).'Appid', '');
             $appSecret = $project->getAttribute('usersOauth'.ucfirst($provider).'Secret', '{}');
 
@@ -769,6 +751,24 @@ $utopia->get('/v1/auth/oauth/:provider/redirect')
 
             $oauth = new $classname($appId, $appSecret, $callback);
 
+            if (!empty($state)) {
+                try {
+                    $state = array_merge($defaultState, $oauth->parseState($state));
+                } catch (\Exception $exception) {
+                    throw new Exception('Failed to parse login state params as passed from OAuth provider');
+                }
+            } else {
+                $state = $defaultState;
+            }
+
+            if (!$validateURL->isValid($state['success'])) {
+                throw new Exception('Invalid redirect URL for success login', 400);
+            }
+
+            if (!empty($state['failure']) && !$validateURL->isValid($state['failure'])) {
+                throw new Exception('Invalid redirect URL for failure login', 400);
+            }
+
             $accessToken = $oauth->getAccessToken($code);
 
             if (empty($accessToken)) {
diff --git a/src/Auth/OAuth.php b/src/Auth/OAuth.php
index 70d7f448cf..cbae4638e4 100644
--- a/src/Auth/OAuth.php
+++ b/src/Auth/OAuth.php
@@ -78,6 +78,19 @@ abstract class OAuth
      */
     abstract public function getUserName(string $accessToken):string;
 
+    // The parseState function was designed specifically for Amazon OAuth Adapter to override.
+    // The response from Amazon is html encoded and hence it needs to be html_decoded before 
+    // json_decoding
+
+    /**
+     * @param $state
+     *
+     * @return json
+     */
+    public function parseState(string $state) {
+        return json_decode($state, true);
+    }
+
     /**
      * @param string $method
      * @param string $url
diff --git a/src/Auth/OAuth/Amazon.php b/src/Auth/OAuth/Amazon.php
index d9cf84e73f..95744e9ba3 100644
--- a/src/Auth/OAuth/Amazon.php
+++ b/src/Auth/OAuth/Amazon.php
@@ -23,6 +23,16 @@ class Amazon extends OAuth
         return 'amazon';
     }
 
+    /**
+     * @param $state
+     *
+     * @return json
+     */
+    public function parseState(string $state) {
+        return json_decode(html_entity_decode($state), true);
+    }
+
+
     /**
      * @return string
      */

From d2ebafb23749b52c21c079d89d01b7d3787d44b2 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sun, 6 Oct 2019 18:28:01 +0530
Subject: [PATCH 14/14] chore: lint fix

---
 src/Auth/OAuth.php        | 5 +++--
 src/Auth/OAuth/Amazon.php | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Auth/OAuth.php b/src/Auth/OAuth.php
index cbae4638e4..a96ebb7a68 100644
--- a/src/Auth/OAuth.php
+++ b/src/Auth/OAuth.php
@@ -79,7 +79,7 @@ abstract class OAuth
     abstract public function getUserName(string $accessToken):string;
 
     // The parseState function was designed specifically for Amazon OAuth Adapter to override.
-    // The response from Amazon is html encoded and hence it needs to be html_decoded before 
+    // The response from Amazon is html encoded and hence it needs to be html_decoded before
     // json_decoding
 
     /**
@@ -87,7 +87,8 @@ abstract class OAuth
      *
      * @return json
      */
-    public function parseState(string $state) {
+    public function parseState(string $state)
+    {
         return json_decode($state, true);
     }
 
diff --git a/src/Auth/OAuth/Amazon.php b/src/Auth/OAuth/Amazon.php
index 95744e9ba3..71bb8aaee6 100644
--- a/src/Auth/OAuth/Amazon.php
+++ b/src/Auth/OAuth/Amazon.php
@@ -28,7 +28,8 @@ class Amazon extends OAuth
      *
      * @return json
      */
-    public function parseState(string $state) {
+    public function parseState(string $state)
+    {
         return json_decode(html_entity_decode($state), true);
     }