|
|
@@ -1,7 +1,9 @@
|
|
|
package project
|
|
|
|
|
|
import (
|
|
|
+ "fmt"
|
|
|
"net/http"
|
|
|
+ "strings"
|
|
|
|
|
|
"github.com/porter-dev/porter/api/server/handlers"
|
|
|
"github.com/porter-dev/porter/api/server/shared"
|
|
|
@@ -31,22 +33,26 @@ func (p *ProjectInviteAdminHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
|
|
|
InstanceEnvConf, _ := envloader.FromEnv()
|
|
|
adminUserId := InstanceEnvConf.ServerConf.AdminUserId
|
|
|
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
|
|
|
}
|
|
|
|
|
|
// Read the user and project from context
|
|
|
+ user, _ := r.Context().Value(types.UserScope).(*models.User)
|
|
|
proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
|
|
|
|
|
|
// Create role for admin if it doesn't exist
|
|
|
projectRepo := p.Repo().Project()
|
|
|
role, _ := projectRepo.ReadProjectRole(proj.ID, adminUserId)
|
|
|
- if role == nil {
|
|
|
+ isPorterUser := strings.Contains(user.Email, "@porter.run")
|
|
|
+ if role == nil && !isPorterUser {
|
|
|
projectRepo.CreateProjectRole(proj, &models.Role{
|
|
|
Role: types.Role{
|
|
|
UserID: adminUserId,
|
|
|
@@ -56,5 +62,5 @@ func (p *ProjectInviteAdminHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- p.WriteResult(w, r, proj.ToProjectType())
|
|
|
+ p.WriteResult(w, r, user.ToUserType())
|
|
|
}
|