From 0f5da4b5d94b80ccbdf08e02a8be2c467d2b4665 Mon Sep 17 00:00:00 2001 From: Maxime Date: Thu, 31 Oct 2024 16:01:16 +0100 Subject: [PATCH] fix commit --- go.mod | 43 ++++-- go.sum | 101 ++++++++++--- handler/account.go | 16 +++ handler/authentication.go | 51 +++++++ handler/forget_password.go | 46 ++++++ handler/geo.go | 57 ++++++++ handler/handler.go | 4 + handler/notifications.go | 64 +++++++++ handler/onboarding_validation.go | 152 ++++++++++++++++++++ handler/update_password.go | 16 +++ models/accounts.go | 49 +++++++ services/mobility-accounts.go | 234 +++++++++++++++++++++++++++++++ services/push.go | 79 +++++++++++ services/services.go | 54 +++++++ storage/postgresql.go | 40 ++++++ storage/storage.go | 3 + 16 files changed, 981 insertions(+), 28 deletions(-) create mode 100644 handler/account.go create mode 100644 handler/authentication.go create mode 100644 handler/forget_password.go create mode 100644 handler/geo.go create mode 100644 handler/notifications.go create mode 100644 handler/onboarding_validation.go create mode 100644 handler/update_password.go create mode 100644 models/accounts.go create mode 100644 services/mobility-accounts.go create mode 100644 services/push.go create mode 100644 services/services.go diff --git a/go.mod b/go.mod index 614baeb..94f0d11 100644 --- a/go.mod +++ b/go.mod @@ -1,34 +1,49 @@ module solidarity-service -go 1.19 +go 1.21 + +toolchain go1.23.2 require ( + git.coopgo.io/coopgo-platform/geocode v0.0.0-20240919052438-16ad0c51895a + git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26 git.coopgo.io/coopgo-platform/routing-service v0.0.0-20230403183358-4d30329f06be + github.com/appleboy/gorush v1.18.8 + github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/lib/pq v1.10.9 github.com/paulmach/orb v0.11.1 + github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.32.0 github.com/spf13/viper v1.18.2 go.mongodb.org/mongo-driver v1.15.0 - google.golang.org/grpc v1.65.0 + google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 + google.golang.org/grpc v1.66.2 google.golang.org/protobuf v1.34.2 + gopkg.in/mail.v2 v2.3.1 ) require ( + cloud.google.com/go/maps v1.11.0 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/golang/snappy v0.0.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/klauspost/compress v1.17.0 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect - github.com/pelletier/go-toml/v2 v2.2.1 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect @@ -39,14 +54,22 @@ require ( 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.etcd.io/etcd/api/v3 v3.5.10 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect + go.etcd.io/etcd/client/v3 v3.5.10 // indirect + go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.23.0 // indirect + go.uber.org/zap v1.21.0 // indirect + golang.org/x/crypto v0.24.0 // indirect golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 091e5be..d666099 100644 --- a/go.sum +++ b/go.sum @@ -1,23 +1,43 @@ +cloud.google.com/go/maps v1.11.0 h1:+//LeUr5ARVau1wVsxLkLnFtYviq9YFS+fB/mhfAOGQ= +cloud.google.com/go/maps v1.11.0/go.mod h1:XcSsd8lg4ZhLPCtJ2YHcu/xLVePBzZOlI7GmR2cRCws= +git.coopgo.io/coopgo-platform/geocode v0.0.0-20240919052438-16ad0c51895a h1:fdh8EewE46YyU+/BophnWgP33GYfSg2cBt3kYrumFV4= +git.coopgo.io/coopgo-platform/geocode v0.0.0-20240919052438-16ad0c51895a/go.mod h1:v1ZKauCJ989bUkLHmsGdaxEa0S/L2OajERePcRqwMM8= +git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26 h1:qiYVLLNU29xgT0RRj0Jz0WrjEJnz1Eng1X7l1UW9jGU= +git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26/go.mod h1:1typNYtO+PQT6KG77vs/PUv0fO60/nbeSGZL2tt1LLg= git.coopgo.io/coopgo-platform/routing-service v0.0.0-20230403183358-4d30329f06be h1:VIzWX8NftKzQX1clunLaMf79Ut1dygcCc/ZLV/iWOaY= git.coopgo.io/coopgo-platform/routing-service v0.0.0-20230403183358-4d30329f06be/go.mod h1:Nh7o15LlV0OuO9zxvJIs9FlelpeAaLYkXtFdgIkFrgg= +github.com/appleboy/gorush v1.18.8 h1:pwPjLPEeSc6OrlYrqFOAr6ombH7tKKhJdaaQa2Ul4sA= +github.com/appleboy/gorush v1.18.8/go.mod h1:qoLmAkmDIuMd2c1qPYMo1/eEqQ5CfVaCscRYd0Y+flU= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= 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.5.2/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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= @@ -27,13 +47,15 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= -github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -48,15 +70,21 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua 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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= -github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= -github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= @@ -64,6 +92,8 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= +github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= @@ -104,33 +134,52 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k= +go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI= +go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0= +go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U= +go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao= +go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc= go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 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.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/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-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= 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.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -142,15 +191,17 @@ 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-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= @@ -158,30 +209,44 @@ 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.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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-20191011141410-1b5146add898/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= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 h1:HCZ6DlkKtCDAtD8ForECsY3tKuaR+p4R3grlK80uCCc= +google.golang.org/genproto v0.0.0-20240604185151-ef581f913117/go.mod h1:lesfX/+9iA+3OdqeCpoDddJaNxVB1AB6tD7EfqMmprc= +google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU= +google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk= +gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/handler/account.go b/handler/account.go new file mode 100644 index 0000000..1f7d7cd --- /dev/null +++ b/handler/account.go @@ -0,0 +1,16 @@ +package handler + +import ( + "context" + "solidarity-service/models" + "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" +) + +func (h *SolidarityServiceHandler) GetAccountInfos(ctx context.Context, id string) (account *models.Account, err error) { + resp, err := h.Services.MobilityAccounts.Client.GetAccount(ctx, &grpcapi.GetAccountRequest{Id: id}) + if err != nil { + return nil, err + } + account = h.Services.MobilityAccounts.ToAccountModel(resp.Account.ToStorageType()) + return account, nil +} diff --git a/handler/authentication.go b/handler/authentication.go new file mode 100644 index 0000000..950bbfb --- /dev/null +++ b/handler/authentication.go @@ -0,0 +1,51 @@ +package handler + +import ( + "context" + "time" +) + +func (h *SolidarityServiceHandler) Login(ctx context.Context, username string, password string) (jwt string, err error) { + account, err := h.Services.MobilityAccounts.Login(ctx, username, password, "silvermobi") + if err != nil { + return + } + key := h.Config.GetString("identification.local.jwt_secret") + ttl := h.Config.GetString("identification.local.ttl") + parsedttl, err := time.ParseDuration(ttl) + if err != nil { + return "", err + } + return account.CreateToken(parsedttl, key) +} + +func (h *SolidarityServiceHandler) Register(ctx context.Context, username string, password string, email string, phone_number string, first_name string, last_name string) (jwt string, err error) { + account, err := h.Services.MobilityAccounts.Register( + ctx, + username, + password, + email, + phone_number, + map[string]any{ + "first_name": first_name, + "last_name": last_name, + "email": email, + "phone_number": phone_number, + }, + "silvermobi", + ) + + if err != nil { + return "", err + } + + key := h.Config.GetString("identification.local.jwt_secret") + ttl := h.Config.GetString("identification.local.ttl") + + parsedttl, err := time.ParseDuration(ttl) + if err != nil { + return "", err + } + + return account.CreateToken(parsedttl, key) +} diff --git a/handler/forget_password.go b/handler/forget_password.go new file mode 100644 index 0000000..0d35166 --- /dev/null +++ b/handler/forget_password.go @@ -0,0 +1,46 @@ +package handler + +import ( + "context" + "crypto/rand" + "crypto/tls" + "encoding/base64" + gomail "gopkg.in/mail.v2" +) + +func generateRandomPassword(length int) (string, error) { + buffer := make([]byte, length) + _, err := rand.Read(buffer) + if err != nil { + return "", err + } + password := base64.StdEncoding.EncodeToString(buffer)[:length] + return password, nil +} + +func (h *SolidarityServiceHandler) ForgetAccount(ctx context.Context, username string, namespace string) (response bool, access_Code string) { + account, err := h.Services.MobilityAccounts.GetAccountUsername(ctx, username, namespace) + if err == nil { + message := []byte("Hello dear,\nYour new Silvermobi password is: ") + password, _ := generateRandomPassword(10) + update := h.Services.MobilityAccounts.UpdatePassword(ctx, account.ID, password) + if update == false { + return false, "" + } + m := gomail.NewMessage() + m.SetHeader("From", h.Config.GetString("emailing.smtp.username")) + m.SetHeader("To", username) + m.SetHeader("Subject", "Silvermobi Password Recovery") + message = append(message, []byte(password)...) + m.SetBody("text/plain", string(message)) + d := gomail.NewDialer(h.Config.GetString("emailing.smtp.host"), h.Config.GetInt("emailing.smtp.port"), h.Config.GetString("emailing.smtp.username"), + h.Config.GetString("emailing.smtp.password")) + d.TLSConfig = &tls.Config{InsecureSkipVerify: true} + if err := d.DialAndSend(m); err != nil { + return false, "" + } + return true, password + } else { + return false, "" + } +} diff --git a/handler/geo.go b/handler/geo.go new file mode 100644 index 0000000..b5dd75c --- /dev/null +++ b/handler/geo.go @@ -0,0 +1,57 @@ +package handler + +import ( + "fmt" + "github.com/paulmach/orb" + "github.com/paulmach/orb/geojson" + "google.golang.org/genproto/googleapis/maps/routing/v2" +) + +func (h *SolidarityServiceHandler) GeoAutocomplete(text string, lat, lon float64) (*geojson.FeatureCollection, error) { + result, err := h.Services.Geocoder.Autocomplete(text) + if err != nil { + return nil, err + } + return result, nil +} + +func (h *SolidarityServiceHandler) GeoRoute(locations geojson.FeatureCollection) (route *routing.Route, err error) { + route_locations := []orb.Point{} + + features_type := "" + + for _, f := range locations.Features { + ft := f.Geometry.GeoJSONType() + if features_type != "" && ft != features_type { + return nil, fmt.Errorf("mixing different types of geometries in the feature collection is not allowed : %s and %s found", features_type, ft) + } + + features_type = ft + + if features_type == "Point" { + if point, ok := f.Geometry.(orb.Point); ok { + route_locations = append(route_locations, point) + } + } else { + return nil, fmt.Errorf("feature type %s not supported", features_type) + } + + return nil, err + } + + return route, nil +} + +func (h *SolidarityServiceHandler) GeoReturnRoute(locations geojson.FeatureCollection) (route *routing.Route, err error) { + loc := locations + route.Polyline.String() + reverse(loc.Features) + + return h.GeoRoute(loc) +} + +func reverse[S ~[]E, E any](s S) { + for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 { + s[i], s[j] = s[j], s[i] + } +} diff --git a/handler/handler.go b/handler/handler.go index e54a7c8..0770241 100644 --- a/handler/handler.go +++ b/handler/handler.go @@ -4,12 +4,16 @@ import ( "git.coopgo.io/coopgo-platform/routing-service" "github.com/spf13/viper" "solidarity-service/storage" + "solidarity-service/services" + ) type SolidarityServiceHandler struct { Config *viper.Viper Routing routing.RoutingService Storage storage.Storage + Services *services.ServicesHandler + } func NewSolidarityServiceHandler(cfg *viper.Viper, routing routing.RoutingService, storage storage.Storage) (*SolidarityServiceHandler, error) { diff --git a/handler/notifications.go b/handler/notifications.go new file mode 100644 index 0000000..3a67423 --- /dev/null +++ b/handler/notifications.go @@ -0,0 +1,64 @@ +package handler + +import ( + "context" + "crypto/tls" + "solidarity-service/services" + "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" + gomail "gopkg.in/mail.v2" +) + +func (h *SolidarityServiceHandler) PutFirebase(ctx context.Context, id string, token string, device_platform string) (err error) { + err = h.Storage.CreateFirebaseToken(id, token, device_platform) + return err +} + +func (h *SolidarityServiceHandler) SendNotification(id, title, message string) (err error) { + firebase_token, platfrom, _ := h.Storage.GetFirebaseToken(id) + if err != nil { + return err + } + if platfrom == "android" { + _ = h.Services.Push.Send( + services.Notification{ + Platform: services.PushToAndroid, + Recipients: []string{firebase_token}, + Title: title, + Message: message, + }, + ) + } else { + _ = h.Services.Push.Send( + services.Notification{ + Platform: services.PushToIos, + Recipients: []string{firebase_token}, + Title: title, + Message: message, + }, + ) + } + + return nil + +} +func (h *SolidarityServiceHandler) SendEmail(id, title, message string) (err error) { + resp, err := h.Services.MobilityAccounts.Client.GetAccount(context.Background(), &grpcapi.GetAccountRequest{Id: id}) + if err != nil { + return err + } + + account := h.Services.MobilityAccounts.ToAccountModel(resp.Account.ToStorageType()) + m := gomail.NewMessage() + m.SetHeader("From", h.Config.GetString("emailing.smtp.username")) + m.SetHeader("To", account.Email) + m.SetHeader("Subject", title) + m.SetBody("text/plain", message) + d := gomail.NewDialer(h.Config.GetString("emailing.smtp.host"), h.Config.GetInt("emailing.smtp.port"), h.Config.GetString("emailing.smtp.username"), + h.Config.GetString("emailing.smtp.password")) + d.TLSConfig = &tls.Config{InsecureSkipVerify: true} + if err := d.DialAndSend(m); err != nil { + return err + } + return nil + +} diff --git a/handler/onboarding_validation.go b/handler/onboarding_validation.go new file mode 100644 index 0000000..a734341 --- /dev/null +++ b/handler/onboarding_validation.go @@ -0,0 +1,152 @@ +package handler + +import ( + "context" + "fmt" + "solidarity-service/services" + "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" + "github.com/pkg/errors" + "github.com/rs/zerolog/log" + "math/rand" +) + +func (h *SolidarityServiceHandler) UpdatePhoneNumber(ctx context.Context, id string, phone_number string) error { + code := rand.Intn(9999) + err := h.Services.MobilityAccounts.UpdatePhoneNumber( + ctx, + id, + phone_number, + false, + fmt.Sprintf("%04d", code), + ) + if err != nil { + log.Error().Err(err).Msg("updating phone number failed") + return err + } + + err = h.Services.Push.Send( + services.Notification{ + Platform: services.PushToSMSFactor, + Recipients: []string{phone_number[1:]}, + Title: "SILVERMOBI", + Message: fmt.Sprintf("SILVERMOBI - Votre code de validation : %04d", code), + }, + ) + + if err != nil { + log.Error().Err(err).Msg("issue sending verification code by sms") + } + + return nil +} + +func (h *SolidarityServiceHandler) VerifyPhoneNumber(ctx context.Context, id string, phone_number string, verification_code string) error { + request := &grpcapi.GetAccountRequest{ + Id: id, + } + resp, err := h.Services.MobilityAccounts.Client.GetAccount(ctx, request) + if err != nil { + return err + } + + account_ := resp.Account + + log.Debug(). + Str("phone_number", phone_number). + Str("account.phone_number", account_.Authentication.Local.PhoneNumber). + Str("verification_code", verification_code). + Str("account.verification_code", account_.Authentication.Local.PhoneNumberValidation.ValidationCode). + Msg("Verify phone number") + + if account_.Authentication.Local.PhoneNumber != phone_number || account_.Authentication.Local.PhoneNumberValidation.ValidationCode != verification_code { + return errors.New("cound not validate phone number : verification code mismatch") + } + + err = h.Services.MobilityAccounts.UpdatePhoneNumber( + ctx, + id, + phone_number, + true, + "", + ) + if err != nil { + return err + } + + return nil +} + +func (h *SolidarityServiceHandler) UpdateBirthDate(ctx context.Context, id string, birthdate string) error { + err := h.Services.MobilityAccounts.UpdateAccountBirthDate(ctx, id, "silvermobi", birthdate) + if err != nil { + return err + } + return nil +} + +func (h *SolidarityServiceHandler) SetAccountType(ctx context.Context, id string, accountType string) error { + err := h.Services.MobilityAccounts.SetAccountType(ctx, id, accountType) + if err != nil { + return err + } + return nil +} +func (h *SolidarityServiceHandler) GetAccountType(ctx context.Context, id string) (account_type string, err error) { + request := &grpcapi.GetAccountRequest{ + Id: id, + } + resp, err := h.Services.MobilityAccounts.Client.GetAccount(ctx, request) + if err != nil { + return "", err + log.Error().Err(err).Msg("Failed get account type") + } + account := h.Services.MobilityAccounts.ToAccountModel(resp.Account.ToStorageType()) + if account.Type != "" { + + return account.Type, nil + } + return "", errors.New("account type not set") +} +func (h *SolidarityServiceHandler) GetAccountPhone(ctx context.Context, id string) (phone_number string, err error) { + request := &grpcapi.GetAccountRequest{ + Id: id, + } + resp, err := h.Services.MobilityAccounts.Client.GetAccount(ctx, request) + if err != nil { + return "", err + log.Error().Err(err).Msg("Failed get account type") + } + account := h.Services.MobilityAccounts.ToAccountModel(resp.Account.ToStorageType()) + if account.PhoneNumber != "" { + + return account.PhoneNumber, nil + } + return "", errors.New("invalid request ") +} + +func (h *SolidarityServiceHandler) CheckValidation(ctx context.Context, id string) (phone_validation, birth_validation, type_validation bool, err error) { + request := &grpcapi.GetAccountRequest{ + Id: id, + } + resp, err := h.Services.MobilityAccounts.Client.GetAccount(ctx, request) + if err != nil { + return false, false, false, err + log.Error().Err(err).Msg("Failed get validation response") + } + account := h.Services.MobilityAccounts.ToAccountModel(resp.Account.ToStorageType()) + phone_validation = false + birth_validation = false + type_validation = false + if account.LocalCredentials.PhoneNumberVerified { + phone_validation = true + } + if account.BirthDate != "" { + birth_validation = true + } + if account.Type != "" { + type_validation = true + } + + log.Info().Msg("Getting phone and birth validation for " + account.Email) + return phone_validation, birth_validation, type_validation, nil +} diff --git a/handler/update_password.go b/handler/update_password.go new file mode 100644 index 0000000..8ed0e90 --- /dev/null +++ b/handler/update_password.go @@ -0,0 +1,16 @@ +package handler + +import "context" + +func (h *SolidarityServiceHandler) UpdatePassword(ctx context.Context, username string, password string) (response bool) { + account, err := h.Services.MobilityAccounts.GetAccountUsername(ctx, username, "silvermobi") + if err != nil { + return false + } + result := h.Services.MobilityAccounts.UpdatePassword(ctx, account.ID, password) + if result == true { + return true + } else { + return false + } +} diff --git a/models/accounts.go b/models/accounts.go new file mode 100644 index 0000000..f0f1f3a --- /dev/null +++ b/models/accounts.go @@ -0,0 +1,49 @@ +package models + +import ( + "github.com/golang-jwt/jwt/v4" + "time" +) + +type Account struct { + ID string `json:"id"` + Email string `json:"email"` + FirstName string `json:"firstName,omitempty"` + LastName string `json:"lastName,omitempty"` + VerifiedIdentity *bool `json:"verifiedIdentity,omitempty"` + BirthDate string `json:"birthdate,omitempty"` + Type string `json:"type,omitempty"` + LocalCredentials +} + +type User struct { + ID string `json:"user_id"` + Status string `json:"status"` + BookingID string `json:"booking_id"` +} + +type LocalCredentials struct { + Email string + EmailVerified bool + EmailValidationCode string + PhoneNumber string + PhoneNumberVerified bool + PhoneNumberValidationCode string +} + +type UserClaims struct { + jwt.RegisteredClaims +} + +func (account Account) CreateToken(ttl time.Duration, key string) (token string, err error) { + expires_at := jwt.NewNumericDate(time.Now().Add(ttl)) + claims := UserClaims{ + RegisteredClaims: jwt.RegisteredClaims{ + Subject: account.ID, + ExpiresAt: expires_at, + }, + } + + t := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + return t.SignedString([]byte(key)) +} diff --git a/services/mobility-accounts.go b/services/mobility-accounts.go new file mode 100644 index 0000000..d1ef6c1 --- /dev/null +++ b/services/mobility-accounts.go @@ -0,0 +1,234 @@ +package services + +import ( + "context" + "solidarity-service/models" + mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" + ma "git.coopgo.io/coopgo-platform/mobility-accounts/storage" + "google.golang.org/grpc" + "google.golang.org/protobuf/types/known/structpb" +) + +type MobilityAccountService struct { + Client mobilityaccounts.MobilityAccountsClient +} + +func NewMobilityAccountService(mobilityAccountsDial string) (MobilityAccountService, error) { + mobilityAccountsConn, err := grpc.Dial(mobilityAccountsDial, grpc.WithInsecure()) + + client := mobilityaccounts.NewMobilityAccountsClient(mobilityAccountsConn) + if err != nil { + return MobilityAccountService{}, err + } + + return MobilityAccountService{ + Client: client, + }, nil +} + +func (s MobilityAccountService) Login(ctx context.Context, username, password, namespace string) (*models.Account, error) { + resp, err := s.Client.Login(ctx, &mobilityaccounts.LoginRequest{ + Username: username, + Password: password, + Namespace: namespace, + }) + if err != nil { + return nil, err + } + + account := resp.Account.ToStorageType() + return s.ToAccountModel(account), nil +} + +func (s MobilityAccountService) UpdateAccountData(ctx context.Context, id string, data map[string]any) error { + d, err := structpb.NewStruct(data) + if err != nil { + return err + } + + if _, err = s.Client.UpdateData(ctx, &mobilityaccounts.UpdateDataRequest{ + Account: &mobilityaccounts.Account{ + Id: id, + Data: d, + }, + }); err != nil { + return err + } + + return nil +} + +func (s MobilityAccountService) UpdatePassword(ctx context.Context, id string, password string) bool { + _, err := s.Client.ChangePassword(ctx, &mobilityaccounts.ChangePasswordRequest{ + Id: id, + Password: password, + }) + if err == nil { + return true + } else { + return false + } +} + +func (s MobilityAccountService) GetAccountUsername(ctx context.Context, username string, namespace string) (*models.Account, error) { + resp, err := s.Client.GetAccountUsername(ctx, &mobilityaccounts.GetAccountUsernameRequest{ + Username: username, + Namespace: namespace, + }) + if err != nil { + return nil, err + } + return s.ToAccountModel(resp.Account.ToStorageType()), nil +} + +func (s MobilityAccountService) Register(ctx context.Context, username string, password string, email string, phone_number string, data map[string]any, namespace string) (*models.Account, error) { + account := &ma.Account{ + Authentication: ma.AccountAuth{ + Local: ma.LocalAuth{ + Username: username, + Password: password, + Email: email, + PhoneNumber: phone_number, + }, + }, + Namespace: namespace, + Data: data, + } + + acc, err := mobilityaccounts.AccountFromStorageType(account) + if err != nil { + return nil, err + } + + resp, err := s.Client.Register(ctx, &mobilityaccounts.RegisterRequest{ + Account: acc, + }) + + if err != nil { + return nil, err + } + + return s.ToAccountModel(resp.Account.ToStorageType()), nil +} +func (s MobilityAccountService) UpdatePhoneNumber(ctx context.Context, accountid string, phone_number string, verified bool, verification_code string) error { + _, err := s.Client.UpdatePhoneNumber( + ctx, + &mobilityaccounts.UpdatePhoneNumberRequest{ + Id: accountid, + PhoneNumber: phone_number, + Verified: verified, + VerificationCode: verification_code, + }, + ) + + if err != nil { + return err + } + + return nil +} + +func (s MobilityAccountService) SetAccountType(ctx context.Context, id string, accountType string) error { + account, err := s.Client.GetAccount(ctx, &mobilityaccounts.GetAccountRequest{ + Id: id, + }) + if err != nil { + return err + } + data := make(map[string]interface{}) + data["type"] = accountType + dataStruct := &structpb.Struct{ + Fields: make(map[string]*structpb.Value), + } + + for key, value := range data { + stringValue, ok := value.(string) + if !ok { + continue + } + + dataStruct.Fields[key] = &structpb.Value{ + Kind: &structpb.Value_StringValue{ + StringValue: stringValue, + }, + } + } + account.Account.Data = dataStruct + _, err = s.Client.UpdateData(ctx, &mobilityaccounts.UpdateDataRequest{ + Account: account.Account, + }) + if err != nil { + return err + } + return nil + +} + +func (s MobilityAccountService) UpdateAccountBirthDate(ctx context.Context, id string, namespace string, birthdate string) error { + account, err := s.Client.GetAccount(ctx, &mobilityaccounts.GetAccountRequest{ + Id: id, + }) + data := make(map[string]interface{}) + data["birthdate"] = birthdate + + dataStruct := &structpb.Struct{ + Fields: make(map[string]*structpb.Value), + } + + for key, value := range data { + stringValue, ok := value.(string) + if !ok { + continue + } + + dataStruct.Fields[key] = &structpb.Value{ + Kind: &structpb.Value_StringValue{ + StringValue: stringValue, + }, + } + } + account.Account.Data = dataStruct + _, err = s.Client.UpdateData(ctx, &mobilityaccounts.UpdateDataRequest{ + Account: account.Account, + }) + if err != nil { + return err + } + return nil +} + +func (s MobilityAccountService) ToAccountModel(account ma.Account) *models.Account { + first_name := account.Data["first_name"].(string) + last_name := account.Data["last_name"].(string) + birth_date, ok := account.Data["birthdate"].(string) + if !ok { + birth_date = "" + } + accountType, ok := account.Data["type"].(string) + if !ok { + accountType = "" + } + phone_number, ok := account.Data["phone_number"].(string) + if !ok { + phone_number = "" + } + email, ok := account.Data["email"].(string) + if !ok { + email = "" + } + return &models.Account{ + ID: account.ID, + FirstName: first_name, + LastName: last_name, + Email: email, + BirthDate: birth_date, + Type: accountType, + LocalCredentials: models.LocalCredentials{ + Email: account.Authentication.Local.Email, + EmailVerified: account.Authentication.Local.EmailValidation.Validated, + EmailValidationCode: account.Authentication.Local.EmailValidation.ValidationCode, + PhoneNumber: phone_number, + PhoneNumberVerified: account.Authentication.Local.PhoneNumberValidation.Validated, + }, + } +} diff --git a/services/push.go b/services/push.go new file mode 100644 index 0000000..1dbc869 --- /dev/null +++ b/services/push.go @@ -0,0 +1,79 @@ +package services + +import ( + "context" + "google.golang.org/protobuf/types/known/structpb" + + "github.com/appleboy/gorush/rpc/proto" + "github.com/rs/zerolog/log" + "google.golang.org/grpc" +) + +const ( + // PlatFormIos constant is 1 for iOS + PushToIos = iota + 1 + // PlatFormAndroid constant is 2 for Android + PushToAndroid + // PlatFormHuawei constant is 3 for Huawei + PushToHuawei + // PlatformUnifiedPush constant is 4 for UnifiedPush + PushToUnifiedPush + // PlatformSMSFactor constant is 5 for SMSFactor + PushToSMSFactor +) + +type Notification struct { + Platform int32 + Recipients []string + Message string + Title string + Data *structpb.Struct + ID string +} + +type PushService struct { + Client proto.GorushClient +} + +func NewPushService(address string) (*PushService, error) { + conn, err := grpc.Dial(address, grpc.WithInsecure()) + + if err != nil { + return nil, err + } + + return &PushService{ + Client: proto.NewGorushClient(conn), + }, nil +} + +func (s *PushService) Send(notification Notification) error { + log.Debug(). + Int32("Platform", notification.Platform). + Strs("recipients", notification.Recipients). + Str("notification_message", notification.Message). + Str("notification_title", notification.Title). + Msg("Send notification") + + resp, err := s.Client.Send(context.Background(), &proto.NotificationRequest{ + Data: notification.Data, + ID: notification.ID, + Platform: notification.Platform, + Tokens: notification.Recipients, + Message: notification.Message, + Title: notification.Title, + Priority: proto.NotificationRequest_HIGH, + Alert: &proto.Alert{ + Title: notification.Title, + Body: notification.Message, + }, + }) + + if err != nil { + return err + } + + log.Debug().Str("response", resp.String()).Msg("notification sent") + + return nil +} diff --git a/services/services.go b/services/services.go new file mode 100644 index 0000000..4fdc9b6 --- /dev/null +++ b/services/services.go @@ -0,0 +1,54 @@ +package services + +import ( + "git.coopgo.io/coopgo-platform/geocode" + routing "git.coopgo.io/coopgo-platform/routing-service" + "github.com/rs/zerolog/log" + "github.com/spf13/viper" +) + +type ServicesHandler struct { + MobilityAccounts MobilityAccountService + Push *PushService + Geocoder geocode.Geocoder + Routing routing.RoutingService +} + +func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) { + var ( + mobilityAccountsDial = cfg.GetString("services.internal.mobility_accounts.dial") + pushDial = cfg.GetString("services.internal.push.dial") + geocoder_type = cfg.GetString("geocoder.type") + pelias_base_url = cfg.GetString("geocoder.pelias.base_url") + routing_service_type = cfg.GetString("routing.type") + valhalla_base_url = cfg.GetString("routing.valhalla.base_url") + ) + mobilityAccounts, err := NewMobilityAccountService(mobilityAccountsDial) + if err != nil { + log.Fatal().Err(err).Msg("Could not connect to Mobility Accounts Service") + return nil, err + } + push, err := NewPushService(pushDial) + if err != nil { + log.Fatal().Err(err).Msg("Could not connect to Push Notifications Service") + return nil, err + } + geocoder, err := geocode.NewGeocoder(geocoder_type, pelias_base_url) + if err != nil { + log.Fatal().Err(err).Msg("Could not initiate the Geocoder service") + return nil, err + } + + routing, err := routing.NewRoutingService(routing_service_type, valhalla_base_url) + if err != nil { + log.Fatal().Err(err).Msg("Could not initiate the routing service") + return nil, err + } + + return &ServicesHandler{ + MobilityAccounts: mobilityAccounts, + Push: push, + Geocoder: geocoder, + Routing: routing, + }, nil +} diff --git a/storage/postgresql.go b/storage/postgresql.go index 1807a04..b3b4d53 100644 --- a/storage/postgresql.go +++ b/storage/postgresql.go @@ -61,6 +61,46 @@ func NewPostgresqlStorage(cfg *viper.Viper) (PostgresqlStorage, error) { }, nil } +func (s PostgresqlStorage) CreateFirebaseToken(user_id string, fcm_token string, device_platform string) (err error) { + _, err = uuid.Parse(user_id) + if err != nil { + log.Error().Err(err).Msg("Postgresql Storage CreateFirebaseToken invalid User ID") + return err + } + _, err = s.DbConnection.Exec(fmt.Sprintf("INSERT INTO %s (user_id , fcm_token , device_platform) VALUES($1,$2,$3)", s.Tables["users_firebase"]), + user_id, + fcm_token, + device_platform) + if err != nil { + if strings.Contains(err.Error(), "duplicate key") { + _ = s.UpdateFirebaseToken(user_id, device_platform, fcm_token) + } + } + + return nil +} + +func (s PostgresqlStorage) GetFirebaseToken(user_id string) (fcm string, device_platform string, err error) { + err = s.DbConnection.QueryRow(fmt.Sprintf("SELECT fcm_token , device_platform FROM %s WHERE user_id = $1", s.Tables["users_firebase"]), user_id). + Scan( + &fcm, + &device_platform, + ) + if err != nil { + return "", "", err + } + return fcm, device_platform, nil +} + +func (s PostgresqlStorage) UpdateFirebaseToken(user_id string, fcm_token string, device_platform string) error { + query := fmt.Sprintf("UPDATE %s SET fcm_token = $1 device_platform = $2 WHERE user_id = $3", s.Tables["users_firebase"]) + _, err := s.DbConnection.Exec(query, fcm_token, device_platform, user_id) + if err != nil { + return err + } + return nil +} + func (s PostgresqlStorage) CreatePassenger(passenger internal.Passenger) (err error) { _, err = uuid.Parse(passenger.Passenger.ID) if err != nil { diff --git a/storage/storage.go b/storage/storage.go index 2efee73..74417ce 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -19,6 +19,9 @@ type Storage interface { FilterUserBookingsByStatus(user_type string, status internal.BookingStatus, user_id string) (bookings []internal.Booking, err error) DriverJourneys(departure_route *geojson.Feature, departure_date int64) (drivers []internal.Driver, err error) GetAllDrivers(date int64) (drivers []internal.Driver, err error) + CreateFirebaseToken(user_id string, fcm_token string, device_platform string) (err error) + UpdateFirebaseToken(user_id string, fcm_token string, device_platform string) error + GetFirebaseToken(user_id string) (fcm string, device_platform string, err error) } func NewStorage(cfg *viper.Viper) (Storage, error) {