Merge pull request #13 from shion1305/issue/8-rc0

フロントエンド開発用設定の追加 / #8 の実装途中

Author: Shion1305

.github/workflows/go test.yml

@@ -11,8 +11,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - run: |
-          echo "ENV_LOCATION=$GITHUB_WORKSPACE/pkg/setting/files/setting.develop.yaml"
-          echo "ENV_LOCATION=$GITHUB_WORKSPACE/pkg/setting/files/setting.develop.yaml" >> $GITHUB_ENV
+          echo "ENV_LOCATION=$GITHUB_WORKSPACE/pkg/setting/files/setting.testing.yaml"
+          echo "ENV_LOCATION=$GITHUB_WORKSPACE/pkg/setting/files/setting.testing.yaml" >> $GITHUB_ENV
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v1'
       - name: 'Install gcloud required components'

Dockerfile

@@ -1,5 +1,5 @@
 FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
-RUN apk add --update --no-cache vim git make musl-dev go curl openjdk11-jre-headless
+RUN apk add --update --no-cache vim git make musl-dev go~=1.17.10 curl openjdk11-jre-headless
 RUN ["gcloud", "components", "install", "beta", "cloud-firestore-emulator", "--quiet"]
 # RUN firestore emulator
 # WAIT 10 seconds for the emulator to start
@@ -9,6 +9,6 @@ COPY . .
 
 #CMD ["gcloud", "beta", "emulators" ,"firestore","start","--quiet","--host-port","localhost:8020"]
 CMD /bin/sh -c "./run-test.sh"
-COPY ./pkg/setting/files/setting.develop.yaml /setting.yaml
+COPY pkg/setting/files/setting.testing.yaml /setting.yaml
 ENV ENV_LOCATION /setting.yaml
 ENV FIRESTORE_EMULATOR_HOST localhost:8020

pkg/identity/id.go

@@ -0,0 +1,41 @@
+package identity
+
+import (
+	"strconv"
+	"ynufes-mypage-backend/pkg/snowflake"
+	"ynufes-mypage-backend/svc/pkg/domain/model/util"
+)
+
+type (
+	ID        snowflake.Snowflake
+	IDManager struct {
+	}
+)
+
+func NewIDManager() IDManager {
+	return IDManager{}
+}
+
+func (IDManager) IssueID() util.ID {
+	return ID(snowflake.NewSnowflake())
+}
+
+func (IDManager) ImportID(id string) (util.ID, error) {
+	result, err := strconv.ParseInt(id, 36, 64)
+	if err != nil {
+		return ID(0), err
+	}
+	return ID(result), nil
+}
+
+func NewID(id int64) ID {
+	return ID(id)
+}
+
+func (i ID) ExportID() string {
+	return strconv.FormatInt(int64(i), 36)
+}
+
+func (i ID) HasValue() bool {
+	return i != 0
+}

pkg/setting/application.go

@@ -6,9 +6,21 @@ type (
 		Admin  Admin  `yaml:"admin"`
 	}
 	Server struct {
-		Domain string `yaml:"domain"`
+		OnProduction bool     `yaml:"on_production"`
+		Frontend     Frontend `yaml:"frontend"`
+		Backend      Backend  `yaml:"backend"`
 	}
 	Admin struct {
 		JwtSecret string `yaml:"jwt_secret"`
 	}
+	Frontend struct {
+		Protocol string `yaml:"protocol"`
+		Domain   string `yaml:"domain"`
+		Port     string `yaml:"port"`
+	}
+	Backend struct {
+		Protocol string `yaml:"protocol"`
+		Domain   string `yaml:"domain"`
+		Port     string `yaml:"port"`
+	}
 )

pkg/setting/files/setting.develop.yaml

@@ -1,6 +1,16 @@
 application:
   server:
-    domain: "ynufes-mypage.shion.pro"
+    on_production: true
+    # IF FRONTEND AND BACKEND SERVICE ARE ON THE SAME SERVER, MAKE THIS TRUE
+    frontend:
+      protocol: "https://"
+      domain: "ynufes-mypage.shion.pro"
+      port: ""
+    backend:
+      protocol: "https://"
+      domain: "ynufes-mypage.shion.pro"
+      port: ":1306"
+    # CONCATING PROTOCOL, DOMAIN, AND PORT TOGETHER SHOULD GIVE THE FULL URL
 infrastructure:
   firestore:
     project_id: "ynufes-mypage"
@@ -14,3 +24,6 @@ third_party:
     # CIPHER KEY HAS TO BE 16, 24, OR 32 BYTES LONG
     enable_line_auth: true
 service:
+  authentication:
+    secure_cookie: true
+    # YOU CAN DISABLE SECURE COOKIE FOR TESTING PURPOSES

pkg/setting/files/setting.template.yaml

@@ -0,0 +1,31 @@
+# This file is used for GitHub Action CI
+application:
+  server:
+    on_production: true
+    # ASSUME IF FRONTEND AND BACKEND SERVICE ARE ON THE SAME SERVER
+    frontend:
+      protocol: "https://"
+      domain: "ynufes-mypage.shion.pro"
+      port: ""
+    backend:
+      protocol: "https://"
+      domain: "ynufes-mypage.shion.pro"
+      port: ""
+    # CONCATING PROTOCOL, DOMAIN, AND PORT TOGETHER SHOULD GIVE THE FULL URL
+infrastructure:
+  firestore:
+    project_id: "ynufes-mypage"
+    json_credential_file: "TESTING"
+third_party:
+  line_login:
+    client_id: "LINE_AUTH_CLIENT_ID"
+    client_secret: "LINE_AUTH_CLIENT_SECRET"
+    callback_uri: "LINE_AUTH_CALLBACK_URI"
+    cipher_key: "LINE_AUTH_CIPHER_KEY_TEST_TEST12"
+    # CIPHER KEY HAS TO BE 16, 24, OR 32 BYTES LONG
+    enable_line_auth: false
+    # DISABLE LINE AUTH ON TESTING
+service:
+  authentication:
+    secure_cookie: false
+    # DISABLE SECURE COOKIE ON TESTING

pkg/setting/files/setting.testing.yaml

@@ -2,5 +2,9 @@ package setting
 
 type (
 	Service struct {
+		Authentication Authentication `yaml:"authentication"`
+	}
+	Authentication struct {
+		SecureCookie bool `yaml:"secure_cookie"`
 	}
 )

pkg/setting/service.go

@@ -1,11 +1,14 @@
 package testutil
 
-import "ynufes-mypage-backend/svc/pkg/domain/model/user"
+import (
+	"ynufes-mypage-backend/pkg/identity"
+	"ynufes-mypage-backend/svc/pkg/domain/model/user"
+)
 
 func Users() []user.User {
 	return []user.User{
 		{
-			ID:     1234,
+			ID:     user.ID(identity.NewID(1234)),
 			Status: user.StatusNew,
 			Detail: user.Detail{
 				Name: user.Name{
@@ -24,12 +27,9 @@ func Users() []user.User {
 				EncryptedAccessToken:  "EncryptedAccessToken",
 				EncryptedRefreshToken: "EncryptedRefreshToken",
 			},
-			Dashboard: user.Dashboard{
-				Grants: []string{"grant1", "grant2"},
-			},
 		},
 		{
-			ID:     12344,
+			ID:     user.ID(identity.NewID(12344)),
 			Status: user.StatusRegistered,
 			Detail: user.Detail{
 				Name: user.Name{
@@ -48,9 +48,6 @@ func Users() []user.User {
 				EncryptedAccessToken:  "EncryptedAccessToken",
 				EncryptedRefreshToken: "EncryptedRefreshToken",
 			},
-			Dashboard: user.Dashboard{
-				Grants: []string{"grant1", "grant2"},
-			},
 		},
 	}
 }

pkg/testutil/sample_users.go

@@ -0,0 +1,2 @@
+go build -o ynufes-mypage-backend ./svc/cmd/dev/main.go
+sudo systemctl restart ynufes-mypage