@@ -205,6 +205,12 @@ async def validateEmbedded(self, param: str, trans: I18n) -> tuple[any]:
205205 return False , f"Miss account payload error!"
206206 account = payload ['account' ]
207207 with Session (engine ) as session :
208+ assistant_info = await get_assistant_info (session = session , assistant_id = embeddedId )
209+ assistant_info = AssistantModel .model_validate (assistant_info )
210+ payload = jwt .decode (
211+ param , assistant_info .app_secret , algorithms = [security .ALGORITHM ]
212+ )
213+ assistant_info = AssistantHeader .model_validate (assistant_info .model_dump (exclude_unset = True ))
208214 """ session_user = await get_user_info(session = session, user_id = token_data.id)
209215 session_user = UserInfoDTO.model_validate(session_user) """
210216 session_user = get_user_by_account (session = session , account = account )
@@ -220,12 +226,7 @@ async def validateEmbedded(self, param: str, trans: I18n) -> tuple[any]:
220226 if not session_user .oid or session_user .oid == 0 :
221227 message = trans ('i18n_login.no_associated_ws' , msg = trans ('i18n_concat_admin' ))
222228 raise Exception (message )
223- assistant_info = await get_assistant_info (session = session , assistant_id = embeddedId )
224- assistant_info = AssistantModel .model_validate (assistant_info )
225- payload = jwt .decode (
226- param , assistant_info .app_secret , algorithms = [security .ALGORITHM ]
227- )
228- assistant_info = AssistantHeader .model_validate (assistant_info .model_dump (exclude_unset = True ))
229+
229230 return True , session_user , assistant_info
230231 except Exception as e :
231232 SQLBotLogUtil .exception (f"Embedded validation error: { str (e )} " )
0 commit comments