fixed project name

rarimo · Feb 15, 2024 · c8b5829 · c8b5829
1 parent 183eaf0
commit c8b5829
Show file tree

Hide file tree

Showing 30 changed files with 70 additions and 84 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,16 +2,16 @@ FROM golang:1.20-alpine as buildbase
 
 RUN apk add git build-base
 
-WORKDIR /go/src/github.com/rarimo/rarime-auth-svc
+WORKDIR /go/src/github.com/rarimo/auth-svc
 COPY vendor .
 COPY . .
 
-RUN GOOS=linux go build  -o /usr/local/bin/rarime-auth-svc /go/src/github.com/rarimo/rarime-auth-svc
+RUN GOOS=linux go build  -o /usr/local/bin/auth-svc /go/src/github.com/rarimo/auth-svc
 
 
 FROM alpine:3.9
 
-COPY --from=buildbase /usr/local/bin/rarime-auth-svc /usr/local/bin/rarime-auth-svc
+COPY --from=buildbase /usr/local/bin/auth-svc /usr/local/bin/auth-svc
 RUN apk add --no-cache ca-certificates
 
-ENTRYPOINT ["rarime-auth-svc"]
+ENTRYPOINT ["auth-svc"]
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# rarime-auth-svc
+# auth-svc
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
@@ -27,7 +27,7 @@ package middleware
 import (
 	"net/http"
 
-	"github.com/rarimo/rarime-auth-svc/pkg/auth"
+	"github.com/rarimo/auth-svc/pkg/auth"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 )
@@ -72,8 +72,8 @@ return
 ## Install
 
   ```
-  git clone github.com/rarimo/rarime-auth-svc
-  cd rarime-auth-svc
+  git clone github.com/rarimo/auth-svc
+  cd auth-svc
   go build main.go
   export KV_VIPER_FILE=./config.yaml
   ./main run service
@@ -107,8 +107,8 @@ Make sure that docker installed.
 use `docker run ` with `-p 8080:80` to expose port 80 to 8080
 
   ```
-  docker build -t github.com/rarimo/rarime-auth-svc .
-  docker run -e KV_VIPER_FILE=/config.yaml github.com/rarimo/rarime-auth-svc
+  docker build -t github.com/rarimo/auth-svc .
+  docker run -e KV_VIPER_FILE=/config.yaml github.com/rarimo/auth-svc
   ```
 
 ## Running from Source

diff --git a/docs/.redoclyrc b/docs/.redoclyrc
@@ -1,5 +1,5 @@
 
-apiTitle: rarime-auth-svc
+apiTitle: auth-svc
 splitSpec: true
 codeSamples: false
 swaggerUI: true

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rarime-auth-svc",
+  "name": "auth-svc",
   "version": "1.0.0",
   "dependencies": {
     "@tokend/redoc-cli": "^0.9.9",

diff --git a/docs/spec/openapi.yaml b/docs/spec/openapi.yaml
@@ -1,8 +1,8 @@
 openapi: 3.0.0
 info:
   version: 1.0.0
-  title: rarime-auth-svc
+  title: auth-svc
   description: ''
 servers:
-  - url: 'https://api.orgs.app.stage.rarime.com/integrations/rarime-auth-svc'
+  - url: 'https://api.orgs.app.stage.rarime.com/integrations/auth-svc'
     description: RariMe Stage envirinment
diff --git a/docs/web/index.hbs b/docs/web/index.hbs
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf8" />
-    <title>rarime-auth-svc Service Documentation</title>
+    <title>auth-svc Service Documentation</title>
     <!-- needed for adaptive design -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>

diff --git a/docs/web/index.html b/docs/web/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>rarime-auth-svc | ReDoc</title>
+    <title>auth-svc | ReDoc</title>
     <!-- needed for adaptive design -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" type="image/png" href="favicon.png">

diff --git a/generate.sh b/generate.sh
@@ -3,8 +3,8 @@
 GENERATOR_IMAGE=tokend/openapi-generator:v0.1.0
 
 
-GENERATED="${GOPATH}/src/github.com/rarimo/rarime-auth-svc/resources"
-OPENAPI_DIR="${GOPATH}/src/github.com/rarimo/rarime-auth-svc/docs/web_deploy"
+GENERATED="${GOPATH}/src/github.com/rarimo/auth-svc/resources"
+OPENAPI_DIR="${GOPATH}/src/github.com/rarimo/auth-svc/docs/web_deploy"
 PACKAGE_NAME=resources
 
 function printHelp {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rarimo/rarime-auth-svc
+module github.com/rarimo/auth-svc
 
 go 1.21.0
 
@@ -9,7 +9,6 @@ require (
 	github.com/go-ozzo/ozzo-validation/v4 v4.2.1
 	github.com/golang-jwt/jwt/v5 v5.2.0
 	github.com/google/uuid v1.3.0
-	github.com/iden3/go-iden3-core v1.0.2
 	github.com/iden3/go-iden3-core/v2 v2.0.4
 	github.com/iden3/go-rapidsnark/types v0.0.3
 	github.com/iden3/go-rapidsnark/verifier v0.0.5
@@ -18,7 +17,6 @@ require (
 	gitlab.com/distributed_lab/figure v2.1.0+incompatible
 	gitlab.com/distributed_lab/kit v1.11.2
 	gitlab.com/distributed_lab/logan v3.8.1+incompatible
-	gitlab.com/tokend/go v3.16.0+incompatible
 	gotest.tools v2.2.0+incompatible
 )
 
@@ -40,7 +38,6 @@ require (
 	github.com/magiconair/properties v1.8.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
-	github.com/nullstyle/go-xdr v0.0.0-20180726165426-f4c839f75077 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/pelletier/go-toml v1.2.0 // indirect
 	github.com/sirupsen/logrus v1.6.0 // indirect

diff --git a/go.sum b/go.sum
@@ -89,10 +89,7 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU=
 github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iden3/go-iden3-core v1.0.2 h1:HwNDFeqcUv4ybZj5tH+58JKWKarn/qqBpNCqTLxGP0Y=
-github.com/iden3/go-iden3-core v1.0.2/go.mod h1:X4PjlJG8OsEQEsSbzzYqqAk2olYGZ2nuGqiUPyEYjOo=
 github.com/iden3/go-iden3-core/v2 v2.0.4 h1:ggzC2zgOWgJAAcuG9X8bQG1r4gAoHZWqY7aLV8b1qgc=
 github.com/iden3/go-iden3-core/v2 v2.0.4/go.mod h1:L9PxhWPvoS9qTb3inEkZBm1RpjHBt+VTwvxssdzbAdw=
 github.com/iden3/go-iden3-crypto v0.0.15 h1:4MJYlrot1l31Fzlo2sF56u7EVFeHHJkxGXXZCtESgK4=
@@ -157,14 +154,10 @@ github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjW
 github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
 github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/nullstyle/go-xdr v0.0.0-20180726165426-f4c839f75077 h1:A804awGqaW7i61y8KnbtHmh3scqbNuTJqcycq3u5ZAU=
-github.com/nullstyle/go-xdr v0.0.0-20180726165426-f4c839f75077/go.mod h1:sZZi9x5aHXGZ/RRp7Ne5rkvtDxZb7pd7vgVA+gmE35A=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -230,8 +223,6 @@ gitlab.com/distributed_lab/logan v3.8.1+incompatible/go.mod h1:25oL/FPFXmyYzWeA6
 gitlab.com/distributed_lab/lorem v0.2.0 h1:Rc7Ef3eGSpei8EtWcV6fzPW3O/QEF2zgZR4+hV8WJAw=
 gitlab.com/distributed_lab/lorem v0.2.0/go.mod h1:wkzrGoB1L/yUBu56SfoJ/vNiPqiHZcg75AnBkWNcjhQ=
 gitlab.com/distributed_lab/running v0.0.0-20200706131153-4af0e83eb96c/go.mod h1:4TnADX84dQjQMRHKIMPCVL0L97rD/Jxv0xDbrN6aKzk=
-gitlab.com/tokend/go v3.16.0+incompatible h1:WKpbEsqOxf7L7fc0GGx9hoPy2dCph+AtPBd1JCbGWKk=
-gitlab.com/tokend/go v3.16.0+incompatible/go.mod h1:qz38YBc7VL29H2gnXbpRzcEVw2d1NUZ5SVDzIehqDCA=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -276,12 +267,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

diff --git a/internal/cli/main.go b/internal/cli/main.go
@@ -2,8 +2,8 @@ package cli
 
 import (
 	"github.com/alecthomas/kingpin"
-	"github.com/rarimo/rarime-auth-svc/internal/config"
-	"github.com/rarimo/rarime-auth-svc/internal/service"
+	"github.com/rarimo/auth-svc/internal/config"
+	"github.com/rarimo/auth-svc/internal/service"
 	"gitlab.com/distributed_lab/kit/kv"
 	"gitlab.com/distributed_lab/logan/v3"
 )
@@ -20,7 +20,7 @@ func Run(args []string) bool {
 	cfg := config.New(kv.MustFromEnv())
 	log = cfg.Log()
 
-	app := kingpin.New("rarime-auth-svc", "")
+	app := kingpin.New("auth-svc", "")
 
 	runCmd := app.Command("run", "run command")
 	serviceCmd := runCmd.Command("service", "run service") // you can insert custom help

diff --git a/internal/config/main.go b/internal/config/main.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/rarimo/rarime-auth-svc/internal/cookies"
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/internal/zkp"
+	"github.com/rarimo/auth-svc/internal/cookies"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/internal/zkp"
 	"gitlab.com/distributed_lab/kit/comfig"
 	"gitlab.com/distributed_lab/kit/kv"
 )

diff --git a/internal/cookies/main.go b/internal/cookies/main.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/internal/jwt"
 )
 
 type Cookies struct {

diff --git a/internal/service/handlers/authorize.go b/internal/service/handlers/authorize.go
@@ -7,9 +7,9 @@ import (
 	core "github.com/iden3/go-iden3-core/v2"
 	"github.com/iden3/go-iden3-core/v2/w3c"
 	zkptypes "github.com/iden3/go-rapidsnark/types"
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/internal/service/requests"
-	"github.com/rarimo/rarime-auth-svc/resources"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/internal/service/requests"
+	"github.com/rarimo/auth-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 )

diff --git a/internal/service/handlers/challenge.go b/internal/service/handlers/challenge.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	core "github.com/iden3/go-iden3-core/v2"
-	"github.com/rarimo/rarime-auth-svc/internal/service/requests"
-	"github.com/rarimo/rarime-auth-svc/resources"
+	"github.com/rarimo/auth-svc/internal/service/requests"
+	"github.com/rarimo/auth-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 )

diff --git a/internal/service/handlers/ctx.go b/internal/service/handlers/ctx.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/rarimo/rarime-auth-svc/internal/cookies"
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/internal/zkp"
+	"github.com/rarimo/auth-svc/internal/cookies"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/internal/zkp"
 	"gitlab.com/distributed_lab/logan/v3"
 )
 

diff --git a/internal/service/handlers/refresh.go b/internal/service/handlers/refresh.go
@@ -3,8 +3,8 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/resources"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 )

diff --git a/internal/service/handlers/validate.go b/internal/service/handlers/validate.go
@@ -3,8 +3,8 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/resources"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 )

diff --git a/internal/service/main.go b/internal/service/main.go
@@ -4,10 +4,10 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/rarimo/rarime-auth-svc/internal/config"
-	"github.com/rarimo/rarime-auth-svc/internal/cookies"
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/internal/zkp"
+	"github.com/rarimo/auth-svc/internal/config"
+	"github.com/rarimo/auth-svc/internal/cookies"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/internal/zkp"
 	"gitlab.com/distributed_lab/logan/v3"
 )
 

diff --git a/internal/service/middleware/main.go b/internal/service/middleware/main.go
@@ -3,9 +3,9 @@ package middleware
 import (
 	"net/http"
 
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/internal/service/handlers"
-	"github.com/rarimo/rarime-auth-svc/pkg"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/internal/service/handlers"
+	"github.com/rarimo/auth-svc/pkg"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 	"gitlab.com/distributed_lab/logan/v3"

diff --git a/internal/service/requests/authorize.go b/internal/service/requests/authorize.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/rarimo/rarime-auth-svc/resources"
+	"github.com/rarimo/auth-svc/resources"
 	"gitlab.com/distributed_lab/logan/v3/errors"
 )
 

diff --git a/internal/service/router.go b/internal/service/router.go
@@ -2,9 +2,9 @@ package service
 
 import (
 	"github.com/go-chi/chi"
-	"github.com/rarimo/rarime-auth-svc/internal/jwt"
-	"github.com/rarimo/rarime-auth-svc/internal/service/handlers"
-	"github.com/rarimo/rarime-auth-svc/internal/service/middleware"
+	"github.com/rarimo/auth-svc/internal/jwt"
+	"github.com/rarimo/auth-svc/internal/service/handlers"
+	"github.com/rarimo/auth-svc/internal/service/middleware"
 	"gitlab.com/distributed_lab/ape"
 )
 
@@ -22,7 +22,7 @@ func (s *service) router() chi.Router {
 		),
 	)
 
-	r.Route("/integrations/rarime-auth-svc", func(r chi.Router) {
+	r.Route("/integrations/auth-svc", func(r chi.Router) {
 		r.Route("/v1", func(r chi.Router) {
 			r.Post("/authorize", handlers.Authorize)
 			r.Get("/authorize/{did}/challenge", handlers.RequestChallenge)

diff --git a/internal/zkp/main.go b/internal/zkp/main.go
@@ -10,7 +10,7 @@ import (
 
 	zkptypes "github.com/iden3/go-rapidsnark/types"
 	"github.com/iden3/go-rapidsnark/verifier"
-	"github.com/rarimo/rarime-auth-svc/pkg/circuit"
+	"github.com/rarimo/auth-svc/pkg/circuit"
 	"gitlab.com/distributed_lab/logan/v3/errors"
 )
 

diff --git a/main.go b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/rarimo/rarime-auth-svc/internal/cli"
+	"github.com/rarimo/auth-svc/internal/cli"
 )
 
 func main() {