From 68972edc7d6e45a4818f35085655d40ca87b9489 Mon Sep 17 00:00:00 2001 From: Vitoria Date: Thu, 23 Jan 2025 16:56:09 -0300 Subject: [PATCH 1/2] =?UTF-8?q?Novo=20Ambiente|=20Atualiza=C3=A7=C3=A3o=20?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/routes/__pycache__/auth.cpython-311.pyc | Bin 9116 -> 9129 bytes app/routes/__pycache__/zammad.cpython-311.pyc | Bin 2006 -> 3255 bytes app/routes/auth.py | 4 ++- app/routes/zammad.py | 29 ++++++++++++++++-- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/routes/__pycache__/auth.cpython-311.pyc b/app/routes/__pycache__/auth.cpython-311.pyc index 030428995ff6c609696e2e56e7f189a251fcde5a..22e0c3b81c3acae217fb386a88200775cc818e94 100644 GIT binary patch delta 283 zcmbQ^zS5m{IWI340}!08nUr3zk#{){W8CJgJXWlXJ(E8O{$s0QNl~1`y!n&RPZlZW zA|ar{A_E|Ci!CKTH!(Bsb6hR^v)L8>`CZ{SI zGe%FIsp!cVHTkikI%DW&Zlz>Ky)Z_`AjS_2VCo|?1Cz!TM)eO&$f8imB1@nT07%YJ A@Bjb+ delta 258 zcmZ4KKF6JRIWI340}xzinV2rSk#{){W6b8QJXWlX-IG5E{$oi|oWr#Fi_lLNZl)q3 zpt2$ZAhAiJi;3eFTS|UzVrJgteyItJU7Ho8!Mi;|s!m7kK<0@Ca;9mA}Ghso<;1a7Nu0NS;+S4A5piC&39K70vu* zna_(e0@>$fc|oL>S%4bz1qG1E1vSQT2DS@Uw(j6Fm;rmnIWrEy zGAmR?Di8axHz`pz-L=>%P^ByNsoL#h$-`D^rSWR2S|e4eROKOWj*>{*JoP_ga4=h> zJoNa?f6n>OcmDrezVjb%`28LP>66btPX5P@(7$P8C)u_u&k9hvgD}EO3ZP~iF&B2k+}IiOh^~TnN4vYkF6>S+ zzxULR6CK!l8$AHv!z#G874uW7cWPqA16yS|TDg9XTPL7I5z9yryL$;qa;cKF9+@gMCA1!a_z0-#lghWO1th z^7LD$g`dyAtxSz4Cazr_A2`!bZs0Quv)AV5C;D@9rzeug>WuPip22Q7Nm#{0x)Lj`aCvT_Iuq<&wD9Cqo-6F~x`Rf0 z&V0p&eYa8GHnvx9-@UrLy>|WBOINlVf&IH@LDvXvV16axy8CRch23ass{?7i9W+7< z)qPp0a=H_dlPiuIp8>7u)tJ1a*252d;`%u@!Op<#T5-JZnA|Rx813jQEC0hw!~e(2 z61v6Bpd}`B;Hv4sN?MR)(=HOCknCabKc=L&zLF({m$$xD_&J5hVnV`-^dXQg=bNI} zinlJ;xm>-F$)u!&ph=1xrdKh7DhR|+?aEqz8yU#b1XM$dZB=JjHG#AuI{_^u7lx@R*|UbbR+Y9kXz17~@S|^EmY&0P&4zYB@M?=hwoGS;k`PrDtP8xVKpc@Y!5SH=BX;V- zCXl2`+Mr5owC$@LOWcY+rfXIJre#UWbZtNWs_CVq%c}8&f`OehA^}ImTbk(+ZzaSG zjZ>;wf35Og;o^?UuNbehCoS;tB+t?R?!Owsyq0>^?&$Vzw@`=oiF;k4S)CQPygj@C?m#x zp803s&|Rl~ETSJiTMR^vK=kW`9vIbKqh;Gkdy*+TP}|wB#`V?+$~EqBu=&$yf!lod>sdWGS`3aF!O=ArnDI3l-Zu(^-+8-qZ&&G1 z+nw~s>5r68m9;7anUu zZH6~oMy!2?*)1Oj4(Z26{xuQzlZeL+enST zp6!yBsqw$hT-V?GMR6u>%*6G>zl2;22u48A6LWfCPIv9i)Lhw4Z9zpHhSU7x=*bH% z^yl{DAh%qNV-aqvg&$+NttbQaN35U906#XwJqlZzAvsLa&UYp^ZJi)c54^Q8nF1ou6ch{(?#6YFS$-3>CUpTZ&AN!Ss}vK$$(o(0!-!DTmnl+ikQs3B6_8tF8*bTE%|>)pZ>u delta 1027 zcmb_aO-vI(6n-Wjxq7T$yuOF8?R1g-pqXOd+&Yo^R?s0smP~r zSO?K|q*8WDDMi}Ra_P#Yrx+|mi6vJsKvj&RmQbja2v9kpT1r`Kpv^N?XdsK$)z&zw zEki}nsy;QLQ#=82y|fkMD$1Y(ZlnICKM3F*Xh4zcGXXxp8m5?%Ra^wu*W%$+TEj); z$|vL;X{-yV090OADgvqcXb~51PHJ#yVD>N{ixqHL2L2j%FA+D~a03)bMM$cOanxua zBV;!-sM?&+lPdNBpRcXr)(p*TFP90fF9#r}E;T}P{{8j<>nlnvMRoT~gC|5vttIF` zMQJdD(|8gn6r~r^#PPg{+_NWHj;l;Hot}pNPnkt{MkZkq#lw&JxO7)$swm6L(na%m z`$NWTBV`-Yc_*D>hC7pJt>=TdLVbvX)y9I&R9%JIS<7t-6$R z>;>jsAV=CwBC`k|*1B|LIo_Wz4C8I!o>`B~&4?hDJWkF`;R}i3OpAwo3H#D{zN=l< z&056kD`bzK*01;MMLXZ${vI{Aqh@)c7VWKtdVfYccRI$tjBei;t#yov&fn;}gRkyi zc%Z;HBPQ&I(l#^&B#@^R9I$_%r+#2(WHp4%9pIHqFmj!z?bg-uHA?cret@ABAr9?c*+# WMf>2{Uj%U9HoDr39eG% Date: Thu, 23 Jan 2025 20:00:40 +0000 Subject: [PATCH 2/2] revert 68972edc7d6e45a4818f35085655d40ca87b9489 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert Novo Ambiente | Atualização 2 --- app/routes/__pycache__/auth.cpython-311.pyc | Bin 9129 -> 9116 bytes app/routes/__pycache__/zammad.cpython-311.pyc | Bin 3255 -> 2006 bytes app/routes/auth.py | 4 +-- app/routes/zammad.py | 29 ++---------------- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/app/routes/__pycache__/auth.cpython-311.pyc b/app/routes/__pycache__/auth.cpython-311.pyc index 22e0c3b81c3acae217fb386a88200775cc818e94..030428995ff6c609696e2e56e7f189a251fcde5a 100644 GIT binary patch delta 258 zcmZ4KKF6JRIWI340}xzinV2rSk#{){W6b8QJXWlX-IG5E{$oi|oWr#Fi_lLNZl)q3 zpt2$ZAhAiJi;3eFTS|UzVrJgteyItJU7Ho8!Mi;|s!m7kK<0@Ca;9mA}Ghso<;1a7Nu0NS;+S4A5piC&39K70vu* zna_(e0@>$fc|oL>S%4bz1qG1E1vSb6hR^v)L8>`CZ{SI zGe%FIsp!cVHTkikI%DW&Zlz>Ky)Z_`AjS_2VCo|?1Cz!TM)eO&$f8imB1@nT07%YJ A@Bjb+ diff --git a/app/routes/__pycache__/zammad.cpython-311.pyc b/app/routes/__pycache__/zammad.cpython-311.pyc index a66149efc620944af4ad8987bada2bb8c9d7b4ee..cb928415f1925ec5edff07d4b148a144ae4d9d9c 100644 GIT binary patch delta 1027 zcmb_aO-vI(6n-Wjxq7T$yuOF8?R1g-pqXOd+&Yo^R?s0smP~r zSO?K|q*8WDDMi}Ra_P#Yrx+|mi6vJsKvj&RmQbja2v9kpT1r`Kpv^N?XdsK$)z&zw zEki}nsy;QLQ#=82y|fkMD$1Y(ZlnICKM3F*Xh4zcGXXxp8m5?%Ra^wu*W%$+TEj); z$|vL;X{-yV090OADgvqcXb~51PHJ#yVD>N{ixqHL2L2j%FA+D~a03)bMM$cOanxua zBV;!-sM?&+lPdNBpRcXr)(p*TFP90fF9#r}E;T}P{{8j<>nlnvMRoT~gC|5vttIF` zMQJdD(|8gn6r~r^#PPg{+_NWHj;l;Hot}pNPnkt{MkZkq#lw&JxO7)$swm6L(na%m z`$NWTBV`-Yc_*D>hC7pJt>=TdLVbvX)y9I&R9%JIS<7t-6$R z>;>jsAV=CwBC`k|*1B|LIo_Wz4C8I!o>`B~&4?hDJWkF`;R}i3OpAwo3H#D{zN=l< z&056kD`bzK*01;MMLXZ${vI{Aqh@)c7VWKtdVfYccRI$tjBei;t#yov&fn;}gRkyi zc%Z;HBPQ&I(l#^&B#@^R9I$_%r+#2(WHp4%9pIHqFmj!z?bg-uHA?cret@ABAr9?c*+# WMf>2{Uj%U9HoDr39eG%QT2DS@Uw(j6Fm;rmnIWrEy zGAmR?Di8axHz`pz-L=>%P^ByNsoL#h$-`D^rSWR2S|e4eROKOWj*>{*JoP_ga4=h> zJoNa?f6n>OcmDrezVjb%`28LP>66btPX5P@(7$P8C)u_u&k9hvgD}EO3ZP~iF&B2k+}IiOh^~TnN4vYkF6>S+ zzxULR6CK!l8$AHv!z#G874uW7cWPqA16yS|TDg9XTPL7I5z9yryL$;qa;cKF9+@gMCA1!a_z0-#lghWO1th z^7LD$g`dyAtxSz4Cazr_A2`!bZs0Quv)AV5C;D@9rzeug>WuPip22Q7Nm#{0x)Lj`aCvT_Iuq<&wD9Cqo-6F~x`Rf0 z&V0p&eYa8GHnvx9-@UrLy>|WBOINlVf&IH@LDvXvV16axy8CRch23ass{?7i9W+7< z)qPp0a=H_dlPiuIp8>7u)tJ1a*252d;`%u@!Op<#T5-JZnA|Rx813jQEC0hw!~e(2 z61v6Bpd}`B;Hv4sN?MR)(=HOCknCabKc=L&zLF({m$$xD_&J5hVnV`-^dXQg=bNI} zinlJ;xm>-F$)u!&ph=1xrdKh7DhR|+?aEqz8yU#b1XM$dZB=JjHG#AuI{_^u7lx@R*|UbbR+Y9kXz17~@S|^EmY&0P&4zYB@M?=hwoGS;k`PrDtP8xVKpc@Y!5SH=BX;V- zCXl2`+Mr5owC$@LOWcY+rfXIJre#UWbZtNWs_CVq%c}8&f`OehA^}ImTbk(+ZzaSG zjZ>;wf35Og;o^?UuNbehCoS;tB+t?R?!Owsyq0>^?&$Vzw@`=oiF;k4S)CQPygj@C?m#x zp803s&|Rl~ETSJiTMR^vK=kW`9vIbKqh;Gkdy*+TP}|wB#`V?+$~EqBu=&$yf!lod>sdWGS`3aF!O=ArnDI3l-Zu(^-+8-qZ&&G1 z+nw~s>5r68m9;7anUu zZH6~oMy!2?*)1Oj4(Z26{xuQzlZeL+enST zp6!yBsqw$hT-V?GMR6u>%*6G>zl2;22u48A6LWfCPIv9i)Lhw4Z9zpHhSU7x=*bH% z^yl{DAh%qNV-aqvg&$+NttbQaN35U906#XwJqlZzAvsLa&UYp^ZJi)c54^Q8nF1ou6ch{(?#6YFS$-3>CUpTZ&AN!Ss}vK$$(o(0!-!DTmnl+ikQs3B6_8tF8*bTE%|>)pZ>u diff --git a/app/routes/auth.py b/app/routes/auth.py index 093703c..60f61ba 100644 --- a/app/routes/auth.py +++ b/app/routes/auth.py @@ -133,9 +133,7 @@ def login(): conn.unbind() logging.info(f"Login bem-sucedido para usuário: {username_full}") - # No final da função login, após gerar o token - return jsonify({'msg': 'Login bem-sucedido', 'token': token, 'domain': domain}), 200 - + return jsonify({'msg': 'Login bem-sucedido', 'token': token}), 200 else: conn.unbind() logging.warning(f"Falha na autenticação LDAP para o usuário: {username_full}") diff --git a/app/routes/zammad.py b/app/routes/zammad.py index 7fcc857..b40b7b2 100644 --- a/app/routes/zammad.py +++ b/app/routes/zammad.py @@ -1,6 +1,5 @@ from flask import Blueprint, jsonify, request import requests -from .auth import token_required # Blueprint para rotas relacionadas ao Zammad zammad = Blueprint('zammad', __name__) @@ -11,13 +10,7 @@ zammad_token = "kT0IXO8aVhPoTLcMRNL290rqd9jbRhhM0zf8MgBo3n00NLChToSU6rOGnMgWA0M2 # Rota para listar tickets @zammad.route('/tickets', methods=['GET']) -@token_required def listar_tickets(): - domain = request.args.get('domain') - - if not domain: - return jsonify({"error": "Domínio não fornecido"}), 400 - try: # Cabeçalho de autenticação para a API Zammad headers = { @@ -26,32 +19,16 @@ def listar_tickets(): } # Faz a requisição para a API Zammad - url = f"{base_url}/tickets?domain={domain}" # Construindo a URL com o parâmetro 'domain' - + url = f"{base_url}/tickets" response = requests.get(url, headers=headers, timeout=10) # Timeout adicionado para evitar requisições travadas # Processa a resposta if response.status_code == 200: tickets = response.json() - tickets_filtrados =[ - { - "title": ticket.get("title"), - "type": ticket.get("type"), - "created_at": ticket.get("created_at"), - "close_at": ticket.get("close_at"), - "state_id": ticket.get("state_id"), - "pending_time": ticket.get("pending_time"), - "number": ticket.get("number"), - "organization_id": ticket.get("organization_id"), - "customer_id": ticket.get("customer_id"), - } - for ticket in tickets - ] - - return jsonify(tickets_filtrados), 200 + return jsonify(tickets), 200 else: return jsonify({ - "error": f"Erro ao buscar tickets: {response.status_code}", + "error": f"Erro ao buscar tickets: {response.status_code}", "details": response.text }), response.status_code