3636from genesis_core .config import constants as cc
3737from genesis_core .secret import constants as sc
3838from genesis_core .secret .dm import models as secret_models
39-
39+ from genesis_core . user_api . iam . dm import models as iam_models
4040
4141FIRST_MIGRATION = "0000-root-d34de1.py"
4242
@@ -136,17 +136,21 @@ def auth_test1_user(
136136):
137137 password = "test1"
138138 client = user_api_client (auth_user_admin )
139- result = client .create_user (username = "test1" , password = password )
140- client .confirm_email (result ["uuid" ])
139+ user = client .create_user (username = "test1" , password = password )
140+ user_obj = iam_models .User .objects .get_one (filters = {"uuid" : user ["uuid" ]})
141+ client .confirm_email (
142+ user_uuid = user_obj .uuid ,
143+ code = str (user_obj .confirmation_code ),
144+ )
141145
142146 return iam_clients .GenesisCoreAuth (
143- username = result ["username" ],
147+ username = user ["username" ],
144148 password = password ,
145149 client_uuid = default_client_uuid ,
146150 client_id = default_client_id ,
147151 client_secret = default_client_secret ,
148- uuid = result ["uuid" ],
149- email = result ["email" ],
152+ uuid = user ["uuid" ],
153+ email = user ["email" ],
150154 )
151155
152156
@@ -160,17 +164,21 @@ def auth_test2_user(
160164):
161165 password = "test2"
162166 client = user_api_client (auth_user_admin )
163- result = client .create_user (username = "test2" , password = password )
164- client .confirm_email (result ["uuid" ])
167+ user = client .create_user (username = "test2" , password = password )
168+ user_obj = iam_models .User .objects .get_one (filters = {"uuid" : user ["uuid" ]})
169+ client .confirm_email (
170+ user_uuid = user_obj .uuid ,
171+ code = str (user_obj .confirmation_code ),
172+ )
165173
166174 return iam_clients .GenesisCoreAuth (
167- username = result ["username" ],
175+ username = user ["username" ],
168176 password = password ,
169177 client_uuid = default_client_uuid ,
170178 client_id = default_client_id ,
171179 client_secret = default_client_secret ,
172- uuid = result ["uuid" ],
173- email = result ["email" ],
180+ uuid = user ["uuid" ],
181+ email = user ["email" ],
174182 )
175183
176184
@@ -185,7 +193,11 @@ def auth_test1_p1_user(
185193 password = "test1p1"
186194 client = user_api_client (auth_user_admin )
187195 user = client .create_user (username = "test1p1" , password = password )
188- client .confirm_email (user_uuid = user ["uuid" ])
196+ user_obj = iam_models .User .objects .get_one (filters = {"uuid" : user ["uuid" ]})
197+ client .confirm_email (
198+ user_uuid = user_obj .uuid ,
199+ code = str (user_obj .confirmation_code ),
200+ )
189201
190202 auth = iam_clients .GenesisCoreAuth (
191203 username = user ["username" ],
@@ -198,9 +210,7 @@ def auth_test1_p1_user(
198210 project_id = None ,
199211 )
200212
201- client = client = user_api_client (
202- auth ,
203- )
213+ client = user_api_client (auth )
204214
205215 org = client .create_organization (name = "OrganizationU1P1" )
206216 project = client .create_project (
@@ -232,7 +242,11 @@ def auth_test2_p1_user(
232242 password = "test2p1"
233243 client = user_api_client (auth_user_admin )
234244 user = client .create_user (username = "test2p1" , password = password )
235- client .confirm_email (user_uuid = user ["uuid" ])
245+ user_obj = iam_models .User .objects .get_one (filters = {"uuid" : user ["uuid" ]})
246+ client .confirm_email (
247+ user_uuid = user_obj .uuid ,
248+ code = str (user_obj .confirmation_code ),
249+ )
236250
237251 auth = iam_clients .GenesisCoreAuth (
238252 username = user ["username" ],
@@ -245,9 +259,7 @@ def auth_test2_p1_user(
245259 project_id = None ,
246260 )
247261
248- client = client = user_api_client (
249- auth ,
250- )
262+ client = user_api_client (auth )
251263
252264 org = client .create_organization (name = "OrganizationU2P1" )
253265 project = client .create_project (
0 commit comments