Merge pull request #28 from MZC-CSC/feature_standalone

Feature standalone

Author: raccoon-mh

.gitignore

@@ -34,7 +34,6 @@ api/!.yarn/sdks
 api/!.yarn/versions
 
 
-
 # front
 
 ## env
@@ -68,14 +67,15 @@ front/.idea
 
 # bin
 bin/mc-web-console-api
+bin/mc-web-console-api.pid
+bin/mc-web-console-api.log
 bin/.env
 
+# conf
+conf/api.yaml
+conf/selfiamauthsetting.yaml
+conf/selfiamuser.dat
+conf/serverinfo
+
+# scripts
 scripts/.env
-api/conf/api.yaml
-bin/mc-web-console-api.log
-bin/conf/api.yaml
-api/conf/serverinfo
-api/conf/cmiguser.dat
-api/conf/cmigauthsetting.yaml
-api/conf/selfiamuser.dat
-api/conf/selfiamauthsetting.yaml

api/actions/app.go

@@ -38,7 +38,6 @@ func App() *buffalo.App {
 			SessionName: "mc_web_console",
 			Addr:        os.Getenv("API_ADDR") + ":" + os.Getenv("API_PORT"),
 		})
-
 		app.Use(paramlogger.ParameterLogger)
 		app.Use(contenttype.Set("application/json"))
 		app.Use(popmw.Transaction(models.DB))

api/actions/auth.go

@@ -53,14 +53,14 @@ func AuthLoginRefresh(c buffalo.Context) error {
 	userId := c.Value("UserId").(string)
 	sess, err := self.GetUserByUserId(tx, userId)
 	if err != nil {
-		log.Println(err.Error())
+		app.Logger.Error(err.Error())
 		commonResponse := handler.CommonResponseStatusBadRequest(err.Error())
 		return c.Render(commonResponse.Status.StatusCode, r.JSON(commonResponse))
 	}
 
 	tokenSet, err := self.RefreshAccessToken(sess.RefreshToken)
 	if err != nil {
-		log.Println(err.Error())
+		app.Logger.Error(err.Error())
 		commonResponse := handler.CommonResponseStatusBadRequest(err.Error())
 		return c.Render(commonResponse.Status.StatusCode, r.JSON(commonResponse))
 	}
@@ -72,7 +72,7 @@ func AuthLoginRefresh(c buffalo.Context) error {
 
 	_, err = self.UpdateUserSess(tx, sess)
 	if err != nil {
-		log.Println(err.Error())
+		app.Logger.Error(err.Error())
 		commonResponse := handler.CommonResponseStatusBadRequest(err.Error())
 		return c.Render(commonResponse.Status.StatusCode, r.JSON(commonResponse))
 	}

api/actions/middleware.go

@@ -2,7 +2,6 @@ package actions
 
 import (
 	"fmt"
-	"log"
 	"mc_web_console_api/handler/self"
 	"net/http"
 	"strings"
@@ -18,7 +17,7 @@ func DefaultMiddleware(next buffalo.Handler) buffalo.Handler {
 		accessToken := strings.TrimPrefix(c.Request().Header.Get("Authorization"), "Bearer ")
 		claims, err := self.GetCmigTokenClaims(accessToken)
 		if err != nil {
-			log.Println(err.Error())
+			app.Logger.Error(err.Error())
 			return c.Render(http.StatusUnauthorized, render.JSON(map[string]interface{}{"error": "Unauthorized"}))
 		}
 		tx := c.Value("tx").(*pop.Connection)

api/go.mod

@@ -16,10 +16,13 @@ require (
 	github.com/gobuffalo/validate/v3 v3.3.3
 	github.com/gobuffalo/x v0.1.0
 	github.com/gofrs/uuid v4.4.0+incompatible
+	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/m-cmp/mc-iam-manager v0.2.10
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/rs/cors v1.11.0
 	github.com/spf13/viper v1.19.0
+	golang.org/x/crypto v0.26.0
+	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
@@ -46,7 +49,6 @@ require (
 	github.com/gobuffalo/refresh v1.13.3 // indirect
 	github.com/gobuffalo/tags/v3 v3.1.4 // indirect
 	github.com/goccy/go-json v0.10.3 // indirect
-	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/gorilla/handlers v1.5.2 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
@@ -99,7 +101,6 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/mod v0.18.0 // indirect
 	golang.org/x/net v0.26.0 // indirect
@@ -109,6 +110,5 @@ require (
 	golang.org/x/text v0.17.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

api/handler/http-util.go

@@ -69,7 +69,7 @@ var (
 func init() {
 	viper.SetConfigName("api")
 	viper.SetConfigType("yaml")
-	viper.AddConfigPath("conf")
+	viper.AddConfigPath("../conf")
 
 	if err := viper.ReadInConfig(); err != nil {
 		panic(fmt.Errorf("fatal error reading actions/conf/api.yaml file: %s", err))

api/handler/mciammanager/middleware.go

@@ -48,7 +48,7 @@ func DefaultMiddleware(next buffalo.Handler) buffalo.Handler {
 		err := iamtokenvalidator.IsTokenValid(accessToken)
 		if err != nil {
 			log.Println(err.Error())
-			return c.Render(http.StatusInternalServerError, render.JSON(map[string]interface{}{"error": err.Error()}))
+			return c.Render(http.StatusUnauthorized, render.JSON(map[string]interface{}{"error": err.Error()}))
 		}
 		claims, err := iamtokenvalidator.GetTokenClaimsByIamManagerClaims(accessToken)
 		if err != nil {

api/handler/self/auth.go

@@ -40,8 +40,8 @@ var (
 	CmigUser        *User
 	cmigAuthSetting CmigAuthSetting
 	encryptionKey   []byte
-	datfilename     = "conf/selfiamuser.dat"
-	conffilename    = "conf/selfiamauthsetting.yaml"
+	datfilename     = "../conf/selfiamuser.dat"
+	conffilename    = "../conf/selfiamauthsetting.yaml"
 )
 
 func init() {

api/handler/self/menu.go

@@ -55,7 +55,7 @@ func buildMenuTree(menus Menus, parentID string) Menus {
 }
 
 func createMenuResource() error {
-	yamlFile := "./conf/selfiammenu.yaml"
+	yamlFile := "../conf/selfiammenu.yaml"
 
 	data, err := os.ReadFile(yamlFile)
 	if err != nil {
@@ -170,8 +170,7 @@ func getCreateWebMenuByYamlEndpoint() string {
 		log.Fatalf("Error reading config file, %s", err)
 	}
 	baseUrl := viper.Get("services.mc-iam-manager.baseurl").(string)
-	createwebmenubyyamlUri := viper.Get("serviceActions.mc-iam-manager.Createwebmenubyyaml.resourcePath").(string)
+	createwebmenubyyamlUri := viper.Get("serviceActions.mc-iam-manager.Createmenuresourcesbymenuyaml.resourcePath").(string)
 	urlModified := strings.ReplaceAll(baseUrl+createwebmenubyyamlUri, "{framework}", "web")
-	fmt.Println("Createwebmenubyyaml Endpoint is : ", urlModified)
 	return urlModified
 }

bin/.env.sample

@@ -0,0 +1,16 @@
+API_ADDR=0.0.0.0
+API_PORT=3000
+
+DATABASE_USER=DATABASE_USER  # Please CHANGE ME (REQUIRE)
+DATABASE_PASS=DATABASE_PASS  # Please CHANGE ME (REQUIRE)
+DATABASE_HOST=DATABASE_HOST  # Please CHANGE ME (REQUIRE)
+DATABASE=DATABASE  # Please CHANGE ME (REQUIRE)
+DEV_DATABASE_URL=postgres://${DATABASE_USER}:${DATABASE_PASS}@${DATABASE_HOST}:5432/${DATABASE}
+
+PROD_DATABASE_USER=DATABASE_USER  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE_PASS=DATABASE_PASS  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE_HOST=DATABASE_HOST  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE=DATABASE  # Please CHANGE ME (REQUIRE)
+PROD_DATABASE_URL=postgres://${DATABASE_USER}:${DATABASE_PASS}@${DATABASE_HOST}:5432/${DATABASE}
+
+MCIAM_USE=true