Update main

.github/workflows/build-deploy.yml

@@ -0,0 +1,79 @@
+name: "Build and Deploy"
+
+on:
+ push:
+ branches:
+ - main
+ - beta
+ - dev
+
+env:
+ IMAGE_NAME: ghcr.io/${{ github.repository }}
+ IMAGE_TAG: ${{ github.sha }}
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Set up Go
+ uses: actions/setup-go@v2
+ with:
+ go-version: 1.21
+ check-latest: true
+
+ - name: Download dependencies
+ run: go mod download
+
+ - name: Start Test Database Container
+ run: docker-compose -f docker-compose-unittest.yaml up -d
+
+ - name: Vet
+ run: |
+ go vet ./...
+
+ - name: Test
+ run: |
+ go test -v -coverpkg ./internal/... -coverprofile coverage.out -covermode count ./internal/...
+ go tool cover -func="./coverage.out"
+
+ build:
+ name: Build
+ runs-on: ubuntu-latest
+
+ permissions:
+ contents: read
+ packages: write
+
+ outputs:
+ BRANCH: ${{ steps.branch.outputs.BRANCH }}
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v1
+
+ - name: Set branch
+ id: branch
+ run: |
+ echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+
+ - name: Log in to the Container Registry
+ uses: docker/login-action@v1
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Build and Push Docker Image
+ uses: docker/build-push-action@v2
+ with:
+ context: .
+ platforms: linux/amd64,linux/arm64
+ push: true
+ tags: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }},${{ env.IMAGE_NAME }}:latest
+ cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
+ cache-to: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache,mode=max

.github/workflows/run-unit-test.yml

@@ -0,0 +1,35 @@
+name: "Pull request: Run unit test"
+
+on:
+ pull_request:
+ branches:
+ - main
+ - beta
+ - dev
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Set up Go
+ uses: actions/setup-go@v2
+ with:
+ go-version: 1.21
+ check-latest: true
+
+ - name: Download dependencies
+ run: go mod download
+
+ - name: Start Test Database Container
+ run: docker-compose -f docker-compose-unittest.yaml up -d
+
+ - name: Vet
+ run: |
+ go vet ./...
+
+ - name: Test
+ run: |
+ go test -v -coverpkg ./internal/... -coverprofile coverage.out -covermode count ./internal/...
+ go tool cover -func="./coverage.out"

.github/workflows/test-build.yml

@@ -0,0 +1,28 @@
+name: "Pull request: Build test"
+
+on:
+ pull_request:
+ branches:
+ - main
+ - beta
+ - dev
+
+jobs:
+ docker-build:
+ name: "Docker build and create an image"
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v1
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v1
+ - name: Build Docker image
+ id: docker_build
+ uses: docker/build-push-action@v2
+ with:
+ context: .
+ push: false
+ tags: test

.gitignore

@@ -30,4 +30,6 @@ volumes
 coverage.out
 coverage.html
 
-.DS_store
+.DS_store
+
+internal/repository/user/memory:

Dockerfile

@@ -0,0 +1,49 @@
+# Base Image
+FROM golang:1.21.4-alpine3.18 as base
+
+# Working directory
+WORKDIR /app
+
+# Copy go.mod and go.sum files
+COPY go.mod go.sum ./
+
+# Download dependencies
+RUN go mod download
+
+# Copy the source code
+COPY . .
+
+# Build the application
+RUN go build -o server ./cmd/main.go
+
+# Copy config files
+COPY ./config ./config
+
+# Adding the grpc_health_probe
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
+ wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+ chmod +x /bin/grpc_health_probe
+
+# Create master image
+FROM alpine AS master
+
+# Working directory
+WORKDIR /app
+
+# Copy grpc_heath_prob
+COPY --from=base /bin/grpc_health_probe ./
+
+# Copy execute file
+COPY --from=base /app/server ./
+
+# Copy config files
+COPY --from=base /app/config ./config
+
+# Set ENV to production
+ENV GO_ENV production
+
+# Expose port 3002
+EXPOSE 3002
+
+# Run the application
+CMD ["./server"]

Makefile

@@ -1,2 +1,15 @@
 server:
- go run ./src/.
+ go run ./cmd/.
+
+mock-gen:
+ mockgen -source ./pkg/repository/cache/cache.repository.go -destination ./mocks/repository/cache/cache.mock.go
+ mockgen -source ./pkg/repository/auth/auth.repository.go -destination ./mocks/repository/auth/auth.mock.go
+
+test:
+ go vet ./...
+ go test -v -coverpkg ./internal/... -coverprofile coverage.out -covermode count ./internal/...
+ go tool cover -func=coverage.out
+ go tool cover -html=coverage.out -o coverage.html
+
+proto:
+ go get github.com/isd-sgcu/johnjud-go-proto@latest

README.md

@@ -1,15 +1,21 @@
 # Johnjud-auth
 
+Johnjud-auth is a user authentication and authorization service for the Johnjud project.
+
+### What is Johnjud?
+Johnjud is a pet adoption web application of the [CUVET For Animal Welfare Club](https://www.facebook.com/CUVETforAnimalWelfareClub)
+
 ## Stacks
 - golang
 - gRPC
 - postgresql
+- redis
 
-## Getting Start
+## Getting Started
 These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
 
 ### Prerequisites
-- golang 1.19 or [later](https://go.dev)
+- golang 1.21 or [later](https://go.dev)
 - docker
 - makefile
 
@@ -18,9 +24,19 @@ These instructions will get you a copy of the project up and running on your loc
 2. Import project
 3. Copy `config.example.yaml` in `config` and paste it in the same location then remove `.example` from its name.
 4. Download dependencies by `go mod download`
-### Testing
-1. Run ` go test -v -coverpkg ./src/internal/... -coverprofile coverage.out -covermode count ./src/internal/...` or `make test`
 
 ### Running
 1. Run `docker-compose up -d`
-2. Run `go run ./src/.` or `make server`
+2. Run `go run ./cmd/.` or `make server`
+
+### Testing
+1. Run `go test -v -coverpkg ./internal/... -coverprofile coverage.out -covermode count ./internal/...` or `make test`
+
+## Other microservices/repositories of Johnjud
+- [Johnjud-gateway](https://github.com/isd-sgcu/johnjud-gateway): Routing and request handling
+- [Johnjud-auth](https://github.com/isd-sgcu/johnjud-auth): Authentication and authorization
+- [Johnjud-backend](https://github.com/isd-sgcu/johnjud-backend): Main business logic
+- [Johnjud-file](https://github.com/isd-sgcu/johnjud-file): File management service
+- [Johnjud-proto](https://github.com/isd-sgcu/johnjud-proto): Protobuf files generator
+- [Johnjud-go-proto](https://github.com/isd-sgcu/johnjud-go-proto): Generated protobuf files for golang
+- [Johnjud-frontend](https://github.com/isd-sgcu/johnjud-frontend): Frontend web application

src/config/config.go → cfgldr/config.go

@@ -1,4 +1,4 @@
-package config
+package cfgldr
 
 import (
  "github.com/pkg/errors"
@@ -20,9 +20,25 @@ type App struct {
  Secret string `mapstructure:"secret"`
 }
 
+type Jwt struct {
+ Secret string `mapstructure:"secret"`
+ ExpiresIn int `mapstructure:"expires_in"`
+ RefreshTokenTTL int `mapstructure:"refresh_token_ttl"`
+ Issuer string `mapstructure:"issuer"`
+}
+
+type Redis struct {
+ Host string `mapstructure:"host"`
+ Port int `mapstructure:"port"`
+ Password string `mapstructure:"password"`
+ Dbnum int `mapstructure:"dbnum"`
+}
+
 type Config struct {
  App App `mapstructure:"app"`
  Database Database `mapstructure:"database"`
+ Jwt Jwt `mapstructure:"jwt"`
+ Redis Redis `mapstructure:"redis"`
 }
 
 func LoadConfig() (config *Config, err error) {