From e9dbb9eaccd96a0588ae53ffd5a6789316f7a7f0 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Fri, 6 Oct 2023 23:56:19 -0400 Subject: [PATCH 01/24] feat: import privacy-pal --- backend/go.mod | 48 ++++++++++-------- backend/go.sum | 100 +++++++++++++++++++++++++++++++++++++ backend/pkg/models/auth.go | 45 ++++++++++++++++- 3 files changed, 172 insertions(+), 21 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 6f796e46..0bb1f2fb 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -2,11 +2,11 @@ module github.com/fullstackatbrown/here go 1.18 -require google.golang.org/api v0.103.0 +require google.golang.org/api v0.128.0 require ( - cloud.google.com/go/firestore v1.9.0 - cloud.google.com/go/storage v1.28.0 // indirect + cloud.google.com/go/firestore v1.13.0 + cloud.google.com/go/storage v1.29.0 // indirect ) require ( @@ -17,32 +17,40 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/rs/cors v1.8.3 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb - google.golang.org/grpc v1.53.0 + google.golang.org/grpc v1.56.1 ) require ( - cloud.google.com/go v0.107.0 // indirect - cloud.google.com/go/compute v1.15.1 // indirect + github.com/google/s2a-go v0.1.4 // indirect + golang.org/x/crypto v0.9.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect +) + +require ( + cloud.google.com/go v0.110.2 // indirect + cloud.google.com/go/compute v1.19.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.8.0 // indirect - cloud.google.com/go/longrunning v0.3.0 // indirect + cloud.google.com/go/iam v0.13.0 // indirect + cloud.google.com/go/longrunning v0.5.0 // indirect github.com/ajg/form v1.5.1 // indirect github.com/golang/glog v1.1.1 - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/uuid v1.3.0 - github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/joho/godotenv v1.5.1 + github.com/tianrendong/privacy-pal v0.1.0 go.opencensus.io v0.24.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/oauth2 v0.4.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - golang.org/x/time v0.1.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sync v0.2.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/backend/go.sum b/backend/go.sum index b4dca827..e49fa9b2 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -1,32 +1,53 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.107.0 h1:qkj22L7bgkl6vIeZDlOY2po43Mx/TIa2Wsa7VR+PEww= cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I= +cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA= +cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= cloud.google.com/go/compute v1.15.1 h1:7UGq3QknM33pw5xATlpzeoomNxsacIVvTqTTvbfajmE= cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= +cloud.google.com/go/compute v1.19.3 h1:DcTwsFgGev/wV5+q8o2fzgcHOaac+DKGC91ZlvpsQds= +cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= +cloud.google.com/go/firestore v1.13.0 h1:/3S4RssUV4GO/kvgJZB+tayjhOfyAHs+KcpJgRVu/Qk= +cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8= cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= +cloud.google.com/go/longrunning v0.5.0 h1:DK8BH0+hS+DIvc9a2TPnteUievsTCH4ORMAASSb7JcQ= +cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc= cloud.google.com/go/storage v1.28.0 h1:DLrIZ6xkeZX6K70fU/boWx5INJumt6f+nwwWSHXzzGY= cloud.google.com/go/storage v1.28.0/go.mod h1:qlgZML35PXA3zoEnIkiPLY4/TOkUleufRlu6qmcf7sI= +cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0= github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/render v1.0.2 h1:4ER/udB0+fMWB2Jlf15RV3F4A2FDuYi/9f+lFttR/Lg= @@ -36,20 +57,26 @@ github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -60,93 +87,162 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= +github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4= +github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/tianrendong/privacy-pal v0.1.0 h1:atj34EbzU1jtKi5IFP279EZqBhJv99UbMuOPHLM2SKs= +github.com/tianrendong/privacy-pal v0.1.0/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M= golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.103.0 h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ= google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= +google.golang.org/api v0.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg= +google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao= +google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= +google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= +google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -160,7 +256,11 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index 639c451a..525cba0c 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -1,6 +1,11 @@ package models -import "fmt" +import ( + "fmt" + + "github.com/fullstackatbrown/here/pkg/firebase" + pal "github.com/tianrendong/privacy-pal" +) const ( FirestoreProfilesCollection = "user_profiles" @@ -72,3 +77,41 @@ type EditAdminAccessRequest struct { Email string `json:"email"` IsAdmin bool `json:"isAdmin"` } + +func (u *User) Owns() []pal.Locator { + return []pal.Locator{{ + ID: "45UwrbxU9caxNqI5caWdxPYJ8pO2", + Collection: FirestoreProfilesCollection, + Document: &Profile{}, + }} +} + +func (u *User) Accesses() []pal.Locator { + return []pal.Locator{} +} + +func (u *User) GetData(mode pal.GetDataMode) string { + return "" +} + +func (p *Profile) Owns() []pal.Locator { + return []pal.Locator{} +} + +func (p *Profile) Accesses() []pal.Locator { + return []pal.Locator{} +} + +func (p *Profile) GetData(mode pal.GetDataMode) string { + return p.DisplayName +} + +func init() { + user := &User{} + firestoreClient, err := firebase.App.Firestore(firebase.Context) + if err != nil { + panic(err.Error()) + } + f := pal.NewPrivacyPal(firestoreClient) + fmt.Println(f.ProcessAccessRequest(user)) +} From 511bd03ef5474a90afd4c6d4d03ef3e42583ae1f Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Fri, 6 Oct 2023 23:58:58 -0400 Subject: [PATCH 02/24] fix: missing firestoreSDK in go.sum --- backend/go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/go.sum b/backend/go.sum index e49fa9b2..8b725273 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -16,6 +16,7 @@ cloud.google.com/go/firestore v1.13.0 h1:/3S4RssUV4GO/kvgJZB+tayjhOfyAHs+KcpJgRV cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8= cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= +cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= @@ -23,6 +24,7 @@ cloud.google.com/go/longrunning v0.5.0 h1:DK8BH0+hS+DIvc9a2TPnteUievsTCH4ORMAASS cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc= cloud.google.com/go/storage v1.28.0 h1:DLrIZ6xkeZX6K70fU/boWx5INJumt6f+nwwWSHXzzGY= cloud.google.com/go/storage v1.28.0/go.mod h1:qlgZML35PXA3zoEnIkiPLY4/TOkUleufRlu6qmcf7sI= +cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= From b4cdb985bc55ac932fc83d612820aecf0fc31769 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Sat, 7 Oct 2023 00:15:41 -0400 Subject: [PATCH 03/24] feat: privacy access request endpoint --- backend/pkg/models/auth.go | 13 +------------ backend/pkg/repository/repository.go | 5 +++++ backend/pkg/router/privacy.go | 28 ++++++++++++++++++++++++++++ backend/server/server.go | 1 + 4 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 backend/pkg/router/privacy.go diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index 525cba0c..1d484ab1 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -3,7 +3,6 @@ package models import ( "fmt" - "github.com/fullstackatbrown/here/pkg/firebase" pal "github.com/tianrendong/privacy-pal" ) @@ -80,7 +79,7 @@ type EditAdminAccessRequest struct { func (u *User) Owns() []pal.Locator { return []pal.Locator{{ - ID: "45UwrbxU9caxNqI5caWdxPYJ8pO2", + ID: u.Profile.ID, Collection: FirestoreProfilesCollection, Document: &Profile{}, }} @@ -105,13 +104,3 @@ func (p *Profile) Accesses() []pal.Locator { func (p *Profile) GetData(mode pal.GetDataMode) string { return p.DisplayName } - -func init() { - user := &User{} - firestoreClient, err := firebase.App.Firestore(firebase.Context) - if err != nil { - panic(err.Error()) - } - f := pal.NewPrivacyPal(firestoreClient) - fmt.Println(f.ProcessAccessRequest(user)) -} diff --git a/backend/pkg/repository/repository.go b/backend/pkg/repository/repository.go index d49afb81..f0894111 100644 --- a/backend/pkg/repository/repository.go +++ b/backend/pkg/repository/repository.go @@ -10,6 +10,7 @@ import ( "github.com/fullstackatbrown/here/pkg/models" "cloud.google.com/go/firestore" + pal "github.com/tianrendong/privacy-pal" ) var Repository *FirebaseRepository @@ -37,6 +38,8 @@ type FirebaseRepository struct { profilesLock sync.RWMutex profiles map[string]*models.Profile + + PrivacyPal *pal.PrivacyPal } func NewFirebaseRepository() (*FirebaseRepository, error) { @@ -65,5 +68,7 @@ func NewFirebaseRepository() (*FirebaseRepository, error) { initFn() } + fr.PrivacyPal = pal.NewPrivacyPal(fr.firestoreClient) + return fr, nil } diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go new file mode 100644 index 00000000..ab30146f --- /dev/null +++ b/backend/pkg/router/privacy.go @@ -0,0 +1,28 @@ +package router + +import ( + "net/http" + + repo "github.com/fullstackatbrown/here/pkg/repository" + "github.com/go-chi/chi/v5" + "github.com/go-chi/render" +) + +func PrivacyRoutes() *chi.Mux { + router := chi.NewRouter() + + router.Get("/data", handleAccessRequest) + return router +} + +func handleAccessRequest(w http.ResponseWriter, r *http.Request) { + userID := chi.URLParam(r, "userID") + + user, err := repo.Repository.GetUserByID(userID) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + render.JSON(w, r, repo.Repository.PrivacyPal.ProcessAccessRequest(user)) +} diff --git a/backend/server/server.go b/backend/server/server.go index 018dc48b..7009d69a 100644 --- a/backend/server/server.go +++ b/backend/server/server.go @@ -22,6 +22,7 @@ func Routes() *chi.Mux { r.Mount("/", rtr.HealthRoutes()) r.Mount("/courses", rtr.CourseRoutes()) r.Mount("/users", rtr.AuthRoutes()) + r.Mount("/privacy", rtr.PrivacyRoutes()) }) return router From 944a77445dde32b5a00a8003c5d360a299f26e04 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Sat, 7 Oct 2023 00:26:27 -0400 Subject: [PATCH 04/24] fix: privacy access route gets user from context --- backend/pkg/router/privacy.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index ab30146f..8a1358e5 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -3,6 +3,7 @@ package router import ( "net/http" + "github.com/fullstackatbrown/here/pkg/middleware" repo "github.com/fullstackatbrown/here/pkg/repository" "github.com/go-chi/chi/v5" "github.com/go-chi/render" @@ -11,16 +12,15 @@ import ( func PrivacyRoutes() *chi.Mux { router := chi.NewRouter() + router.Use(middleware.AuthCtx()) router.Get("/data", handleAccessRequest) return router } func handleAccessRequest(w http.ResponseWriter, r *http.Request) { - userID := chi.URLParam(r, "userID") - - user, err := repo.Repository.GetUserByID(userID) + user, err := middleware.GetUserFromRequest(r) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + http.Error(w, err.Error(), http.StatusUnauthorized) return } From 5a6657f874c95e295c01529924dc25799d503ed5 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Sat, 7 Oct 2023 17:35:52 -0400 Subject: [PATCH 05/24] feat: command to update privacy-pal version --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 936bf156..c8989058 100644 --- a/Makefile +++ b/Makefile @@ -4,4 +4,7 @@ backend: cd backend ; go run main.go frontend: - cd frontend ; npm i && npm run dev \ No newline at end of file + cd frontend ; npm i && npm run dev + +update_privacy_pal: + cd backend ; go get github.com/tianrendong/privacy-pal@$(version) \ No newline at end of file From c4809ead6e817b197783ccae0d59a1b62921027f Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Sat, 7 Oct 2023 17:36:06 -0400 Subject: [PATCH 06/24] fix: show more info --- backend/go.mod | 2 +- backend/go.sum | 2 ++ backend/pkg/models/auth.go | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 0bb1f2fb..2d31493e 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -41,7 +41,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/joho/godotenv v1.5.1 - github.com/tianrendong/privacy-pal v0.1.0 + github.com/tianrendong/privacy-pal v0.1.1 go.opencensus.io v0.24.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index 8b725273..92728e28 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -122,6 +122,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/tianrendong/privacy-pal v0.1.0 h1:atj34EbzU1jtKi5IFP279EZqBhJv99UbMuOPHLM2SKs= github.com/tianrendong/privacy-pal v0.1.0/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= +github.com/tianrendong/privacy-pal v0.1.1 h1:bN0UibU3i6ace9PrriW/+1YuiMTWJylGrYk2wdMSIZw= +github.com/tianrendong/privacy-pal v0.1.1/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index 1d484ab1..230aee2f 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -90,7 +90,7 @@ func (u *User) Accesses() []pal.Locator { } func (u *User) GetData(mode pal.GetDataMode) string { - return "" + return "user: " } func (p *Profile) Owns() []pal.Locator { @@ -102,5 +102,5 @@ func (p *Profile) Accesses() []pal.Locator { } func (p *Profile) GetData(mode pal.GetDataMode) string { - return p.DisplayName + return fmt.Sprintf("display name: %s", p.DisplayName) } From 5a07c5cd200f0b0fb949698b525aa53d988f0e8a Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Sat, 7 Oct 2023 19:12:34 -0400 Subject: [PATCH 07/24] feat: v0.2.1 working --- backend/go.mod | 2 +- backend/go.sum | 6 ++++ backend/pkg/models/auth.go | 46 +++++++++++++++++++--------- backend/pkg/models/course.go | 19 ++++++++++++ backend/pkg/repository/repository.go | 4 +-- backend/pkg/router/privacy.go | 2 +- 6 files changed, 60 insertions(+), 19 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 2d31493e..477b625b 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -41,7 +41,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/joho/godotenv v1.5.1 - github.com/tianrendong/privacy-pal v0.1.1 + github.com/tianrendong/privacy-pal v0.2.1 go.opencensus.io v0.24.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index 92728e28..1dc7cb74 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -124,6 +124,12 @@ github.com/tianrendong/privacy-pal v0.1.0 h1:atj34EbzU1jtKi5IFP279EZqBhJv99UbMuO github.com/tianrendong/privacy-pal v0.1.0/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= github.com/tianrendong/privacy-pal v0.1.1 h1:bN0UibU3i6ace9PrriW/+1YuiMTWJylGrYk2wdMSIZw= github.com/tianrendong/privacy-pal v0.1.1/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= +github.com/tianrendong/privacy-pal v0.1.2 h1:ZDSYuJvO8XoMXrmXiXr7sbWESUz37lEOzMUs2nKEQhs= +github.com/tianrendong/privacy-pal v0.1.2/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= +github.com/tianrendong/privacy-pal v0.2.0 h1:iX2KSHgBUfSHo9MC8YRI7NUcVI1rh7IQMk/8ScB+WEA= +github.com/tianrendong/privacy-pal v0.2.0/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= +github.com/tianrendong/privacy-pal v0.2.1 h1:Z+0d4bBXO+IlicjNiA8hqxBgfnZioJcnipXvQXOC18M= +github.com/tianrendong/privacy-pal v0.2.1/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index 230aee2f..7a5f984a 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -77,30 +77,46 @@ type EditAdminAccessRequest struct { IsAdmin bool `json:"isAdmin"` } -func (u *User) Owns() []pal.Locator { - return []pal.Locator{{ +func (u *User) GetOwnedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { + locators := make(map[string][]pal.Locator) + data := make(map[string]interface{}) + + locators["profile"] = []pal.Locator{{ ID: u.Profile.ID, Collection: FirestoreProfilesCollection, - Document: &Profile{}, + DataNode: &Profile{}, }} -} -func (u *User) Accesses() []pal.Locator { - return []pal.Locator{} + return locators, data } -func (u *User) GetData(mode pal.GetDataMode) string { - return "user: " +func (u *User) GetAccessedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { + locators := make(map[string][]pal.Locator) + data := make(map[string]interface{}) + return locators, data } -func (p *Profile) Owns() []pal.Locator { - return []pal.Locator{} -} +func (p *Profile) GetOwnedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { + locators := make(map[string][]pal.Locator) + data := make(map[string]interface{}) -func (p *Profile) Accesses() []pal.Locator { - return []pal.Locator{} + data["name"] = p.DisplayName + data["email"] = p.Email + data["photoUrl"] = p.PhotoURL + return locators, data } -func (p *Profile) GetData(mode pal.GetDataMode) string { - return fmt.Sprintf("display name: %s", p.DisplayName) +func (p *Profile) GetAccessedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { + locators := make(map[string][]pal.Locator) + + locators["courses"] = []pal.Locator{} + for _, courseID := range p.Courses { + locators["courses"] = append(locators["courses"], pal.Locator{ + ID: courseID, + Collection: FirestoreCoursesCollection, + DataNode: &Course{}, + }) + } + data := make(map[string]interface{}) + return locators, data } diff --git a/backend/pkg/models/course.go b/backend/pkg/models/course.go index 52dd2388..9906ead0 100644 --- a/backend/pkg/models/course.go +++ b/backend/pkg/models/course.go @@ -3,6 +3,8 @@ package models import ( "strings" "sync" + + pal "github.com/tianrendong/privacy-pal" ) const ( @@ -105,3 +107,20 @@ type AssignSectionsRequest struct { func CreateCourseID(req *CreateCourseRequest) string { return strings.ToLower(req.Code + req.Term) } + +func (c *Course) GetOwnedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { + locators := make(map[string][]pal.Locator) + data := make(map[string]interface{}) + + data["course user data"] = c.Students[dataSubjectID] + + return locators, data +} + +func (c *Course) GetAccessedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { + locators := make(map[string][]pal.Locator) + data := make(map[string]interface{}) + + data["title"] = c.Title + return locators, data +} diff --git a/backend/pkg/repository/repository.go b/backend/pkg/repository/repository.go index f0894111..a70ea371 100644 --- a/backend/pkg/repository/repository.go +++ b/backend/pkg/repository/repository.go @@ -39,7 +39,7 @@ type FirebaseRepository struct { profilesLock sync.RWMutex profiles map[string]*models.Profile - PrivacyPal *pal.PrivacyPal + PrivacyPal *pal.Client } func NewFirebaseRepository() (*FirebaseRepository, error) { @@ -68,7 +68,7 @@ func NewFirebaseRepository() (*FirebaseRepository, error) { initFn() } - fr.PrivacyPal = pal.NewPrivacyPal(fr.firestoreClient) + fr.PrivacyPal = pal.NewClient(fr.firestoreClient) return fr, nil } diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index 8a1358e5..afae1634 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -24,5 +24,5 @@ func handleAccessRequest(w http.ResponseWriter, r *http.Request) { return } - render.JSON(w, r, repo.Repository.PrivacyPal.ProcessAccessRequest(user)) + render.JSON(w, r, repo.Repository.PrivacyPal.ProcessAccessRequest(user, user.ID)) } From 06e09d929d1a368f2b2bfdd86cd94ba78dbc3231 Mon Sep 17 00:00:00 2001 From: Jenny Date: Tue, 10 Oct 2023 00:23:07 -0400 Subject: [PATCH 08/24] feat: updated privacy pal version --- backend/go.mod | 2 +- backend/go.sum | 4 ++++ backend/pkg/models/auth.go | 41 ++++++++++------------------------- backend/pkg/models/course.go | 12 +++++----- backend/pkg/router/privacy.go | 16 +++++++++++++- 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 477b625b..74ab0325 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -41,7 +41,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/joho/godotenv v1.5.1 - github.com/tianrendong/privacy-pal v0.2.1 + github.com/tianrendong/privacy-pal v0.3.1 go.opencensus.io v0.24.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index 1dc7cb74..6a0014b4 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -130,6 +130,10 @@ github.com/tianrendong/privacy-pal v0.2.0 h1:iX2KSHgBUfSHo9MC8YRI7NUcVI1rh7IQMk/ github.com/tianrendong/privacy-pal v0.2.0/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= github.com/tianrendong/privacy-pal v0.2.1 h1:Z+0d4bBXO+IlicjNiA8hqxBgfnZioJcnipXvQXOC18M= github.com/tianrendong/privacy-pal v0.2.1/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= +github.com/tianrendong/privacy-pal v0.3.0 h1:/PEryffgjs36XxdxdtMBeTzaQIXkvpYs0b+RBVQGMiw= +github.com/tianrendong/privacy-pal v0.3.0/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= +github.com/tianrendong/privacy-pal v0.3.1 h1:OD2ojb//ZkIbVm4zxp2qdRcdtvbJnObyGZPVg+5k774= +github.com/tianrendong/privacy-pal v0.3.1/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index 7a5f984a..a3a7af66 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -3,6 +3,7 @@ package models import ( "fmt" + "cloud.google.com/go/firestore" pal "github.com/tianrendong/privacy-pal" ) @@ -77,36 +78,7 @@ type EditAdminAccessRequest struct { IsAdmin bool `json:"isAdmin"` } -func (u *User) GetOwnedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { - locators := make(map[string][]pal.Locator) - data := make(map[string]interface{}) - - locators["profile"] = []pal.Locator{{ - ID: u.Profile.ID, - Collection: FirestoreProfilesCollection, - DataNode: &Profile{}, - }} - - return locators, data -} - -func (u *User) GetAccessedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { - locators := make(map[string][]pal.Locator) - data := make(map[string]interface{}) - return locators, data -} - -func (p *Profile) GetOwnedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { - locators := make(map[string][]pal.Locator) - data := make(map[string]interface{}) - - data["name"] = p.DisplayName - data["email"] = p.Email - data["photoUrl"] = p.PhotoURL - return locators, data -} - -func (p *Profile) GetAccessedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { +func (p *Profile) HandleAccess(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { locators := make(map[string][]pal.Locator) locators["courses"] = []pal.Locator{} @@ -117,6 +89,15 @@ func (p *Profile) GetAccessedData(dataSubjectID string) (map[string][]pal.Locato DataNode: &Course{}, }) } + data := make(map[string]interface{}) + + data["name"] = p.DisplayName + data["email"] = p.Email + data["photoUrl"] = p.PhotoURL return locators, data } + +func (p *Profile) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { + return +} diff --git a/backend/pkg/models/course.go b/backend/pkg/models/course.go index 9906ead0..a52e3c81 100644 --- a/backend/pkg/models/course.go +++ b/backend/pkg/models/course.go @@ -4,6 +4,7 @@ import ( "strings" "sync" + "cloud.google.com/go/firestore" pal "github.com/tianrendong/privacy-pal" ) @@ -108,19 +109,16 @@ func CreateCourseID(req *CreateCourseRequest) string { return strings.ToLower(req.Code + req.Term) } -func (c *Course) GetOwnedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { +func (c *Course) HandleAccess(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { locators := make(map[string][]pal.Locator) data := make(map[string]interface{}) data["course user data"] = c.Students[dataSubjectID] + data["title"] = c.Title return locators, data } -func (c *Course) GetAccessedData(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { - locators := make(map[string][]pal.Locator) - data := make(map[string]interface{}) - - data["title"] = c.Title - return locators, data +func (c *Course) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { + return } diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index afae1634..cb2f4c36 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -4,9 +4,11 @@ import ( "net/http" "github.com/fullstackatbrown/here/pkg/middleware" + "github.com/fullstackatbrown/here/pkg/models" repo "github.com/fullstackatbrown/here/pkg/repository" "github.com/go-chi/chi/v5" "github.com/go-chi/render" + pal "github.com/tianrendong/privacy-pal" ) func PrivacyRoutes() *chi.Mux { @@ -24,5 +26,17 @@ func handleAccessRequest(w http.ResponseWriter, r *http.Request) { return } - render.JSON(w, r, repo.Repository.PrivacyPal.ProcessAccessRequest(user, user.ID)) + locator := pal.Locator{ + ID: user.ID, + Collection: "user_profiles", + DataNode: &models.Profile{}, + } + + ret, err := repo.Repository.PrivacyPal.ProcessAccessRequest(locator, user.ID) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + render.JSON(w, r, ret) } From 54c9a3459dbec8be2ade992ad086faa7c1544186 Mon Sep 17 00:00:00 2001 From: Jenny Date: Tue, 10 Oct 2023 16:24:01 -0400 Subject: [PATCH 09/24] fix: return JSON instead of string --- backend/go.mod | 2 +- backend/go.sum | 6 ++++++ backend/pkg/router/privacy.go | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 74ab0325..9117afb8 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -41,7 +41,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/joho/godotenv v1.5.1 - github.com/tianrendong/privacy-pal v0.3.1 + github.com/tianrendong/privacy-pal v0.3.5 go.opencensus.io v0.24.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index 6a0014b4..a58b20b8 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -134,6 +134,12 @@ github.com/tianrendong/privacy-pal v0.3.0 h1:/PEryffgjs36XxdxdtMBeTzaQIXkvpYs0b+ github.com/tianrendong/privacy-pal v0.3.0/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= github.com/tianrendong/privacy-pal v0.3.1 h1:OD2ojb//ZkIbVm4zxp2qdRcdtvbJnObyGZPVg+5k774= github.com/tianrendong/privacy-pal v0.3.1/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= +github.com/tianrendong/privacy-pal v0.3.2 h1:DClv91kWqDK3IqyiINGDxKV/vUglj3vy50iI51AFTG0= +github.com/tianrendong/privacy-pal v0.3.2/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= +github.com/tianrendong/privacy-pal v0.3.3 h1:loJSbw7mAbv0lAQJHoKqldzIXW+fLGGh8WRqIpj7Poc= +github.com/tianrendong/privacy-pal v0.3.3/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= +github.com/tianrendong/privacy-pal v0.3.5 h1:mt9HIpYUV282sjaTERqkYSpCmT6ztJOLvTX1E2ZbOwE= +github.com/tianrendong/privacy-pal v0.3.5/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index cb2f4c36..9f2aeacf 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -32,11 +32,12 @@ func handleAccessRequest(w http.ResponseWriter, r *http.Request) { DataNode: &models.Profile{}, } - ret, err := repo.Repository.PrivacyPal.ProcessAccessRequest(locator, user.ID) + data, err := repo.Repository.PrivacyPal.ProcessAccessRequest(locator, user.ID) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - render.JSON(w, r, ret) + w.Header().Set("Content-Type", "application/json") + render.JSON(w, r, data) } From 3e829b8e43698955537c173d2d112ac6d567c38a Mon Sep 17 00:00:00 2001 From: Jenny Date: Thu, 12 Oct 2023 21:58:19 -0400 Subject: [PATCH 10/24] feat: updated privacy-pal package --- backend/go.mod | 2 +- backend/go.sum | 2 ++ backend/pkg/models/auth.go | 28 ++++++++++++++-------------- backend/pkg/models/course.go | 23 ++++++++++++++++------- backend/pkg/models/section.go | 19 +++++++++++++++++++ backend/pkg/repository/repository.go | 2 +- backend/pkg/router/privacy.go | 9 +++++---- 7 files changed, 58 insertions(+), 27 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 9117afb8..a39650c7 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -41,7 +41,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/joho/godotenv v1.5.1 - github.com/tianrendong/privacy-pal v0.3.5 + github.com/tianrendong/privacy-pal v0.3.6 go.opencensus.io v0.24.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index a58b20b8..371f4f52 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -140,6 +140,8 @@ github.com/tianrendong/privacy-pal v0.3.3 h1:loJSbw7mAbv0lAQJHoKqldzIXW+fLGGh8WR github.com/tianrendong/privacy-pal v0.3.3/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= github.com/tianrendong/privacy-pal v0.3.5 h1:mt9HIpYUV282sjaTERqkYSpCmT6ztJOLvTX1E2ZbOwE= github.com/tianrendong/privacy-pal v0.3.5/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= +github.com/tianrendong/privacy-pal v0.3.6 h1:S2+OOD9xuyrrh7fBGMBq94SIN6r6KX76boCaeqDFYPQ= +github.com/tianrendong/privacy-pal v0.3.6/go.mod h1:Ulx1VUVYk5FvgWhMaSPl/Rkw5Wera4jox3YNOAXqBGo= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index a3a7af66..7a8f71a4 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -4,7 +4,7 @@ import ( "fmt" "cloud.google.com/go/firestore" - pal "github.com/tianrendong/privacy-pal" + pal "github.com/tianrendong/privacy-pal/pkg" ) const ( @@ -78,24 +78,24 @@ type EditAdminAccessRequest struct { IsAdmin bool `json:"isAdmin"` } -func (p *Profile) HandleAccess(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { - locators := make(map[string][]pal.Locator) - - locators["courses"] = []pal.Locator{} - for _, courseID := range p.Courses { - locators["courses"] = append(locators["courses"], pal.Locator{ - ID: courseID, - Collection: FirestoreCoursesCollection, - DataNode: &Course{}, - }) - } - +func (p *Profile) HandleAccess(dataSubjectID string, currentDocumentID string) map[string]interface{} { data := make(map[string]interface{}) data["name"] = p.DisplayName data["email"] = p.Email data["photoUrl"] = p.PhotoURL - return locators, data + + data["courses"] = []pal.Locator{} + for _, courseID := range p.Courses { + data["courses"] = append(data["courses"].([]pal.Locator), pal.Locator{ + Type: pal.Document, + DocIDs: []string{courseID}, + CollectionPath: []string{FirestoreCoursesCollection}, + NewDataNode: func() pal.DataNode { return &Course{} }, + }) + } + + return data } func (p *Profile) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { diff --git a/backend/pkg/models/course.go b/backend/pkg/models/course.go index a52e3c81..74d8aaf5 100644 --- a/backend/pkg/models/course.go +++ b/backend/pkg/models/course.go @@ -5,7 +5,7 @@ import ( "sync" "cloud.google.com/go/firestore" - pal "github.com/tianrendong/privacy-pal" + pal "github.com/tianrendong/privacy-pal/pkg" ) const ( @@ -109,14 +109,23 @@ func CreateCourseID(req *CreateCourseRequest) string { return strings.ToLower(req.Code + req.Term) } -func (c *Course) HandleAccess(dataSubjectID string) (map[string][]pal.Locator, map[string]interface{}) { - locators := make(map[string][]pal.Locator) +func (c *Course) HandleAccess(dataSubjectID string, currentDocumentID string) map[string]interface{} { data := make(map[string]interface{}) - - data["course user data"] = c.Students[dataSubjectID] data["title"] = c.Title - - return locators, data + data["course user data"] = c.Students[dataSubjectID] + if c.Students[dataSubjectID].DefaultSection != "" { + data["default section"] = []pal.Locator{ + { + Type: pal.Document, + DocIDs: []string{currentDocumentID, c.Students[dataSubjectID].DefaultSection}, + CollectionPath: []string{FirestoreCoursesCollection, FirestoreSectionsCollection}, + NewDataNode: func() pal.DataNode { return &Section{} }, + }, + } + } else { + data["default section"] = "unassigned" + } + return data } func (c *Course) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { diff --git a/backend/pkg/models/section.go b/backend/pkg/models/section.go index 0f54ecad..d56decb3 100644 --- a/backend/pkg/models/section.go +++ b/backend/pkg/models/section.go @@ -1,5 +1,10 @@ package models +import ( + "cloud.google.com/go/firestore" + pal "github.com/tianrendong/privacy-pal/pkg" +) + const ( FirestoreSectionsCollection = "sections" ) @@ -59,3 +64,17 @@ type DeleteSectionRequest struct { Course *Course SectionID string } + +func (s *Section) HandleAccess(dataSubjectID string, currentDocumentID string) map[string]interface{} { + data := make(map[string]interface{}) + + data["start time"] = s.StartTime + data["end time"] = s.EndTime + data["location"] = s.Location + + return data +} + +func (s *Section) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { + return +} diff --git a/backend/pkg/repository/repository.go b/backend/pkg/repository/repository.go index a70ea371..f0caa6ef 100644 --- a/backend/pkg/repository/repository.go +++ b/backend/pkg/repository/repository.go @@ -10,7 +10,7 @@ import ( "github.com/fullstackatbrown/here/pkg/models" "cloud.google.com/go/firestore" - pal "github.com/tianrendong/privacy-pal" + pal "github.com/tianrendong/privacy-pal/pkg" ) var Repository *FirebaseRepository diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index 9f2aeacf..690a491a 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -8,7 +8,7 @@ import ( repo "github.com/fullstackatbrown/here/pkg/repository" "github.com/go-chi/chi/v5" "github.com/go-chi/render" - pal "github.com/tianrendong/privacy-pal" + pal "github.com/tianrendong/privacy-pal/pkg" ) func PrivacyRoutes() *chi.Mux { @@ -27,9 +27,10 @@ func handleAccessRequest(w http.ResponseWriter, r *http.Request) { } locator := pal.Locator{ - ID: user.ID, - Collection: "user_profiles", - DataNode: &models.Profile{}, + Type: pal.Document, + DocIDs: []string{user.ID}, + CollectionPath: []string{models.FirestoreProfilesCollection}, + NewDataNode: func() pal.DataNode { return &models.Profile{} }, } data, err := repo.Repository.PrivacyPal.ProcessAccessRequest(locator, user.ID) From 95ee93877c5ac4270458193d6292314e5a6e530f Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Fri, 20 Oct 2023 00:30:21 -0400 Subject: [PATCH 11/24] use new pacakge --- Makefile | 2 +- backend/go.mod | 46 +++---- backend/go.sum | 188 +++++++-------------------- backend/pkg/models/auth.go | 2 +- backend/pkg/models/course.go | 2 +- backend/pkg/models/section.go | 2 +- backend/pkg/repository/repository.go | 2 +- backend/pkg/router/privacy.go | 2 +- 8 files changed, 75 insertions(+), 171 deletions(-) diff --git a/Makefile b/Makefile index c8989058..698d755a 100644 --- a/Makefile +++ b/Makefile @@ -7,4 +7,4 @@ frontend: cd frontend ; npm i && npm run dev update_privacy_pal: - cd backend ; go get github.com/tianrendong/privacy-pal@$(version) \ No newline at end of file + cd backend ; go get github.com/privacy-pal/privacy-pal@$(version) \ No newline at end of file diff --git a/backend/go.mod b/backend/go.mod index a39650c7..913e7c0f 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -2,55 +2,55 @@ module github.com/fullstackatbrown/here go 1.18 -require google.golang.org/api v0.128.0 +require google.golang.org/api v0.147.0 require ( cloud.google.com/go/firestore v1.13.0 - cloud.google.com/go/storage v1.29.0 // indirect + cloud.google.com/go/storage v1.33.0 // indirect ) require ( firebase.google.com/go v3.13.0+incompatible github.com/go-chi/chi/v5 v5.0.8 github.com/go-chi/render v1.0.2 - github.com/google/go-cmp v0.5.9 + github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 + github.com/privacy-pal/privacy-pal v0.4.0 github.com/rs/cors v1.8.3 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb - google.golang.org/grpc v1.56.1 + google.golang.org/grpc v1.58.3 ) require ( - github.com/google/s2a-go v0.1.4 // indirect - golang.org/x/crypto v0.9.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect + github.com/google/s2a-go v0.1.7 // indirect + golang.org/x/crypto v0.14.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect ) require ( - cloud.google.com/go v0.110.2 // indirect - cloud.google.com/go/compute v1.19.3 // indirect + cloud.google.com/go v0.110.8 // indirect + cloud.google.com/go/compute v1.23.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/longrunning v0.5.0 // indirect + cloud.google.com/go/iam v1.1.3 // indirect + cloud.google.com/go/longrunning v0.5.2 // indirect github.com/ajg/form v1.5.1 // indirect github.com/golang/glog v1.1.1 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 - github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect + github.com/google/uuid v1.3.1 + github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/joho/godotenv v1.5.1 - github.com/tianrendong/privacy-pal v0.3.6 go.opencensus.io v0.24.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sync v0.2.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect + golang.org/x/sync v0.4.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/backend/go.sum b/backend/go.sum index 371f4f52..72960355 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -1,55 +1,32 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.107.0 h1:qkj22L7bgkl6vIeZDlOY2po43Mx/TIa2Wsa7VR+PEww= -cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I= -cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA= -cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= -cloud.google.com/go/compute v1.15.1 h1:7UGq3QknM33pw5xATlpzeoomNxsacIVvTqTTvbfajmE= -cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= -cloud.google.com/go/compute v1.19.3 h1:DcTwsFgGev/wV5+q8o2fzgcHOaac+DKGC91ZlvpsQds= -cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= +cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= +cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= +cloud.google.com/go/compute v1.23.1 h1:V97tBoDaZHb6leicZ1G6DLK2BAaZLJ/7+9BB/En3hR0= +cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= -cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= cloud.google.com/go/firestore v1.13.0 h1:/3S4RssUV4GO/kvgJZB+tayjhOfyAHs+KcpJgRVu/Qk= cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8= -cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= -cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= -cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= -cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= -cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= -cloud.google.com/go/longrunning v0.5.0 h1:DK8BH0+hS+DIvc9a2TPnteUievsTCH4ORMAASSb7JcQ= -cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc= -cloud.google.com/go/storage v1.28.0 h1:DLrIZ6xkeZX6K70fU/boWx5INJumt6f+nwwWSHXzzGY= -cloud.google.com/go/storage v1.28.0/go.mod h1:qlgZML35PXA3zoEnIkiPLY4/TOkUleufRlu6qmcf7sI= -cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= -cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +cloud.google.com/go/iam v1.1.3 h1:18tKG7DzydKWUnLjonWcJO6wjSCAtzh4GcRKlH/Hrzc= +cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE= +cloud.google.com/go/longrunning v0.5.2 h1:u+oFqfEwwU7F9dIELigxbe0XVnBAo9wqMuQLA50CZ5k= +cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUzqv2YttZiveCs= +cloud.google.com/go/storage v1.33.0 h1:PVrDOkIC8qQVa1P3SXGpQvfuJhN2LHOoyZvWs8D2X5M= +cloud.google.com/go/storage v1.33.0/go.mod h1:Hhh/dogNRGca7IWv1RC2YqEn0c0G77ctA/OxflYkiD8= firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0= github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/render v1.0.2 h1:4ER/udB0+fMWB2Jlf15RV3F4A2FDuYi/9f+lFttR/Lg= @@ -57,25 +34,20 @@ github.com/go-chi/render v1.0.2/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIo github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw= github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -86,72 +58,41 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs= -github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4= -github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ= +github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/privacy-pal/privacy-pal v0.4.0 h1:SMutFLBkw0SIUf05oPl1WUCVC2rbKHdKTdcRBmsQIOE= +github.com/privacy-pal/privacy-pal v0.4.0/go.mod h1:UELlFXRUn50olzlm/r4+C83CpARgiVxLJaVPQgsWEyQ= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/tianrendong/privacy-pal v0.1.0 h1:atj34EbzU1jtKi5IFP279EZqBhJv99UbMuOPHLM2SKs= -github.com/tianrendong/privacy-pal v0.1.0/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= -github.com/tianrendong/privacy-pal v0.1.1 h1:bN0UibU3i6ace9PrriW/+1YuiMTWJylGrYk2wdMSIZw= -github.com/tianrendong/privacy-pal v0.1.1/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= -github.com/tianrendong/privacy-pal v0.1.2 h1:ZDSYuJvO8XoMXrmXiXr7sbWESUz37lEOzMUs2nKEQhs= -github.com/tianrendong/privacy-pal v0.1.2/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= -github.com/tianrendong/privacy-pal v0.2.0 h1:iX2KSHgBUfSHo9MC8YRI7NUcVI1rh7IQMk/8ScB+WEA= -github.com/tianrendong/privacy-pal v0.2.0/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= -github.com/tianrendong/privacy-pal v0.2.1 h1:Z+0d4bBXO+IlicjNiA8hqxBgfnZioJcnipXvQXOC18M= -github.com/tianrendong/privacy-pal v0.2.1/go.mod h1:b4M0YnySaFudQBJ38NXAM74gQH7XZdCz3k9sg3QtpVM= -github.com/tianrendong/privacy-pal v0.3.0 h1:/PEryffgjs36XxdxdtMBeTzaQIXkvpYs0b+RBVQGMiw= -github.com/tianrendong/privacy-pal v0.3.0/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= -github.com/tianrendong/privacy-pal v0.3.1 h1:OD2ojb//ZkIbVm4zxp2qdRcdtvbJnObyGZPVg+5k774= -github.com/tianrendong/privacy-pal v0.3.1/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= -github.com/tianrendong/privacy-pal v0.3.2 h1:DClv91kWqDK3IqyiINGDxKV/vUglj3vy50iI51AFTG0= -github.com/tianrendong/privacy-pal v0.3.2/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= -github.com/tianrendong/privacy-pal v0.3.3 h1:loJSbw7mAbv0lAQJHoKqldzIXW+fLGGh8WRqIpj7Poc= -github.com/tianrendong/privacy-pal v0.3.3/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= -github.com/tianrendong/privacy-pal v0.3.5 h1:mt9HIpYUV282sjaTERqkYSpCmT6ztJOLvTX1E2ZbOwE= -github.com/tianrendong/privacy-pal v0.3.5/go.mod h1:4aKI3vNKEUgSD0D+83zXfcpivr0AuEhPq6rhmOPlCc0= -github.com/tianrendong/privacy-pal v0.3.6 h1:S2+OOD9xuyrrh7fBGMBq94SIN6r6KX76boCaeqDFYPQ= -github.com/tianrendong/privacy-pal v0.3.6/go.mod h1:Ulx1VUVYk5FvgWhMaSPl/Rkw5Wera4jox3YNOAXqBGo= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= @@ -161,64 +102,42 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M= -golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= -golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= -golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -230,41 +149,30 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/api v0.103.0 h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ= -google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= -google.golang.org/api v0.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg= -google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc= +google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao= -google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= +google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a h1:myvhA4is3vrit1a6NZCWBIwN0kNEnX21DJOJX/NvIfI= +google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a h1:a2MQQVoTo96JC9PMGtGBymLp7+/RzpFc2yX/9WfFg1c= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= -google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= -google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -276,13 +184,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index 7a8f71a4..cb897af2 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -4,7 +4,7 @@ import ( "fmt" "cloud.google.com/go/firestore" - pal "github.com/tianrendong/privacy-pal/pkg" + pal "github.com/privacy-pal/privacy-pal/pkg" ) const ( diff --git a/backend/pkg/models/course.go b/backend/pkg/models/course.go index 74d8aaf5..545db8e6 100644 --- a/backend/pkg/models/course.go +++ b/backend/pkg/models/course.go @@ -5,7 +5,7 @@ import ( "sync" "cloud.google.com/go/firestore" - pal "github.com/tianrendong/privacy-pal/pkg" + pal "github.com/privacy-pal/privacy-pal/pkg" ) const ( diff --git a/backend/pkg/models/section.go b/backend/pkg/models/section.go index d56decb3..6b0fc582 100644 --- a/backend/pkg/models/section.go +++ b/backend/pkg/models/section.go @@ -2,7 +2,7 @@ package models import ( "cloud.google.com/go/firestore" - pal "github.com/tianrendong/privacy-pal/pkg" + pal "github.com/privacy-pal/privacy-pal/pkg" ) const ( diff --git a/backend/pkg/repository/repository.go b/backend/pkg/repository/repository.go index f0caa6ef..41b52c96 100644 --- a/backend/pkg/repository/repository.go +++ b/backend/pkg/repository/repository.go @@ -10,7 +10,7 @@ import ( "github.com/fullstackatbrown/here/pkg/models" "cloud.google.com/go/firestore" - pal "github.com/tianrendong/privacy-pal/pkg" + pal "github.com/privacy-pal/privacy-pal/pkg" ) var Repository *FirebaseRepository diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index 690a491a..7659019e 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -8,7 +8,7 @@ import ( repo "github.com/fullstackatbrown/here/pkg/repository" "github.com/go-chi/chi/v5" "github.com/go-chi/render" - pal "github.com/tianrendong/privacy-pal/pkg" + pal "github.com/privacy-pal/privacy-pal/pkg" ) func PrivacyRoutes() *chi.Mux { From 0e69316e45dab0125dd160a5fe62c2d330a6b104 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Wed, 15 Nov 2023 01:50:41 -0500 Subject: [PATCH 12/24] feat: handle access request with user, course, section data --- backend/go.mod | 10 ++++- backend/go.sum | 31 +++++++++++++- backend/pkg/models/auth.go | 27 ------------- backend/pkg/models/course.go | 26 ------------ backend/pkg/models/section.go | 19 --------- backend/pkg/privacy/course.go | 13 ++++++ backend/pkg/privacy/privacy.go | 25 ++++++++++++ backend/pkg/privacy/section.go | 15 +++++++ backend/pkg/privacy/user.go | 60 ++++++++++++++++++++++++++++ backend/pkg/repository/repository.go | 4 +- backend/pkg/router/privacy.go | 15 ++++--- 11 files changed, 162 insertions(+), 83 deletions(-) create mode 100644 backend/pkg/privacy/course.go create mode 100644 backend/pkg/privacy/privacy.go create mode 100644 backend/pkg/privacy/section.go create mode 100644 backend/pkg/privacy/user.go diff --git a/backend/go.mod b/backend/go.mod index 913e7c0f..b339b621 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -15,14 +15,22 @@ require ( github.com/go-chi/render v1.0.2 github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/privacy-pal/privacy-pal v0.4.0 + github.com/privacy-pal/privacy-pal/go v0.6.0 github.com/rs/cors v1.8.3 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb google.golang.org/grpc v1.58.3 ) require ( + github.com/golang/snappy v0.0.4 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.2 // indirect + github.com/xdg-go/stringprep v1.0.4 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.mongodb.org/mongo-driver v1.13.0 // indirect golang.org/x/crypto v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect diff --git a/backend/go.sum b/backend/go.sum index 72960355..8ea2363e 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -22,6 +22,7 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -51,15 +52,20 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -71,11 +77,17 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/privacy-pal/privacy-pal v0.4.0 h1:SMutFLBkw0SIUf05oPl1WUCVC2rbKHdKTdcRBmsQIOE= -github.com/privacy-pal/privacy-pal v0.4.0/go.mod h1:UELlFXRUn50olzlm/r4+C83CpARgiVxLJaVPQgsWEyQ= +github.com/privacy-pal/privacy-pal/go v0.5.0 h1:4HrViUNbI40RibPlF5hGT1+4RVOfIFdvI+o5yfzU9Ww= +github.com/privacy-pal/privacy-pal/go v0.5.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= +github.com/privacy-pal/privacy-pal/go v0.6.0 h1:ShjRa0vO+CBPJgD/B1OjiIBfit8B8bu7CHJG3bxYiFo= +github.com/privacy-pal/privacy-pal/go v0.6.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -85,12 +97,23 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.mongodb.org/mongo-driver v1.13.0 h1:67DgFFjYOCMWdtTEmKFpV3ffWlFnh+CYZ8ZS/tXWUfY= +go.mongodb.org/mongo-driver v1.13.0/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -108,6 +131,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= @@ -125,6 +149,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -134,8 +159,10 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= diff --git a/backend/pkg/models/auth.go b/backend/pkg/models/auth.go index cb897af2..246ec77e 100644 --- a/backend/pkg/models/auth.go +++ b/backend/pkg/models/auth.go @@ -2,9 +2,6 @@ package models import ( "fmt" - - "cloud.google.com/go/firestore" - pal "github.com/privacy-pal/privacy-pal/pkg" ) const ( @@ -77,27 +74,3 @@ type EditAdminAccessRequest struct { Email string `json:"email"` IsAdmin bool `json:"isAdmin"` } - -func (p *Profile) HandleAccess(dataSubjectID string, currentDocumentID string) map[string]interface{} { - data := make(map[string]interface{}) - - data["name"] = p.DisplayName - data["email"] = p.Email - data["photoUrl"] = p.PhotoURL - - data["courses"] = []pal.Locator{} - for _, courseID := range p.Courses { - data["courses"] = append(data["courses"].([]pal.Locator), pal.Locator{ - Type: pal.Document, - DocIDs: []string{courseID}, - CollectionPath: []string{FirestoreCoursesCollection}, - NewDataNode: func() pal.DataNode { return &Course{} }, - }) - } - - return data -} - -func (p *Profile) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { - return -} diff --git a/backend/pkg/models/course.go b/backend/pkg/models/course.go index 545db8e6..52dd2388 100644 --- a/backend/pkg/models/course.go +++ b/backend/pkg/models/course.go @@ -3,9 +3,6 @@ package models import ( "strings" "sync" - - "cloud.google.com/go/firestore" - pal "github.com/privacy-pal/privacy-pal/pkg" ) const ( @@ -108,26 +105,3 @@ type AssignSectionsRequest struct { func CreateCourseID(req *CreateCourseRequest) string { return strings.ToLower(req.Code + req.Term) } - -func (c *Course) HandleAccess(dataSubjectID string, currentDocumentID string) map[string]interface{} { - data := make(map[string]interface{}) - data["title"] = c.Title - data["course user data"] = c.Students[dataSubjectID] - if c.Students[dataSubjectID].DefaultSection != "" { - data["default section"] = []pal.Locator{ - { - Type: pal.Document, - DocIDs: []string{currentDocumentID, c.Students[dataSubjectID].DefaultSection}, - CollectionPath: []string{FirestoreCoursesCollection, FirestoreSectionsCollection}, - NewDataNode: func() pal.DataNode { return &Section{} }, - }, - } - } else { - data["default section"] = "unassigned" - } - return data -} - -func (c *Course) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { - return -} diff --git a/backend/pkg/models/section.go b/backend/pkg/models/section.go index 6b0fc582..0f54ecad 100644 --- a/backend/pkg/models/section.go +++ b/backend/pkg/models/section.go @@ -1,10 +1,5 @@ package models -import ( - "cloud.google.com/go/firestore" - pal "github.com/privacy-pal/privacy-pal/pkg" -) - const ( FirestoreSectionsCollection = "sections" ) @@ -64,17 +59,3 @@ type DeleteSectionRequest struct { Course *Course SectionID string } - -func (s *Section) HandleAccess(dataSubjectID string, currentDocumentID string) map[string]interface{} { - data := make(map[string]interface{}) - - data["start time"] = s.StartTime - data["end time"] = s.EndTime - data["location"] = s.Location - - return data -} - -func (s *Section) HandleDeletion(dataSubjectID string) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate []firestore.Update) { - return -} diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go new file mode 100644 index 00000000..ca8eb39f --- /dev/null +++ b/backend/pkg/privacy/course.go @@ -0,0 +1,13 @@ +package privacy + +import ( + pal "github.com/privacy-pal/privacy-pal/go/pkg" +) + +func accessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { + data := make(map[string]interface{}) + + data["title"] = dbObj["title"] + + return data +} diff --git a/backend/pkg/privacy/privacy.go b/backend/pkg/privacy/privacy.go new file mode 100644 index 00000000..ec321591 --- /dev/null +++ b/backend/pkg/privacy/privacy.go @@ -0,0 +1,25 @@ +package privacy + +import ( + pal "github.com/privacy-pal/privacy-pal/go/pkg" +) + +const ( + UserDataType = "user" + CourseDataType = "course" + SectionDataType = "section" +) + +func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { + switch currentDbObjLocator.DataType { + case UserDataType: + return accessUser(dataSubjectId, currentDbObjLocator, dbObj) + case CourseDataType: + return accessCourse(dataSubjectId, currentDbObjLocator, dbObj) + case SectionDataType: + return accessSection(dataSubjectId, currentDbObjLocator, dbObj) + default: + // TODO: should return error + return nil + } +} diff --git a/backend/pkg/privacy/section.go b/backend/pkg/privacy/section.go new file mode 100644 index 00000000..438d58d7 --- /dev/null +++ b/backend/pkg/privacy/section.go @@ -0,0 +1,15 @@ +package privacy + +import ( + pal "github.com/privacy-pal/privacy-pal/go/pkg" +) + +func accessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { + data := make(map[string]interface{}) + + data["start time"] = dbObj["startTime"] + data["end time"] = dbObj["endTime"] + data["location"] = dbObj["location"] + + return data +} diff --git a/backend/pkg/privacy/user.go b/backend/pkg/privacy/user.go new file mode 100644 index 00000000..ae84b777 --- /dev/null +++ b/backend/pkg/privacy/user.go @@ -0,0 +1,60 @@ +package privacy + +import ( + "github.com/fullstackatbrown/here/pkg/models" + pal "github.com/privacy-pal/privacy-pal/go/pkg" +) + +func accessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { + data := make(map[string]interface{}) + + data["name"] = dbObj["displayName"] + data["email"] = dbObj["email"] + data["photoUrl"] = dbObj["photoUrl"] + + slice, ok := dbObj["courses"].([]interface{}) + if !ok { + return data + } + courses := make([]string, len(slice)) + if !ok { + return data + } + for i, v := range slice { + course, ok := v.(string) + if !ok { + return data + } + courses[i] = course + } + + data["courses"] = []pal.Locator{} + for _, courseID := range courses { + data["courses"] = append(data["courses"].([]pal.Locator), pal.Locator{ + LocatorType: pal.Document, + DataType: CourseDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection}, + DocIDs: []string{courseID}, + }, + }) + } + + sections, ok := dbObj["defaultSections"].(map[string]interface{}) + if !ok { + return data + } + data["defaultSections"] = []pal.Locator{} + for courseID, sectionID := range sections { + data["defaultSections"] = append(data["defaultSections"].([]pal.Locator), pal.Locator{ + LocatorType: pal.Document, + DataType: SectionDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSectionsCollection}, + DocIDs: []string{courseID, sectionID.(string)}, + }, + }) + } + + return data +} diff --git a/backend/pkg/repository/repository.go b/backend/pkg/repository/repository.go index 41b52c96..5f474c6e 100644 --- a/backend/pkg/repository/repository.go +++ b/backend/pkg/repository/repository.go @@ -10,7 +10,7 @@ import ( "github.com/fullstackatbrown/here/pkg/models" "cloud.google.com/go/firestore" - pal "github.com/privacy-pal/privacy-pal/pkg" + pal "github.com/privacy-pal/privacy-pal/go/pkg" ) var Repository *FirebaseRepository @@ -68,7 +68,7 @@ func NewFirebaseRepository() (*FirebaseRepository, error) { initFn() } - fr.PrivacyPal = pal.NewClient(fr.firestoreClient) + fr.PrivacyPal = pal.NewClientWithFirestore(fr.firestoreClient) return fr, nil } diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index 7659019e..1540f70c 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -5,10 +5,11 @@ import ( "github.com/fullstackatbrown/here/pkg/middleware" "github.com/fullstackatbrown/here/pkg/models" + "github.com/fullstackatbrown/here/pkg/privacy" repo "github.com/fullstackatbrown/here/pkg/repository" "github.com/go-chi/chi/v5" "github.com/go-chi/render" - pal "github.com/privacy-pal/privacy-pal/pkg" + pal "github.com/privacy-pal/privacy-pal/go/pkg" ) func PrivacyRoutes() *chi.Mux { @@ -27,13 +28,15 @@ func handleAccessRequest(w http.ResponseWriter, r *http.Request) { } locator := pal.Locator{ - Type: pal.Document, - DocIDs: []string{user.ID}, - CollectionPath: []string{models.FirestoreProfilesCollection}, - NewDataNode: func() pal.DataNode { return &models.Profile{} }, + LocatorType: pal.Document, + DataType: privacy.UserDataType, + FirestoreLocator: pal.FirestoreLocator{ + DocIDs: []string{user.ID}, + CollectionPath: []string{models.FirestoreProfilesCollection}, + }, } - data, err := repo.Repository.PrivacyPal.ProcessAccessRequest(locator, user.ID) + data, err := repo.Repository.PrivacyPal.ProcessAccessRequest(privacy.HandleAccess, locator, user.ID) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return From 85f18e0568a6dea1684630794f8e8de4dd6aad53 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Fri, 24 Nov 2023 22:25:53 -0500 Subject: [PATCH 13/24] feat: complete data access --- backend/pkg/models/survey.go | 22 +++++++++-------- backend/pkg/privacy/assignment.go | 18 ++++++++++++++ backend/pkg/privacy/course.go | 40 +++++++++++++++++++++++++++++-- backend/pkg/privacy/privacy.go | 15 +++++++++--- backend/pkg/privacy/section.go | 10 ++++---- backend/pkg/privacy/survey.go | 17 +++++++++++++ backend/pkg/privacy/swap.go | 20 ++++++++++++++++ backend/pkg/privacy/user.go | 19 ++++++++------- 8 files changed, 133 insertions(+), 28 deletions(-) create mode 100644 backend/pkg/privacy/assignment.go create mode 100644 backend/pkg/privacy/survey.go create mode 100644 backend/pkg/privacy/swap.go diff --git a/backend/pkg/models/survey.go b/backend/pkg/models/survey.go index e305f7f3..2201188c 100644 --- a/backend/pkg/models/survey.go +++ b/backend/pkg/models/survey.go @@ -5,17 +5,19 @@ const ( ) type Survey struct { - ID string `firestore:"id,omitempty"` - CourseID string `firestore:"courseID"` - Name string `firestore:"name"` - Description string `firestore:"description"` - Published bool `firestore:"published"` - EndTime string `firestore:"endTime"` - Options []*SurveyOption `firestore:"options"` - Responses map[string][]string `firestore:"responses"` - Results map[string][]CourseUserData `firestore:"results"` + ID string `firestore:"id,omitempty"` + CourseID string `firestore:"courseID"` + Name string `firestore:"name"` + Description string `firestore:"description"` + Published bool `firestore:"published"` + EndTime string `firestore:"endTime"` + Options []*SurveyOption `firestore:"options"` + // Map from userID to list of chosen options + Responses map[string][]string `firestore:"responses"` + // Map from option to list of student data + Results map[string][]CourseUserData `firestore:"results"` // Map from the option to a map from sectionID to capacity - SectionCapacity map[string]map[string]int `firestore:"sectionCapacity,omitempty"` + SectionCapacity map[string]map[string]int `firestore:"sectionCapacity,omitempty"` } type SurveyOption struct { diff --git a/backend/pkg/privacy/assignment.go b/backend/pkg/privacy/assignment.go new file mode 100644 index 00000000..9e7d1690 --- /dev/null +++ b/backend/pkg/privacy/assignment.go @@ -0,0 +1,18 @@ +package privacy + +import ( + pal "github.com/privacy-pal/privacy-pal/go/pkg" +) + +func accessAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { + data := map[string]interface{}{ + "name": dbObj["name"], + "optional": dbObj["optional"], + "maxScore": dbObj["maxScore"], + "releaseDate": dbObj["releaseDate"], + "dueDate": dbObj["dueDate"], + "grade": dbObj["grades"].(map[string]interface{})[dataSubjectId], + } + + return data +} diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go index ca8eb39f..ecdd3c17 100644 --- a/backend/pkg/privacy/course.go +++ b/backend/pkg/privacy/course.go @@ -1,13 +1,49 @@ package privacy import ( + "github.com/fullstackatbrown/here/pkg/models" pal "github.com/privacy-pal/privacy-pal/go/pkg" ) func accessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := make(map[string]interface{}) + data := map[string]interface{}{ + "title": dbObj["title"], + } - data["title"] = dbObj["title"] + data["assignments"] = pal.Locator{ + LocatorType: pal.Collection, + DataType: AssignmentDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreAssignmentsCollection}, + DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, + }, + } + + data["surveys"] = pal.Locator{ + LocatorType: pal.Collection, + DataType: SurveyDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSurveysCollection}, + DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, + }, + } + + data["swaps"] = pal.Locator{ + LocatorType: pal.Collection, + DataType: SwapDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSwapsCollection}, + DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, + // Query for swaps where studentID is the dataSubjectID + Queries: []pal.Query{ + { + Path: "studentID", + Op: "==", + Value: dataSubjectId, + }, + }, + }, + } return data } diff --git a/backend/pkg/privacy/privacy.go b/backend/pkg/privacy/privacy.go index ec321591..b268fd27 100644 --- a/backend/pkg/privacy/privacy.go +++ b/backend/pkg/privacy/privacy.go @@ -5,9 +5,12 @@ import ( ) const ( - UserDataType = "user" - CourseDataType = "course" - SectionDataType = "section" + UserDataType = "user" + CourseDataType = "course" + SectionDataType = "section" + AssignmentDataType = "assignment" + SurveyDataType = "survey" + SwapDataType = "swap" ) func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { @@ -18,6 +21,12 @@ func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p return accessCourse(dataSubjectId, currentDbObjLocator, dbObj) case SectionDataType: return accessSection(dataSubjectId, currentDbObjLocator, dbObj) + case AssignmentDataType: + return accessAssignment(dataSubjectId, currentDbObjLocator, dbObj) + case SurveyDataType: + return accessSurvey(dataSubjectId, currentDbObjLocator, dbObj) + case SwapDataType: + return accessSwap(dataSubjectId, currentDbObjLocator, dbObj) default: // TODO: should return error return nil diff --git a/backend/pkg/privacy/section.go b/backend/pkg/privacy/section.go index 438d58d7..6636fe10 100644 --- a/backend/pkg/privacy/section.go +++ b/backend/pkg/privacy/section.go @@ -5,11 +5,11 @@ import ( ) func accessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := make(map[string]interface{}) - - data["start time"] = dbObj["startTime"] - data["end time"] = dbObj["endTime"] - data["location"] = dbObj["location"] + data := map[string]interface{}{ + "startTime": dbObj["startTime"], + "endTime": dbObj["endTime"], + "location": dbObj["location"], + } return data } diff --git a/backend/pkg/privacy/survey.go b/backend/pkg/privacy/survey.go new file mode 100644 index 00000000..332501ce --- /dev/null +++ b/backend/pkg/privacy/survey.go @@ -0,0 +1,17 @@ +package privacy + +import ( + pal "github.com/privacy-pal/privacy-pal/go/pkg" +) + +func accessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { + data := map[string]interface{}{ + "name": dbObj["name"], + "description": dbObj["description"], + "endTime": dbObj["endTime"], + "options": dbObj["options"], + "responses": dbObj["responses"].(map[string]interface{})[dataSubjectId], + } + + return data +} diff --git a/backend/pkg/privacy/swap.go b/backend/pkg/privacy/swap.go new file mode 100644 index 00000000..214c19ba --- /dev/null +++ b/backend/pkg/privacy/swap.go @@ -0,0 +1,20 @@ +package privacy + +import ( + pal "github.com/privacy-pal/privacy-pal/go/pkg" +) + +func accessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { + data := map[string]interface{}{ + "oldSectionID": dbObj["oldSectionID"], + "newSectionID": dbObj["newSectionID"], + "assignmentID": dbObj["assignmentID"], + "requestTime": dbObj["requestTime"], + "handledTime": dbObj["handledTime"], + "reason": dbObj["reason"], + "status": dbObj["status"], + "handledBy": dbObj["handledBy"], + } + + return data +} diff --git a/backend/pkg/privacy/user.go b/backend/pkg/privacy/user.go index ae84b777..e327259e 100644 --- a/backend/pkg/privacy/user.go +++ b/backend/pkg/privacy/user.go @@ -6,11 +6,13 @@ import ( ) func accessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := make(map[string]interface{}) - - data["name"] = dbObj["displayName"] - data["email"] = dbObj["email"] - data["photoUrl"] = dbObj["photoUrl"] + data := map[string]interface{}{ + "name": dbObj["displayName"], + "email": dbObj["email"], + "photoUrl": dbObj["photoUrl"], + "isAdmin": dbObj["isAdmin"], + "notifications": dbObj["notifications"], + } slice, ok := dbObj["courses"].([]interface{}) if !ok { @@ -28,17 +30,18 @@ func accessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal courses[i] = course } - data["courses"] = []pal.Locator{} + courseMap := make(map[string]pal.Locator) for _, courseID := range courses { - data["courses"] = append(data["courses"].([]pal.Locator), pal.Locator{ + courseMap[courseID] = pal.Locator{ LocatorType: pal.Document, DataType: CourseDataType, FirestoreLocator: pal.FirestoreLocator{ CollectionPath: []string{models.FirestoreCoursesCollection}, DocIDs: []string{courseID}, }, - }) + } } + data["courses"] = courseMap sections, ok := dbObj["defaultSections"].(map[string]interface{}) if !ok { From b2120c0cbd309bdf20d1b220fce9d46ad5ad2e6f Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Fri, 24 Nov 2023 22:27:51 -0500 Subject: [PATCH 14/24] fix: make command for update privacy pal --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 698d755a..ca3305e6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: backend frontend +.PHONY: backend frontend update_privacy_pal backend: cd backend ; go run main.go @@ -7,4 +7,4 @@ frontend: cd frontend ; npm i && npm run dev update_privacy_pal: - cd backend ; go get github.com/privacy-pal/privacy-pal@$(version) \ No newline at end of file + cd backend ; go get github.com/privacy-pal/privacy-pal@latest \ No newline at end of file From 676beeb7fcfefcc281bdd0853d03a3252588237d Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Wed, 13 Dec 2023 02:47:31 -0500 Subject: [PATCH 15/24] use privacy-pal v1.0.0 --- backend/go.mod | 2 +- backend/go.sum | 2 ++ backend/pkg/privacy/course.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index b339b621..54e42edb 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-chi/render v1.0.2 github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/privacy-pal/privacy-pal/go v0.6.0 + github.com/privacy-pal/privacy-pal/go v1.0.0 github.com/rs/cors v1.8.3 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb google.golang.org/grpc v1.58.3 diff --git a/backend/go.sum b/backend/go.sum index 8ea2363e..f25422a5 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -88,6 +88,8 @@ github.com/privacy-pal/privacy-pal/go v0.5.0 h1:4HrViUNbI40RibPlF5hGT1+4RVOfIFdv github.com/privacy-pal/privacy-pal/go v0.5.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= github.com/privacy-pal/privacy-pal/go v0.6.0 h1:ShjRa0vO+CBPJgD/B1OjiIBfit8B8bu7CHJG3bxYiFo= github.com/privacy-pal/privacy-pal/go v0.6.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= +github.com/privacy-pal/privacy-pal/go v1.0.0 h1:Oti8tPCzAxKzqb9EPP6l1E4P5gJZbL10gHRkoEn7Kxo= +github.com/privacy-pal/privacy-pal/go v1.0.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go index ecdd3c17..7fd8a1e3 100644 --- a/backend/pkg/privacy/course.go +++ b/backend/pkg/privacy/course.go @@ -35,7 +35,7 @@ func accessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSwapsCollection}, DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, // Query for swaps where studentID is the dataSubjectID - Queries: []pal.Query{ + Filters: []pal.Filter{ { Path: "studentID", Op: "==", From 0273fdb1231498929a0a90b1ae095cf28be1deae Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 00:44:39 -0500 Subject: [PATCH 16/24] handle deletion request --- backend/go.mod | 2 +- backend/go.sum | 2 + backend/pkg/privacy/assignment.go | 17 +++++++ backend/pkg/privacy/course.go | 40 +++++++++++++++ backend/pkg/privacy/privacy.go | 19 +++++++ backend/pkg/privacy/section.go | 75 ++++++++++++++++++++++++++++ backend/pkg/privacy/survey.go | 48 ++++++++++++++++++ backend/pkg/privacy/swap.go | 5 ++ backend/pkg/privacy/user.go | 83 +++++++++++++++++++++++++++++-- backend/pkg/router/privacy.go | 27 ++++++++++ 10 files changed, 314 insertions(+), 4 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 54e42edb..9d20c855 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-chi/render v1.0.2 github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/privacy-pal/privacy-pal/go v1.0.0 + github.com/privacy-pal/privacy-pal/go v1.1.0 github.com/rs/cors v1.8.3 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb google.golang.org/grpc v1.58.3 diff --git a/backend/go.sum b/backend/go.sum index f25422a5..56237143 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -90,6 +90,8 @@ github.com/privacy-pal/privacy-pal/go v0.6.0 h1:ShjRa0vO+CBPJgD/B1OjiIBfit8B8bu7 github.com/privacy-pal/privacy-pal/go v0.6.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= github.com/privacy-pal/privacy-pal/go v1.0.0 h1:Oti8tPCzAxKzqb9EPP6l1E4P5gJZbL10gHRkoEn7Kxo= github.com/privacy-pal/privacy-pal/go v1.0.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= +github.com/privacy-pal/privacy-pal/go v1.1.0 h1:Fm03J8kbOuuQxV8ayvf+NJSCdToQt0FI2r1SLKfzthA= +github.com/privacy-pal/privacy-pal/go v1.1.0/go.mod h1:4mjmDe2nLDBPMuhiOx1GIy04AQaBWzRUL1YOUZTEi0o= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= diff --git a/backend/pkg/privacy/assignment.go b/backend/pkg/privacy/assignment.go index 9e7d1690..df3278e5 100644 --- a/backend/pkg/privacy/assignment.go +++ b/backend/pkg/privacy/assignment.go @@ -1,6 +1,7 @@ package privacy import ( + "cloud.google.com/go/firestore" pal "github.com/privacy-pal/privacy-pal/go/pkg" ) @@ -16,3 +17,19 @@ func accessAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbO return data } + +func deleteAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { + deleteNode = false + + // remove grades[dataSubjectId] if exists + fieldsToUpdate = pal.FieldUpdates{ + FirestoreUpdates: []firestore.Update{ + { + Path: "grades." + dataSubjectId, + Value: firestore.Delete, + }, + }, + } + + return +} diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go index 7fd8a1e3..f1c4c2a5 100644 --- a/backend/pkg/privacy/course.go +++ b/backend/pkg/privacy/course.go @@ -1,6 +1,7 @@ package privacy import ( + "cloud.google.com/go/firestore" "github.com/fullstackatbrown/here/pkg/models" pal "github.com/privacy-pal/privacy-pal/go/pkg" ) @@ -47,3 +48,42 @@ func accessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p return data } + +func deleteCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { + deleteNode = false + + updates := []firestore.Update{} + // remove student associated with dataSubjectId from the students field + updates = append(updates, firestore.Update{ + Path: "students." + dataSubjectId, + Value: firestore.Delete, + }) + // remove permission associated with dataSubjectId from the permissions field + updates = append(updates, firestore.Update{ + Path: "permissions." + dataSubjectId, + Value: firestore.Delete, + }) + + // add swaps and surveys to nodesToTraverse + nodesToTraverse = append(nodesToTraverse, pal.Locator{ + LocatorType: pal.Collection, + DataType: SwapDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSwapsCollection}, + DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, + }, + }) + nodesToTraverse = append(nodesToTraverse, pal.Locator{ + LocatorType: pal.Collection, + DataType: SurveyDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSurveysCollection}, + DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, + }, + }) + + fieldsToUpdate = pal.FieldUpdates{ + FirestoreUpdates: updates, + } + return +} diff --git a/backend/pkg/privacy/privacy.go b/backend/pkg/privacy/privacy.go index b268fd27..8d3f3032 100644 --- a/backend/pkg/privacy/privacy.go +++ b/backend/pkg/privacy/privacy.go @@ -32,3 +32,22 @@ func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p return nil } } + +func HandleDelete(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { + switch currentDbObjLocator.DataType { + case UserDataType: + return deleteUser(dataSubjectId, currentDbObjLocator, dbObj) + case CourseDataType: + return deleteCourse(dataSubjectId, currentDbObjLocator, dbObj) + case SectionDataType: + return deleteSection(dataSubjectId, currentDbObjLocator, dbObj) + case AssignmentDataType: + return deleteAssignment(dataSubjectId, currentDbObjLocator, dbObj) + case SurveyDataType: + return deleteSurvey(dataSubjectId, currentDbObjLocator, dbObj) + case SwapDataType: + return deleteSwap(dataSubjectId, currentDbObjLocator, dbObj) + default: + return + } +} diff --git a/backend/pkg/privacy/section.go b/backend/pkg/privacy/section.go index 6636fe10..7f2ad610 100644 --- a/backend/pkg/privacy/section.go +++ b/backend/pkg/privacy/section.go @@ -1,6 +1,9 @@ package privacy import ( + "fmt" + + "cloud.google.com/go/firestore" pal "github.com/privacy-pal/privacy-pal/go/pkg" ) @@ -13,3 +16,75 @@ func accessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj return data } + +func deleteSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { + deleteNode = false + + // decrement numEnrolled in course + updates := []firestore.Update{ + { + Path: "numEnrolled", + Value: firestore.Increment(-1), + }, + } + + // remove dataSubjectId from swappedInStudents if exists + swappedInStudents, ok := dbObj["swappedInStudents"].(map[string]interface{}) + if !ok { + err = fmt.Errorf("swappedInStudents is not a map[string]interface{}") + return + } + for _, studentIDs := range swappedInStudents { + studentIDsSlice, ok := studentIDs.([]interface{}) + if !ok { + err = fmt.Errorf("studentIDs is not a []interface{}") + return + } + for _, studentID := range studentIDsSlice { + id, ok := studentID.(string) + if !ok { + err = fmt.Errorf("studentID is not a string") + return + } + if id == dataSubjectId { + updates = append(updates, firestore.Update{ + Path: "swappedInStudents." + dataSubjectId, + Value: firestore.Delete, + }) + } + } + } + + // remove dataSubjectId from swappedOutStudents if exists + swappedOutStudents, ok := dbObj["swappedOutStudents"].(map[string]interface{}) + if !ok { + err = fmt.Errorf("swappedOutStudents is not a map[string]interface{}") + return + } + for _, studentIDs := range swappedOutStudents { + studentIDsSlice, ok := studentIDs.([]interface{}) + if !ok { + err = fmt.Errorf("studentIDs is not a []interface{}") + return + } + for _, studentID := range studentIDsSlice { + id, ok := studentID.(string) + if !ok { + err = fmt.Errorf("studentID is not a string") + return + } + if id == dataSubjectId { + updates = append(updates, firestore.Update{ + Path: "swappedOutStudents." + dataSubjectId, + Value: firestore.Delete, + }) + } + } + } + + fieldsToUpdate = pal.FieldUpdates{ + FirestoreUpdates: updates, + } + + return +} diff --git a/backend/pkg/privacy/survey.go b/backend/pkg/privacy/survey.go index 332501ce..69dad860 100644 --- a/backend/pkg/privacy/survey.go +++ b/backend/pkg/privacy/survey.go @@ -1,6 +1,9 @@ package privacy import ( + "fmt" + + "cloud.google.com/go/firestore" pal "github.com/privacy-pal/privacy-pal/go/pkg" ) @@ -15,3 +18,48 @@ func accessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p return data } + +func deleteSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { + deleteNode = false + + // remove responses[dataSubjectId] if exists + updates := []firestore.Update{ + { + Path: "responses." + dataSubjectId, + Value: firestore.Delete, + }, + } + + // remove the result of dataSubjectId from each element in result + results, ok := dbObj["results"].(map[string]interface{}) + if !ok { + err = fmt.Errorf("results is not a map[string]interface{}") + return + } + for option, data := range results { + courseUserData, ok := data.([]interface{}) + if !ok { + err = fmt.Errorf("courseUserData is not a []interface{}") + return + } + for _, data := range courseUserData { + cud, ok := data.(map[string]interface{}) + if !ok { + err = fmt.Errorf("cud is not a map[string]interface{}") + return + } + if cud["studentID"] == dataSubjectId { + updates = append(updates, firestore.Update{ + Path: "results." + option, + Value: firestore.ArrayRemove(data), + }) + } + } + } + + fieldsToUpdate = pal.FieldUpdates{ + FirestoreUpdates: updates, + } + + return +} diff --git a/backend/pkg/privacy/swap.go b/backend/pkg/privacy/swap.go index 214c19ba..ec3cab95 100644 --- a/backend/pkg/privacy/swap.go +++ b/backend/pkg/privacy/swap.go @@ -18,3 +18,8 @@ func accessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal return data } + +func deleteSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { + deleteNode = true + return +} diff --git a/backend/pkg/privacy/user.go b/backend/pkg/privacy/user.go index e327259e..6c6d4747 100644 --- a/backend/pkg/privacy/user.go +++ b/backend/pkg/privacy/user.go @@ -1,6 +1,8 @@ package privacy import ( + "fmt" + "github.com/fullstackatbrown/here/pkg/models" pal "github.com/privacy-pal/privacy-pal/go/pkg" ) @@ -19,9 +21,6 @@ func accessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal return data } courses := make([]string, len(slice)) - if !ok { - return data - } for i, v := range slice { course, ok := v.(string) if !ok { @@ -61,3 +60,81 @@ func accessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal return data } + +func deleteUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { + deleteNode = true + + // add courses to nodesToTraverse + slice, ok := dbObj["courses"].([]interface{}) + if !ok { + err = fmt.Errorf("courses field is not a slice") + return + } + courses := make([]string, len(slice)) + for i, v := range slice { + course, ok := v.(string) + if !ok { + err = fmt.Errorf("elements in course field is not a string") + return + } + courses[i] = course + } + for _, courseID := range courses { + nodesToTraverse = append(nodesToTraverse, pal.Locator{ + LocatorType: pal.Document, + DataType: CourseDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection}, + DocIDs: []string{courseID}, + }, + }) + } + + // add defaultSections to nodesToTraverse + sections, ok := dbObj["defaultSections"].(map[string]interface{}) + if !ok { + err = fmt.Errorf("defaultSections field is not a map") + return + } + for courseID, sectionID := range sections { + nodesToTraverse = append(nodesToTraverse, pal.Locator{ + LocatorType: pal.Document, + DataType: SectionDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSectionsCollection}, + DocIDs: []string{courseID, sectionID.(string)}, + }, + }) + } + + // add actualSections to nodesToTraverse + actualSections, ok := dbObj["actualSections"].(map[string]interface{}) + if !ok { + err = fmt.Errorf("actualSections field is not a map") + return + } + for courseID, sectionsMap := range actualSections { + sections, ok := sectionsMap.(map[string]interface{}) + if !ok { + err = fmt.Errorf("sectionsMap is not a map") + return + } + for _, sectionID := range sections { + id, ok := sectionID.(string) + if !ok { + err = fmt.Errorf("sectionID is not a string") + return + } + nodesToTraverse = append(nodesToTraverse, pal.Locator{ + LocatorType: pal.Document, + DataType: SectionDataType, + FirestoreLocator: pal.FirestoreLocator{ + CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSectionsCollection}, + DocIDs: []string{courseID, id}, + }, + }) + } + } + + return +} diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index 1540f70c..0bccc784 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -17,6 +17,7 @@ func PrivacyRoutes() *chi.Mux { router.Use(middleware.AuthCtx()) router.Get("/data", handleAccessRequest) + router.Delete("/data", handleDeleteRequest) return router } @@ -45,3 +46,29 @@ func handleAccessRequest(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") render.JSON(w, r, data) } + +func handleDeleteRequest(w http.ResponseWriter, r *http.Request) { + user, err := middleware.GetUserFromRequest(r) + if err != nil { + http.Error(w, err.Error(), http.StatusUnauthorized) + return + } + + locator := pal.Locator{ + LocatorType: pal.Document, + DataType: privacy.UserDataType, + FirestoreLocator: pal.FirestoreLocator{ + DocIDs: []string{user.ID}, + CollectionPath: []string{models.FirestoreProfilesCollection}, + }, + } + + res, err := repo.Repository.PrivacyPal.ProcessDeletionRequest(privacy.HandleDelete, locator, user.ID, false) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + w.Write([]byte(res)) + + // w.WriteHeader(http.StatusNoContent) +} From b4e73e69d44699b6e70620d2d9994a4ef4e3a566 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 00:48:56 -0500 Subject: [PATCH 17/24] rename helpers for privacy pal handlers --- backend/pkg/privacy/assignment.go | 4 ++-- backend/pkg/privacy/course.go | 4 ++-- backend/pkg/privacy/privacy.go | 24 ++++++++++++------------ backend/pkg/privacy/section.go | 4 ++-- backend/pkg/privacy/survey.go | 4 ++-- backend/pkg/privacy/swap.go | 4 ++-- backend/pkg/privacy/user.go | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/backend/pkg/privacy/assignment.go b/backend/pkg/privacy/assignment.go index df3278e5..adc1066a 100644 --- a/backend/pkg/privacy/assignment.go +++ b/backend/pkg/privacy/assignment.go @@ -5,7 +5,7 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func accessAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { +func handleAccessAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { data := map[string]interface{}{ "name": dbObj["name"], "optional": dbObj["optional"], @@ -18,7 +18,7 @@ func accessAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbO return data } -func deleteAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { +func handleDeleteAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { deleteNode = false // remove grades[dataSubjectId] if exists diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go index f1c4c2a5..a6dde968 100644 --- a/backend/pkg/privacy/course.go +++ b/backend/pkg/privacy/course.go @@ -6,7 +6,7 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func accessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { +func handleAccessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { data := map[string]interface{}{ "title": dbObj["title"], } @@ -49,7 +49,7 @@ func accessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p return data } -func deleteCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { +func handleDeleteCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { deleteNode = false updates := []firestore.Update{} diff --git a/backend/pkg/privacy/privacy.go b/backend/pkg/privacy/privacy.go index 8d3f3032..0f0cbb00 100644 --- a/backend/pkg/privacy/privacy.go +++ b/backend/pkg/privacy/privacy.go @@ -16,17 +16,17 @@ const ( func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { switch currentDbObjLocator.DataType { case UserDataType: - return accessUser(dataSubjectId, currentDbObjLocator, dbObj) + return handleAccessUser(dataSubjectId, currentDbObjLocator, dbObj) case CourseDataType: - return accessCourse(dataSubjectId, currentDbObjLocator, dbObj) + return handleAccessCourse(dataSubjectId, currentDbObjLocator, dbObj) case SectionDataType: - return accessSection(dataSubjectId, currentDbObjLocator, dbObj) + return handleAccessSection(dataSubjectId, currentDbObjLocator, dbObj) case AssignmentDataType: - return accessAssignment(dataSubjectId, currentDbObjLocator, dbObj) + return handleAccessAssignment(dataSubjectId, currentDbObjLocator, dbObj) case SurveyDataType: - return accessSurvey(dataSubjectId, currentDbObjLocator, dbObj) + return handleAccessSurvey(dataSubjectId, currentDbObjLocator, dbObj) case SwapDataType: - return accessSwap(dataSubjectId, currentDbObjLocator, dbObj) + return handleAccessSwap(dataSubjectId, currentDbObjLocator, dbObj) default: // TODO: should return error return nil @@ -36,17 +36,17 @@ func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p func HandleDelete(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { switch currentDbObjLocator.DataType { case UserDataType: - return deleteUser(dataSubjectId, currentDbObjLocator, dbObj) + return handleDeleteUser(dataSubjectId, currentDbObjLocator, dbObj) case CourseDataType: - return deleteCourse(dataSubjectId, currentDbObjLocator, dbObj) + return handleDeleteCourse(dataSubjectId, currentDbObjLocator, dbObj) case SectionDataType: - return deleteSection(dataSubjectId, currentDbObjLocator, dbObj) + return handleDeleteSection(dataSubjectId, currentDbObjLocator, dbObj) case AssignmentDataType: - return deleteAssignment(dataSubjectId, currentDbObjLocator, dbObj) + return handleDeleteAssignment(dataSubjectId, currentDbObjLocator, dbObj) case SurveyDataType: - return deleteSurvey(dataSubjectId, currentDbObjLocator, dbObj) + return handleDeleteSurvey(dataSubjectId, currentDbObjLocator, dbObj) case SwapDataType: - return deleteSwap(dataSubjectId, currentDbObjLocator, dbObj) + return handleDeleteSwap(dataSubjectId, currentDbObjLocator, dbObj) default: return } diff --git a/backend/pkg/privacy/section.go b/backend/pkg/privacy/section.go index 7f2ad610..0ca81559 100644 --- a/backend/pkg/privacy/section.go +++ b/backend/pkg/privacy/section.go @@ -7,7 +7,7 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func accessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { +func handleAccessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { data := map[string]interface{}{ "startTime": dbObj["startTime"], "endTime": dbObj["endTime"], @@ -17,7 +17,7 @@ func accessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj return data } -func deleteSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { +func handleDeleteSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { deleteNode = false // decrement numEnrolled in course diff --git a/backend/pkg/privacy/survey.go b/backend/pkg/privacy/survey.go index 69dad860..59b29670 100644 --- a/backend/pkg/privacy/survey.go +++ b/backend/pkg/privacy/survey.go @@ -7,7 +7,7 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func accessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { +func handleAccessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { data := map[string]interface{}{ "name": dbObj["name"], "description": dbObj["description"], @@ -19,7 +19,7 @@ func accessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p return data } -func deleteSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { +func handleDeleteSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { deleteNode = false // remove responses[dataSubjectId] if exists diff --git a/backend/pkg/privacy/swap.go b/backend/pkg/privacy/swap.go index ec3cab95..93cacbd4 100644 --- a/backend/pkg/privacy/swap.go +++ b/backend/pkg/privacy/swap.go @@ -4,7 +4,7 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func accessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { +func handleAccessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { data := map[string]interface{}{ "oldSectionID": dbObj["oldSectionID"], "newSectionID": dbObj["newSectionID"], @@ -19,7 +19,7 @@ func accessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal return data } -func deleteSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { +func handleDeleteSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { deleteNode = true return } diff --git a/backend/pkg/privacy/user.go b/backend/pkg/privacy/user.go index 6c6d4747..3fef9db6 100644 --- a/backend/pkg/privacy/user.go +++ b/backend/pkg/privacy/user.go @@ -7,7 +7,7 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func accessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { +func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { data := map[string]interface{}{ "name": dbObj["displayName"], "email": dbObj["email"], @@ -61,7 +61,7 @@ func accessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal return data } -func deleteUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { +func handleDeleteUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { deleteNode = true // add courses to nodesToTraverse From 39a26cc41ca187ce047cc9e88face7476a350b67 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 01:40:44 -0500 Subject: [PATCH 18/24] use privacy-pal v1.2.0 and update handleAccess --- backend/go.mod | 2 +- backend/go.sum | 2 ++ backend/pkg/privacy/assignment.go | 6 +++--- backend/pkg/privacy/course.go | 6 +++--- backend/pkg/privacy/privacy.go | 8 +++++--- backend/pkg/privacy/section.go | 6 +++--- backend/pkg/privacy/survey.go | 6 +++--- backend/pkg/privacy/swap.go | 6 +++--- backend/pkg/privacy/user.go | 12 ++++++------ 9 files changed, 29 insertions(+), 25 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 9d20c855..96906c23 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-chi/render v1.0.2 github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/privacy-pal/privacy-pal/go v1.1.0 + github.com/privacy-pal/privacy-pal/go v1.2.0 github.com/rs/cors v1.8.3 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb google.golang.org/grpc v1.58.3 diff --git a/backend/go.sum b/backend/go.sum index 56237143..9387eed2 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -92,6 +92,8 @@ github.com/privacy-pal/privacy-pal/go v1.0.0 h1:Oti8tPCzAxKzqb9EPP6l1E4P5gJZbL10 github.com/privacy-pal/privacy-pal/go v1.0.0/go.mod h1:iVFaK4o+EYLTOyetSv6pjtWGcmPcTMXL6oUNHVyhoX0= github.com/privacy-pal/privacy-pal/go v1.1.0 h1:Fm03J8kbOuuQxV8ayvf+NJSCdToQt0FI2r1SLKfzthA= github.com/privacy-pal/privacy-pal/go v1.1.0/go.mod h1:4mjmDe2nLDBPMuhiOx1GIy04AQaBWzRUL1YOUZTEi0o= +github.com/privacy-pal/privacy-pal/go v1.2.0 h1:hGRYynIM7NScP/CJ8b2TY8SxndK+kc0kCvnyc3IcOGM= +github.com/privacy-pal/privacy-pal/go v1.2.0/go.mod h1:6wbYoDZiD/AxJI0K2/futdQKCrAR4BHxb7TDgdnOGBU= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= diff --git a/backend/pkg/privacy/assignment.go b/backend/pkg/privacy/assignment.go index adc1066a..7f2f5b16 100644 --- a/backend/pkg/privacy/assignment.go +++ b/backend/pkg/privacy/assignment.go @@ -5,8 +5,8 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func handleAccessAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := map[string]interface{}{ +func handleAccessAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (data map[string]interface{}, err error) { + data = map[string]interface{}{ "name": dbObj["name"], "optional": dbObj["optional"], "maxScore": dbObj["maxScore"], @@ -15,7 +15,7 @@ func handleAccessAssignment(dataSubjectId string, currentDbObjLocator pal.Locato "grade": dbObj["grades"].(map[string]interface{})[dataSubjectId], } - return data + return } func handleDeleteAssignment(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go index a6dde968..c034c7cf 100644 --- a/backend/pkg/privacy/course.go +++ b/backend/pkg/privacy/course.go @@ -6,8 +6,8 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func handleAccessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := map[string]interface{}{ +func handleAccessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (data map[string]interface{}, err error) { + data = map[string]interface{}{ "title": dbObj["title"], } @@ -46,7 +46,7 @@ func handleAccessCourse(dataSubjectId string, currentDbObjLocator pal.Locator, d }, } - return data + return } func handleDeleteCourse(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { diff --git a/backend/pkg/privacy/privacy.go b/backend/pkg/privacy/privacy.go index 0f0cbb00..d8a7d7c9 100644 --- a/backend/pkg/privacy/privacy.go +++ b/backend/pkg/privacy/privacy.go @@ -1,6 +1,8 @@ package privacy import ( + "fmt" + pal "github.com/privacy-pal/privacy-pal/go/pkg" ) @@ -13,7 +15,7 @@ const ( SwapDataType = "swap" ) -func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { +func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (data map[string]interface{}, err error) { switch currentDbObjLocator.DataType { case UserDataType: return handleAccessUser(dataSubjectId, currentDbObjLocator, dbObj) @@ -28,8 +30,8 @@ func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p case SwapDataType: return handleAccessSwap(dataSubjectId, currentDbObjLocator, dbObj) default: - // TODO: should return error - return nil + err = fmt.Errorf("invalid data type") + return } } diff --git a/backend/pkg/privacy/section.go b/backend/pkg/privacy/section.go index 0ca81559..9d17a74d 100644 --- a/backend/pkg/privacy/section.go +++ b/backend/pkg/privacy/section.go @@ -7,14 +7,14 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func handleAccessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := map[string]interface{}{ +func handleAccessSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (data map[string]interface{}, err error) { + data = map[string]interface{}{ "startTime": dbObj["startTime"], "endTime": dbObj["endTime"], "location": dbObj["location"], } - return data + return } func handleDeleteSection(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { diff --git a/backend/pkg/privacy/survey.go b/backend/pkg/privacy/survey.go index 59b29670..28e56c81 100644 --- a/backend/pkg/privacy/survey.go +++ b/backend/pkg/privacy/survey.go @@ -7,8 +7,8 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func handleAccessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := map[string]interface{}{ +func handleAccessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (data map[string]interface{}, err error) { + data = map[string]interface{}{ "name": dbObj["name"], "description": dbObj["description"], "endTime": dbObj["endTime"], @@ -16,7 +16,7 @@ func handleAccessSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, d "responses": dbObj["responses"].(map[string]interface{})[dataSubjectId], } - return data + return } func handleDeleteSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { diff --git a/backend/pkg/privacy/swap.go b/backend/pkg/privacy/swap.go index 93cacbd4..bb386762 100644 --- a/backend/pkg/privacy/swap.go +++ b/backend/pkg/privacy/swap.go @@ -4,8 +4,8 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func handleAccessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := map[string]interface{}{ +func handleAccessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (data map[string]interface{}, err error) { + data = map[string]interface{}{ "oldSectionID": dbObj["oldSectionID"], "newSectionID": dbObj["newSectionID"], "assignmentID": dbObj["assignmentID"], @@ -16,7 +16,7 @@ func handleAccessSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbO "handledBy": dbObj["handledBy"], } - return data + return } func handleDeleteSwap(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { diff --git a/backend/pkg/privacy/user.go b/backend/pkg/privacy/user.go index 3fef9db6..d4ba4bdf 100644 --- a/backend/pkg/privacy/user.go +++ b/backend/pkg/privacy/user.go @@ -7,8 +7,8 @@ import ( pal "github.com/privacy-pal/privacy-pal/go/pkg" ) -func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) map[string]interface{} { - data := map[string]interface{}{ +func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (data map[string]interface{}, err error) { + data = map[string]interface{}{ "name": dbObj["displayName"], "email": dbObj["email"], "photoUrl": dbObj["photoUrl"], @@ -18,13 +18,13 @@ func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO slice, ok := dbObj["courses"].([]interface{}) if !ok { - return data + return } courses := make([]string, len(slice)) for i, v := range slice { course, ok := v.(string) if !ok { - return data + return } courses[i] = course } @@ -44,7 +44,7 @@ func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO sections, ok := dbObj["defaultSections"].(map[string]interface{}) if !ok { - return data + return } data["defaultSections"] = []pal.Locator{} for courseID, sectionID := range sections { @@ -58,7 +58,7 @@ func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO }) } - return data + return } func handleDeleteUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj pal.DatabaseObject) (nodesToTraverse []pal.Locator, deleteNode bool, fieldsToUpdate pal.FieldUpdates, err error) { From efe11c181ce09c6f44bcbc1436f90d3dd5537556 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 16:31:25 -0500 Subject: [PATCH 19/24] fix handleDeleteSurvey results nil --- backend/pkg/privacy/survey.go | 36 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/backend/pkg/privacy/survey.go b/backend/pkg/privacy/survey.go index 28e56c81..ce8f0737 100644 --- a/backend/pkg/privacy/survey.go +++ b/backend/pkg/privacy/survey.go @@ -30,29 +30,27 @@ func handleDeleteSurvey(dataSubjectId string, currentDbObjLocator pal.Locator, d }, } - // remove the result of dataSubjectId from each element in result + // remove the result of dataSubjectId from each entry in results results, ok := dbObj["results"].(map[string]interface{}) - if !ok { - err = fmt.Errorf("results is not a map[string]interface{}") - return - } - for option, data := range results { - courseUserData, ok := data.([]interface{}) - if !ok { - err = fmt.Errorf("courseUserData is not a []interface{}") - return - } - for _, data := range courseUserData { - cud, ok := data.(map[string]interface{}) + if ok { // result could be nil if no results + for option, data := range results { + courseUserData, ok := data.([]interface{}) if !ok { - err = fmt.Errorf("cud is not a map[string]interface{}") + err = fmt.Errorf("courseUserData is not a []interface{}") return } - if cud["studentID"] == dataSubjectId { - updates = append(updates, firestore.Update{ - Path: "results." + option, - Value: firestore.ArrayRemove(data), - }) + for _, data := range courseUserData { + cud, ok := data.(map[string]interface{}) + if !ok { + err = fmt.Errorf("cud is not a map[string]interface{}") + return + } + if cud["studentID"] == dataSubjectId { + updates = append(updates, firestore.Update{ + Path: "results." + option, + Value: firestore.ArrayRemove(data), + }) + } } } } From 668ddb3d4deef95a34f5f5ec6a9a9fd1ff45372f Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 16:59:06 -0500 Subject: [PATCH 20/24] handle course deletion filter swap subcollection by studentID --- backend/pkg/privacy/course.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go index c034c7cf..a652ef60 100644 --- a/backend/pkg/privacy/course.go +++ b/backend/pkg/privacy/course.go @@ -79,6 +79,13 @@ func handleDeleteCourse(dataSubjectId string, currentDbObjLocator pal.Locator, d FirestoreLocator: pal.FirestoreLocator{ CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSurveysCollection}, DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, + Filters: []pal.Filter{ + { + Path: "studentID", + Op: "==", + Value: dataSubjectId, + }, + }, }, }) From 3e33e1ffce4dcd42d44e518464b60ec529f2fd56 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 21:11:16 -0500 Subject: [PATCH 21/24] use privacy pal 1.3.0 --- backend/go.mod | 2 +- backend/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/go.mod b/backend/go.mod index 96906c23..0542d5c2 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-chi/render v1.0.2 github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/privacy-pal/privacy-pal/go v1.2.0 + github.com/privacy-pal/privacy-pal/go v1.3.0 github.com/rs/cors v1.8.3 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb google.golang.org/grpc v1.58.3 diff --git a/backend/go.sum b/backend/go.sum index 9387eed2..5f08b9bd 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -94,6 +94,8 @@ github.com/privacy-pal/privacy-pal/go v1.1.0 h1:Fm03J8kbOuuQxV8ayvf+NJSCdToQt0FI github.com/privacy-pal/privacy-pal/go v1.1.0/go.mod h1:4mjmDe2nLDBPMuhiOx1GIy04AQaBWzRUL1YOUZTEi0o= github.com/privacy-pal/privacy-pal/go v1.2.0 h1:hGRYynIM7NScP/CJ8b2TY8SxndK+kc0kCvnyc3IcOGM= github.com/privacy-pal/privacy-pal/go v1.2.0/go.mod h1:6wbYoDZiD/AxJI0K2/futdQKCrAR4BHxb7TDgdnOGBU= +github.com/privacy-pal/privacy-pal/go v1.3.0 h1:7Pn2IE62KVIcdhab5xIL+IdF0Tv7jmgoCMsh7iCMO5A= +github.com/privacy-pal/privacy-pal/go v1.3.0/go.mod h1:6wbYoDZiD/AxJI0K2/futdQKCrAR4BHxb7TDgdnOGBU= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= From ccabe234d8c845e668fdc9f27930cf37b54e7f90 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 21:11:35 -0500 Subject: [PATCH 22/24] fix filter on swap instead of survey for deletion --- backend/pkg/privacy/course.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/pkg/privacy/course.go b/backend/pkg/privacy/course.go index a652ef60..5058d8da 100644 --- a/backend/pkg/privacy/course.go +++ b/backend/pkg/privacy/course.go @@ -71,6 +71,13 @@ func handleDeleteCourse(dataSubjectId string, currentDbObjLocator pal.Locator, d FirestoreLocator: pal.FirestoreLocator{ CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSwapsCollection}, DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, + Filters: []pal.Filter{ + { + Path: "studentID", + Op: "==", + Value: dataSubjectId, + }, + }, }, }) nodesToTraverse = append(nodesToTraverse, pal.Locator{ @@ -79,13 +86,6 @@ func handleDeleteCourse(dataSubjectId string, currentDbObjLocator pal.Locator, d FirestoreLocator: pal.FirestoreLocator{ CollectionPath: []string{models.FirestoreCoursesCollection, models.FirestoreSurveysCollection}, DocIDs: []string{currentDbObjLocator.FirestoreLocator.DocIDs[0]}, - Filters: []pal.Filter{ - { - Path: "studentID", - Op: "==", - Value: dataSubjectId, - }, - }, }, }) From 17d37b193fcd0ba81d45234bcf78500c7efa9601 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 22:40:10 -0500 Subject: [PATCH 23/24] errors.go to standardize privacy errors --- backend/pkg/privacy/errors.go | 11 +++++++++++ backend/pkg/privacy/privacy.go | 5 ++--- backend/pkg/privacy/section.go | 12 ++++++------ backend/pkg/privacy/user.go | 15 +++++++++------ 4 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 backend/pkg/privacy/errors.go diff --git a/backend/pkg/privacy/errors.go b/backend/pkg/privacy/errors.go new file mode 100644 index 00000000..4c4854c4 --- /dev/null +++ b/backend/pkg/privacy/errors.go @@ -0,0 +1,11 @@ +package privacy + +import "fmt" + +var ( + invalidLocatorDataType = fmt.Errorf("invalid locator data type") +) + +func cannotCastFieldToType(field string, castType string) error { + return fmt.Errorf("cannot cast %s to %s", field, castType) +} diff --git a/backend/pkg/privacy/privacy.go b/backend/pkg/privacy/privacy.go index d8a7d7c9..1fd65cc3 100644 --- a/backend/pkg/privacy/privacy.go +++ b/backend/pkg/privacy/privacy.go @@ -1,8 +1,6 @@ package privacy import ( - "fmt" - pal "github.com/privacy-pal/privacy-pal/go/pkg" ) @@ -30,7 +28,7 @@ func HandleAccess(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p case SwapDataType: return handleAccessSwap(dataSubjectId, currentDbObjLocator, dbObj) default: - err = fmt.Errorf("invalid data type") + err = invalidLocatorDataType return } } @@ -50,6 +48,7 @@ func HandleDelete(dataSubjectId string, currentDbObjLocator pal.Locator, dbObj p case SwapDataType: return handleDeleteSwap(dataSubjectId, currentDbObjLocator, dbObj) default: + err = invalidLocatorDataType return } } diff --git a/backend/pkg/privacy/section.go b/backend/pkg/privacy/section.go index 9d17a74d..ca66032d 100644 --- a/backend/pkg/privacy/section.go +++ b/backend/pkg/privacy/section.go @@ -31,19 +31,19 @@ func handleDeleteSection(dataSubjectId string, currentDbObjLocator pal.Locator, // remove dataSubjectId from swappedInStudents if exists swappedInStudents, ok := dbObj["swappedInStudents"].(map[string]interface{}) if !ok { - err = fmt.Errorf("swappedInStudents is not a map[string]interface{}") + err = cannotCastFieldToType("swappedInStudents", "map[string]interface{}") return } for _, studentIDs := range swappedInStudents { studentIDsSlice, ok := studentIDs.([]interface{}) if !ok { - err = fmt.Errorf("studentIDs is not a []interface{}") + err = cannotCastFieldToType(fmt.Sprintf("swappedInStudents entry %v", studentIDs), "[]interface{}") return } for _, studentID := range studentIDsSlice { id, ok := studentID.(string) if !ok { - err = fmt.Errorf("studentID is not a string") + err = cannotCastFieldToType(fmt.Sprintf("swappedInStudents nested entry %v", studentID), "string") return } if id == dataSubjectId { @@ -58,19 +58,19 @@ func handleDeleteSection(dataSubjectId string, currentDbObjLocator pal.Locator, // remove dataSubjectId from swappedOutStudents if exists swappedOutStudents, ok := dbObj["swappedOutStudents"].(map[string]interface{}) if !ok { - err = fmt.Errorf("swappedOutStudents is not a map[string]interface{}") + err = cannotCastFieldToType("swappedOutStudents", "map[string]interface{}") return } for _, studentIDs := range swappedOutStudents { studentIDsSlice, ok := studentIDs.([]interface{}) if !ok { - err = fmt.Errorf("studentIDs is not a []interface{}") + err = cannotCastFieldToType(fmt.Sprintf("swappedOutStudents entry %v", studentIDs), "[]interface{}") return } for _, studentID := range studentIDsSlice { id, ok := studentID.(string) if !ok { - err = fmt.Errorf("studentID is not a string") + err = cannotCastFieldToType(fmt.Sprintf("swappedOutStudents nested entry %v", studentID), "string") return } if id == dataSubjectId { diff --git a/backend/pkg/privacy/user.go b/backend/pkg/privacy/user.go index d4ba4bdf..f0206098 100644 --- a/backend/pkg/privacy/user.go +++ b/backend/pkg/privacy/user.go @@ -18,12 +18,14 @@ func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO slice, ok := dbObj["courses"].([]interface{}) if !ok { + err = cannotCastFieldToType("courses", "[]interface{}") return } courses := make([]string, len(slice)) for i, v := range slice { course, ok := v.(string) if !ok { + err = cannotCastFieldToType(fmt.Sprintf("courses element %v", v), "string") return } courses[i] = course @@ -44,6 +46,7 @@ func handleAccessUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO sections, ok := dbObj["defaultSections"].(map[string]interface{}) if !ok { + err = cannotCastFieldToType("defaultSections", "map[string]interface{}") return } data["defaultSections"] = []pal.Locator{} @@ -67,14 +70,14 @@ func handleDeleteUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO // add courses to nodesToTraverse slice, ok := dbObj["courses"].([]interface{}) if !ok { - err = fmt.Errorf("courses field is not a slice") + err = cannotCastFieldToType("courses", "[]interface{}") return } courses := make([]string, len(slice)) for i, v := range slice { course, ok := v.(string) if !ok { - err = fmt.Errorf("elements in course field is not a string") + err = cannotCastFieldToType(fmt.Sprintf("courses element %v", v), "string") return } courses[i] = course @@ -93,7 +96,7 @@ func handleDeleteUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO // add defaultSections to nodesToTraverse sections, ok := dbObj["defaultSections"].(map[string]interface{}) if !ok { - err = fmt.Errorf("defaultSections field is not a map") + err = cannotCastFieldToType("defaultSections", "map[string]interface{}") return } for courseID, sectionID := range sections { @@ -110,19 +113,19 @@ func handleDeleteUser(dataSubjectId string, currentDbObjLocator pal.Locator, dbO // add actualSections to nodesToTraverse actualSections, ok := dbObj["actualSections"].(map[string]interface{}) if !ok { - err = fmt.Errorf("actualSections field is not a map") + err = cannotCastFieldToType("actualSections", "map[string]interface{}") return } for courseID, sectionsMap := range actualSections { sections, ok := sectionsMap.(map[string]interface{}) if !ok { - err = fmt.Errorf("sectionsMap is not a map") + err = cannotCastFieldToType(fmt.Sprintf("actualSections entry %v", sectionsMap), "map[string]interface{}") return } for _, sectionID := range sections { id, ok := sectionID.(string) if !ok { - err = fmt.Errorf("sectionID is not a string") + err = cannotCastFieldToType(fmt.Sprintf("actualSections nested entry %v", sectionID), "string") return } nodesToTraverse = append(nodesToTraverse, pal.Locator{ From 09b6be4e00ffeabdc5852d818931ab4cdc141291 Mon Sep 17 00:00:00 2001 From: Tianren Dong Date: Thu, 14 Dec 2023 23:17:13 -0500 Subject: [PATCH 24/24] enable writeToDatabase and temp get for deletion --- backend/pkg/router/privacy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/pkg/router/privacy.go b/backend/pkg/router/privacy.go index 0bccc784..9c72eab0 100644 --- a/backend/pkg/router/privacy.go +++ b/backend/pkg/router/privacy.go @@ -17,7 +17,7 @@ func PrivacyRoutes() *chi.Mux { router.Use(middleware.AuthCtx()) router.Get("/data", handleAccessRequest) - router.Delete("/data", handleDeleteRequest) + router.Get("/data/delete", handleDeleteRequest) return router } @@ -63,7 +63,7 @@ func handleDeleteRequest(w http.ResponseWriter, r *http.Request) { }, } - res, err := repo.Repository.PrivacyPal.ProcessDeletionRequest(privacy.HandleDelete, locator, user.ID, false) + res, err := repo.Repository.PrivacyPal.ProcessDeletionRequest(privacy.HandleDelete, locator, user.ID, true) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return