add new user and role table in app (in progress)

backend/main.go

@@ -14,6 +14,8 @@ import (
 	"strings"
 	"time"
 
+	"gitea.tecamino.com/paadi/tecamino-dbm/cert"
+
 	dbApi "gitea.tecamino.com/paadi/memberDB/api"
 	"gitea.tecamino.com/paadi/tecamino-logger/logging"
 	"github.com/gin-contrib/cors"
@@ -28,13 +30,16 @@ func main() {
 	spa := flag.String("spa", "./dist/spa", "quasar spa files")
 	workingDir := flag.String("workingDirectory", ".", "quasar spa files")
 	ip := flag.String("ip", "0.0.0.0", "server listening ip")
+	organization := flag.String("organization", "", "self signed ciertificate organization")
 	port := flag.Uint("port", 9500, "server listening port")
+	https := flag.Bool("https", false, "serves as https needs flag -cert and -chain")
+	sslCert := flag.String("cert", "", "ssl certificate path")
+	sslChain := flag.String("chain", "", "ssl chain path")
 	debug := flag.Bool("debug", false, "log debug")
 	flag.Parse()
 
 	//change working directory only if value is given
 	if *workingDir != "." && *workingDir != "" {
-		fmt.Println(1, *workingDir)
 		os.Chdir(*workingDir)
 	}
 
@@ -72,13 +77,18 @@ func main() {
 	dbHandler := dbApi.NewAPIHandler()
 
 	//get local ip
-	allowOrigins = append(allowOrigins, "http://localhost:9000", "http://localhost:9500", "http://127.0.0.1:9500")
+	httpString := "http://"
+	if *https {
+		httpString = "https://"
+
+	}
+	allowOrigins = append(allowOrigins, httpString+"localhost:9000", httpString+"localhost:9500", httpString+"127.0.0.1:9500")
 
 	localIP, err := utils.GetLocalIP()
 	if err != nil {
 		logger.Error("main", fmt.Sprintf("get local ip : %s", err.Error()))
 	} else {
-		allowOrigins = append(allowOrigins, fmt.Sprintf("http://%s:9000", localIP), fmt.Sprintf("http://%s:9500", localIP))
+		allowOrigins = append(allowOrigins, fmt.Sprintf("%s%s:9000", httpString, localIP), fmt.Sprintf("%s%s:9500", httpString, localIP))
 	}
 
 	s.Routes.Use(cors.New(cors.Config{
@@ -102,18 +112,26 @@ func main() {
 	//private
 	auth := api.Group("/secure", user.AuthMiddleware())
 
+	auth.GET("/users", userManager.GetUserById)
 	auth.GET("/members", dbHandler.GetMemberById)
+	auth.GET("/roles", userManager.GetRoleById)
 
 	auth.POST("database/open", dbHandler.OpenDatabase)
 	auth.POST("/members/add", dbHandler.AddNewMember)
 	auth.POST("/members/edit", dbHandler.EditMember)
 	auth.POST("/members/delete", dbHandler.DeleteMember)
 	auth.POST("/members/import/csv", dbHandler.ImportCSV)
-	auth.POST("/settings/update", userManager.UpdateSettings)
-	auth.POST("/user/add", userManager.AddUser)
-	auth.POST("/login/refresh", userManager.Refresh)
 
-	auth.DELETE("/user", userManager.RemoveUser)
+	auth.POST("/settings/update", userManager.UpdateSettings)
+
+	auth.POST("/roles/add", userManager.AddRole)
+	auth.POST("/roles/update", userManager.UpdateRole)
+	auth.POST("/roles/delete", userManager.DeleteRole)
+
+	auth.POST("/users/add", userManager.AddUser)
+	auth.POST("/users/delete", userManager.DeleteUser)
+
+	auth.POST("/login/refresh", userManager.Refresh)
 
 	// Serve static files
 	s.Routes.StaticFS("/assets", gin.Dir(filepath.Join(*spa, "assets"), true))
@@ -136,10 +154,29 @@ func main() {
 
 	go func() {
 		time.Sleep(500 * time.Millisecond)
-		if err := utils.OpenBrowser(fmt.Sprintf("http://localhost:%d", *port), logger); err != nil {
+		if err := utils.OpenBrowser(fmt.Sprintf("%slocalhost:%d", httpString, *port), logger); err != nil {
 			logger.Error("main", fmt.Sprintf("starting browser error : %s", err.Error()))
 		}
 	}()
+
+	if *https {
+		if *sslCert == "" {
+			logger.Error("ssl certificate", "-cert flag not given for https server")
+			log.Fatal("-cert flag not given for https server")
+		}
+		if *sslChain == "" {
+			logger.Error("ssl key", "-chain flag not given for https server")
+			log.Fatal("-chain flag not given for https server")
+		}
+
+		// start https server
+		logger.Info("main", fmt.Sprintf("https listen on ip: %s port: %d", *ip, *port))
+		if err := s.ServeHttps(*ip, *port, cert.Cert{Organization: *organization, CertFile: *sslCert, KeyFile: *sslChain}); err != nil {
+			logger.Error("main", "error https server "+err.Error())
+		}
+		return
+	}
+
 	// start http server
 	logger.Info("main", fmt.Sprintf("http listen on ip: %s port: %d", *ip, *port))
 	if err := s.ServeHttp(*ip, *port); err != nil {