瀏覽代碼

handle string conf for admin user

Justin Rhee 3 年之前
父節點
當前提交
67de958adb
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 4 4
      api/server/handlers/project/invite_admin.go
  2. 1 1
      api/server/shared/config/env/envconfs.go

+ 4 - 4
api/server/handlers/project/invite_admin.go

@@ -1,8 +1,8 @@
 package project
 
 import (
-	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
 
 	"github.com/porter-dev/porter/api/server/handlers"
@@ -31,16 +31,16 @@ func (p *ProjectInviteAdminHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 
 	// Only add admin user if config is set
 	InstanceEnvConf, _ := envloader.FromEnv()
-	adminUserId := InstanceEnvConf.ServerConf.AdminUserId
+	adminUserIdParsed, _ := strconv.ParseUint(InstanceEnvConf.ServerConf.AdminUserId, 10, 64)
+	adminUserId := uint(adminUserIdParsed)
+
 	if adminUserId == 0 {
-		fmt.Println("Admin user not set")
 		return
 	}
 
 	request := &types.ProjectInviteAdminRequest{}
 	ok := p.DecodeAndValidate(w, r, request)
 	if !ok {
-		fmt.Println("Failed to decode and validate")
 		return
 	}
 

+ 1 - 1
api/server/shared/config/env/envconfs.go

@@ -89,7 +89,7 @@ type ServerConf struct {
 	// admin user is the only user that can log in and register. After the admin
 	// user has logged in, registration is turned off.
 	AdminEmail  string `env:"ADMIN_EMAIL"`
-	AdminUserId uint   `env:"ADMIN_USER_ID"`
+	AdminUserId string `env:"ADMIN_USER_ID"`
 
 	SentryDSN string `env:"SENTRY_DSN"`
 	SentryEnv string `env:"SENTRY_ENV,default=dev"`