From 188a3084d54ea58b718a1b648266273a7b36f95b Mon Sep 17 00:00:00 2001 From: André Manoel Date: Mon, 15 May 2017 13:31:12 -0300 Subject: [PATCH] incluindo campo sigla no retorno da autenticação --- controlador_ws.php | 19 +++++++++++++++++++ rn/MdWsSeiUsuarioRN.php | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/controlador_ws.php b/controlador_ws.php index 4ec8dac..d579d68 100644 --- a/controlador_ws.php +++ b/controlador_ws.php @@ -32,6 +32,7 @@ class TokenValidationMiddleware{ } } + $config = array( 'settings' => array( 'determineRouteBeforeAppMiddleware' => true, @@ -41,6 +42,24 @@ $config = array( $app = new \Slim\App($config); +//Enable CORS +// $app->options('/{routes:.+}', function ($request, $response, $args) { +// return $response; +// }); + +// $app->add(function ($req, $res, $next) { +// $response = $next($req, $res); + +// //cabeçalhos encontrados na implementação do Mobile +// $strAllowHeaders = 'X-Requested-With, Content-Type, Accept, Origin, Authorization, Access-Control-Max-Age, If-Modified-Since' . +// 'token, User-Agent, Cookie, Content-Disposition, Content-Length, Transfer-Encoding, Accept-Encoding'; + +// return $response->withHeader('Access-Control-Allow-Origin', 'http://localhost:8100') //Especifico para o IONIC +// ->withHeader('Access-Control-Allow-Headers', $strAllowHeaders) +// ->withHeader('Access-Control-Allow-Credentials', 'true') +// ->withHeader('Access-Control-Allow-Methods', 'GET, PUT, POST, DELETE, OPTIONS, HEAD'); +// }); + /** * Grupo para a versao v1 de servicos REST */ diff --git a/rn/MdWsSeiUsuarioRN.php b/rn/MdWsSeiUsuarioRN.php index 01c6606..0af64fe 100644 --- a/rn/MdWsSeiUsuarioRN.php +++ b/rn/MdWsSeiUsuarioRN.php @@ -180,13 +180,17 @@ class MdWsSeiUsuarioRN extends InfraRN { $this->encriptaSenha($usuarioDTO->getStrSenha()), ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaSistema'), $siglaOrgao - ); + ); if(!$ret){ throw new InfraException('Usuário ou senha inválido!'); } $this->setaVariaveisAutenticacao(get_object_vars($ret)); + + //dados usuário $ret->id_unidade_atual = SessaoSEI::getInstance()->getNumIdUnidadeAtual(); + $ret->sigla = $usuarioDTO->getStrSigla(); + $token = $this->tokenEncode($usuarioDTO->getStrSigla(), $usuarioDTO->getStrSenha()); $arrUnidades = array(); -- libgit2 0.21.2