fix: enable win release

.github/workflows/release.yaml

@@ -5,29 +5,26 @@ on:
 jobs:
   releases:
     name: Release Authorizer Binary
-    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        go-version: [1.16.4]
+        platform: [ubuntu-18.04]
+    runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
-      - name: Install dependencies
+      - name: Install Go
-        run: |
+        uses: actions/setup-go@v2
-          sudo apt-get install build-essential wget zip gcc-mingw-w64 && \
+        with:
-          sudo apt-get remove --auto-remove golang-go && \
+          go-version: ${{ matrix.go-version }}
-          sudo rm -rf /usr/bin/go &&\
+      # - name: Install dependencies
-          wget --progress=dot:mega https://golang.org/dl/go1.17.1.linux-amd64.tar.gz -O go-linux.tar.gz && \
+      #   run: |
-          sudo tar -zxf go-linux.tar.gz && \
+      #     sudo apt-get install build-essential wget zip && \
-          sudo mv go /usr/bin/ && \
+      #     go version && \
-          sudo mkdir -p /go/bin /go/src /go/pkg && \
+      #     wget --no-check-certificate --progress=dot:mega https://github.com/wangyoucao577/assets-uploader/releases/download/v0.3.0/github-assets-uploader-v0.3.0-linux-amd64.tar.gz -O github-assets-uploader.tar.gz && \
-          export GO_HOME=/usr/bin/go && \
+      #     tar -zxf github-assets-uploader.tar.gz && \
-          export GOPATH=/go && \
+      #     sudo mv github-assets-uploader /usr/sbin/ && \
-          export PATH=${GOPATH}/bin:${GO_HOME}/bin/:$PATH && \
+      #     sudo rm -f github-assets-uploader.tar.gz && \
-          echo "/usr/bin/go/bin" >> $GITHUB_PATH
+      #     github-assets-uploader -version
-          echo "/usr/bin/x86_64-w64-mingw32-gcc" >> GITHUB_PATH
-          go version && \
-          wget --no-check-certificate --progress=dot:mega https://github.com/wangyoucao577/assets-uploader/releases/download/v0.3.0/github-assets-uploader-v0.3.0-linux-amd64.tar.gz -O github-assets-uploader.tar.gz && \
-          tar -zxf github-assets-uploader.tar.gz && \
-          sudo mv github-assets-uploader /usr/sbin/ && \
-          sudo rm -f github-assets-uploader.tar.gz && \
-          github-assets-uploader -version
       - name: Print Go paths
         run: whereis go
       - name: Print Go Version
@@ -36,19 +33,26 @@ jobs:
         run: echo VERSION=$(basename ${GITHUB_REF}) >> ${GITHUB_ENV}
       - name: Copy .env file
         run: mv .env.sample .env
-      # - name: Package files for windows
+      - name: Package files for windows
-      #   run: |
+        run: |
-      #     make clean && \
+          make clean && \
-      #     CGO_ENABLED=1 GOOS=windows CC=/usr/bin/x86_64-w64-mingw32-gcc make && \
+          CGO_ENABLED=1 GOOS=windows CC=/usr/bin/x86_64-w64-mingw32-gcc make && \
-      #     mv build/server build/server.exe && \
+          mv build/server build/server.exe && \
-      #     zip -vr authorizer-${VERSION}-windows-amd64.zip .env app/build build templates
+          zip -vr authorizer-${VERSION}-windows-amd64.zip .env app/build build templates
       - name: Package files for linux
         run: |
           make clean && \
           CGO_ENABLED=1 make && \
           tar cvfz authorizer-${VERSION}-linux-amd64.tar.gz .env app/build build templates
+      - name: Upload asset
+        uses: softprops/action-gh-release@v1
+        with:
+          files: authorizer-${VERSION}-linux-amd64.tar.gz
+          token: ${{secrets.RELEASE_TOKEN}}
+          tag_name: ${VERSION}
       - name: Upload assets
         run: |
+          github-assets-uploader -f authorizer-${VERSION}-windows-amd64.zip -mediatype application/zip -repo authorizerdev/authorizer -token ${{secrets.RELEASE_TOKEN}} -tag ${VERSION} && \
           github-assets-uploader -f authorizer-${VERSION}-linux-amd64.tar.gz -mediatype application/gzip -repo authorizerdev/authorizer -token ${{secrets.RELEASE_TOKEN}} -tag ${VERSION}
       - name: Log in to Docker Hub
         uses: docker/login-action@v1

Dockerfile

@@ -7,7 +7,7 @@ ARG VERSION="latest"
 ENV VERSION="$VERSION"
 
 RUN echo "$VERSION"
-RUN apk add build-base &&\
+RUN apk add build-base nodejs &&\
     make clean && make && \
     chmod 777 build/server
 

server/go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/mattn/go-isatty v0.0.13 // indirect
 	github.com/mattn/go-sqlite3 v1.14.7 // indirect
+	github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f // indirect
 	github.com/ugorji/go v1.2.6 // indirect
 	github.com/vektah/gqlparser/v2 v2.1.0
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
@@ -28,5 +29,4 @@ require (
 	gorm.io/driver/postgres v1.1.0
 	gorm.io/driver/sqlite v1.1.4
 	gorm.io/gorm v1.21.11
-	rogchap.com/v8go v0.6.0 // indirect
 )

server/go.sum

@@ -556,6 +556,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/robertkrimen/otto v0.0.0-20211019175142-5b0d97091c6f h1:wOVoULFf7IVSJ9hl8wnQew/kCpchffRb7a81H9/IcS4=
 github.com/robertkrimen/otto v0.0.0-20211019175142-5b0d97091c6f/go.mod h1:/mK7FZ3mFYEn9zvNPhpngTyatyehSwte5bJZ4ehL5Xw=
+github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f h1:a7clxaGmmqtdNTXyvrp/lVO/Gnkzlhc/+dLs5v965GM=
+github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f/go.mod h1:/mK7FZ3mFYEn9zvNPhpngTyatyehSwte5bJZ4ehL5Xw=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

server/utils/authToken.go

@@ -13,7 +13,7 @@ import (
 	"github.com/authorizerdev/authorizer/server/enum"
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"
-	v8 "rogchap.com/v8go"
+	"github.com/robertkrimen/otto"
 )
 
 func CreateAuthToken(user db.User, tokenType enum.TokenType, roles []string) (string, int64, error) {
@@ -50,25 +50,25 @@ func CreateAuthToken(user db.User, tokenType enum.TokenType, roles []string) (st
 			"signUpMethods": strings.Split(user.SignupMethod, ","),
 		}
 
-		ctx, _ := v8.NewContext()
+		vm := otto.New()
 		userBytes, _ := json.Marshal(userInfo)
 		claimBytes, _ := json.Marshal(customClaims)
 
-		ctx.RunScript(fmt.Sprintf(`
+		vm.Run(fmt.Sprintf(`
-			const user = %s;
+			var user = %s;
-			const tokenPayload = %s;
+			var tokenPayload = %s;
-			const customFunction = %s;
+			var customFunction = %s;
-			const functionRes = JSON.stringify(customFunction(user, tokenPayload));
+			var functionRes = JSON.stringify(customFunction(user, tokenPayload));
-		`, string(userBytes), string(claimBytes), accessTokenScript), "functionCall.js")
+		`, string(userBytes), string(claimBytes), accessTokenScript))
 
-		val, err := ctx.RunScript("functionRes", "functionRes.js")
+		val, err := vm.Get("functionRes")
 
 		if err != nil {
 			log.Println("=> err custom access token script:", err)
 		} else {
 			extraPayload := make(map[string]interface{})
 			err = json.Unmarshal([]byte(fmt.Sprintf("%s", val)), &extraPayload)
-
+			log.Println("extra:", extraPayload)
 			if err != nil {
 				log.Println("Error converting accessTokenScript response to map:", err)
 			} else {