11package coderd
22
33import (
4- "context"
54 "crypto/sha256"
65 "database/sql"
76 "errors"
@@ -11,6 +10,7 @@ import (
1110
1211 "github.com/go-chi/render"
1312 "github.com/google/uuid"
13+ "golang.org/x/xerrors"
1414
1515 "github.com/coder/coder/coderd/userpassword"
1616 "github.com/coder/coder/cryptorand"
@@ -27,11 +27,12 @@ type User struct {
2727 Username string `json:"username" validate:"required"`
2828}
2929
30- // CreateUserRequest enables callers to create a new user.
31- type CreateUserRequest struct {
32- Email string `json:"email" validate:"required,email"`
33- Username string `json:"username" validate:"required,username"`
34- Password string `json:"password" validate:"required"`
30+ // CreateInitialUserRequest enables callers to create a new user.
31+ type CreateInitialUserRequest struct {
32+ Email string `json:"email" validate:"required,email"`
33+ Username string `json:"username" validate:"required,username"`
34+ Password string `json:"password" validate:"required"`
35+ Organization string `json:"organization" validate:"required,username"`
3536}
3637
3738// LoginWithPasswordRequest enables callers to authenticate with email and password.
@@ -51,7 +52,7 @@ type users struct {
5152
5253// Creates the initial user for a Coder deployment.
5354func (users * users ) createInitialUser (rw http.ResponseWriter , r * http.Request ) {
54- var createUser CreateUserRequest
55+ var createUser CreateInitialUserRequest
5556 if ! httpapi .Read (rw , r , & createUser ) {
5657 return
5758 }
@@ -70,19 +71,6 @@ func (users *users) createInitialUser(rw http.ResponseWriter, r *http.Request) {
7071 })
7172 return
7273 }
73- _ , err = users .Database .GetUserByEmailOrUsername (r .Context (), database.GetUserByEmailOrUsernameParams {
74- Email : createUser .Email ,
75- Username : createUser .Username ,
76- })
77- if errors .Is (err , sql .ErrNoRows ) {
78- err = nil
79- }
80- if err != nil {
81- httpapi .Write (rw , http .StatusInternalServerError , httpapi.Response {
82- Message : fmt .Sprintf ("get user: %s" , err .Error ()),
83- })
84- return
85- }
8674 hashedPassword , err := userpassword .Hash (createUser .Password )
8775 if err != nil {
8876 httpapi .Write (rw , http .StatusInternalServerError , httpapi.Response {
@@ -91,28 +79,57 @@ func (users *users) createInitialUser(rw http.ResponseWriter, r *http.Request) {
9179 return
9280 }
9381
94- user , err := users .Database .InsertUser (context .Background (), database.InsertUserParams {
95- ID : uuid .NewString (),
96- Email : createUser .Email ,
97- HashedPassword : []byte (hashedPassword ),
98- Username : createUser .Username ,
99- LoginType : database .LoginTypeBuiltIn ,
100- CreatedAt : database .Now (),
101- UpdatedAt : database .Now (),
82+ // Create the user, organization, and membership to the user.
83+ var user database.User
84+ err = users .Database .InTx (func (s database.Store ) error {
85+ user , err = users .Database .InsertUser (r .Context (), database.InsertUserParams {
86+ ID : uuid .NewString (),
87+ Email : createUser .Email ,
88+ HashedPassword : []byte (hashedPassword ),
89+ Username : createUser .Username ,
90+ LoginType : database .LoginTypeBuiltIn ,
91+ CreatedAt : database .Now (),
92+ UpdatedAt : database .Now (),
93+ })
94+ if err != nil {
95+ return xerrors .Errorf ("create user: %w" , err )
96+ }
97+ organization , err := users .Database .InsertOrganization (r .Context (), database.InsertOrganizationParams {
98+ ID : uuid .NewString (),
99+ Name : createUser .Organization ,
100+ CreatedAt : database .Now (),
101+ UpdatedAt : database .Now (),
102+ })
103+ if err != nil {
104+ return xerrors .Errorf ("create organization: %w" , err )
105+ }
106+ _ , err = users .Database .InsertOrganizationMember (r .Context (), database.InsertOrganizationMemberParams {
107+ OrganizationID : organization .ID ,
108+ UserID : user .ID ,
109+ CreatedAt : database .Now (),
110+ UpdatedAt : database .Now (),
111+ Roles : []string {"organization-admin" },
112+ })
113+ if err != nil {
114+ return xerrors .Errorf ("create organization member: %w" , err )
115+ }
116+ return nil
102117 })
103118 if err != nil {
104119 httpapi .Write (rw , http .StatusInternalServerError , httpapi.Response {
105- Message : fmt . Sprintf ( "create user: %s" , err .Error () ),
120+ Message : err .Error (),
106121 })
107122 return
108123 }
124+
109125 render .Status (r , http .StatusCreated )
110126 render .JSON (rw , r , user )
111127}
112128
113- // Returns the currently authenticated user.
114- func (* users ) authenticatedUser (rw http.ResponseWriter , r * http.Request ) {
115- user := httpmw .User (r )
129+ // Returns the parameterized user requested. All validation
130+ // is completed in the middleware for this route.
131+ func (* users ) user (rw http.ResponseWriter , r * http.Request ) {
132+ user := httpmw .UserParam (r )
116133
117134 render .JSON (rw , r , User {
118135 ID : user .ID ,
@@ -122,6 +139,27 @@ func (*users) authenticatedUser(rw http.ResponseWriter, r *http.Request) {
122139 })
123140}
124141
142+ // Returns organizations the parameterized user has access to.
143+ func (users * users ) userOrganizations (rw http.ResponseWriter , r * http.Request ) {
144+ user := httpmw .UserParam (r )
145+
146+ organizations , err := users .Database .GetOrganizationsByUserID (r .Context (), user .ID )
147+ if err != nil {
148+ httpapi .Write (rw , http .StatusInternalServerError , httpapi.Response {
149+ Message : fmt .Sprintf ("get organizations: %s" , err .Error ()),
150+ })
151+ return
152+ }
153+
154+ publicOrganizations := make ([]Organization , 0 , len (organizations ))
155+ for _ , organization := range organizations {
156+ publicOrganizations = append (publicOrganizations , convertOrganization (organization ))
157+ }
158+
159+ render .Status (r , http .StatusOK )
160+ render .JSON (rw , r , publicOrganizations )
161+ }
162+
125163// Authenticates the user with an email and password.
126164func (users * users ) loginWithPassword (rw http.ResponseWriter , r * http.Request ) {
127165 var loginWithPassword LoginWithPasswordRequest
@@ -200,7 +238,7 @@ func (users *users) loginWithPassword(rw http.ResponseWriter, r *http.Request) {
200238}
201239
202240// Clear the user's session cookie
203- func logout (rw http.ResponseWriter , r * http.Request ) {
241+ func ( _ * users ) logout (rw http.ResponseWriter , r * http.Request ) {
204242 // Get a blank token cookie
205243 cookie := & http.Cookie {
206244 // MaxAge < 0 means to delete the cookie now
0 commit comments