smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

121 changed auth

Browse Source
This commit is contained in:
msyu
2025-07-02 19:20:54 +03:00
parent a1278b00e7
commit 16ec60208a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/Application.cfc
+8 -8
View File
@@ -51,7 +51,7 @@
//variables.framework.docs={}; //variables.framework.docs={};
variables.framework.docs.APIName="Deck API"; variables.framework.docs.APIName="Deck API";
variables.framework.docs.APIVersion="0.120"; /*$ git config --global --unset user.password*/ variables.framework.docs.APIVersion="0.121"; /*$ git config --global --unset user.password*/
variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders = structNew();
@@ -151,13 +151,13 @@
<cfswitch expression=#stand#> <cfswitch expression=#stand#>
<cfcase value=",dev"> <cfcase value=",dev">
<cfreturn "https://auth-api-dev.ngcloud.ru/api/v1/user"/> <cfreturn "https://auth-api-dev.ngcloud.ru/api/v1/auth/user"/>
</cfcase> </cfcase>
<cfcase value="test"> <cfcase value="test">
<cfreturn "https://auth-api-test.ngcloud.ru/api/v1/user"/> <cfreturn "https://auth-api-test.ngcloud.ru/api/v1/auth/user"/>
</cfcase> </cfcase>
<cfcase value="prod"> <cfcase value="prod">
<cfreturn "https://auth-api.ngcloud.ru/api/v1/user"/> <cfreturn "https://auth-api.ngcloud.ru/api/v1/auth/user"/>
</cfcase> </cfcase>
<cfdefaultcase><!--- proceed to the legacy locator ---></cfdefaultcase> <cfdefaultcase><!--- proceed to the legacy locator ---></cfdefaultcase>
</cfswitch> </cfswitch>
@@ -168,7 +168,7 @@
</cftry> </cftry>
<!--- вот если ничего не прописано, попробуем по-старинке ---> <!--- вот если ничего не прописано, попробуем по-старинке --->
<cfloop list="https://auth-api-dev.ngcloud.ru/api/v1/user,https://auth-api-test.ngcloud.ru/api/v1/user,https://auth-api.ngcloud.ru/api/v1/user" index="serviceUrl"><!--- *** начиная с девелоперского ---> <cfloop list="https://auth-api-dev.ngcloud.ru/api/v1/auth/user,https://auth-api-test.ngcloud.ru/api/v1/auth/user,https://auth-api.ngcloud.ru/api/v1/auth/user" index="serviceUrl"><!--- *** начиная с девелоперского --->
<cftry> <cftry>
<cfhttp url=#serviceUrl# method="OPTIONS" result="resp" timeout=1/> <cfhttp url=#serviceUrl# method="OPTIONS" result="resp" timeout=1/>
@@ -266,13 +266,13 @@
//writeDump(result); abort; //writeDump(result); abort;
try { try {
var idpUserData=deserializeJson(result); var idpUserData=deserializeJson(result);
arguments.requestArguments.companyUid=idpUserData.companyId;//GUID! arguments.requestArguments.companyUid=idpUserData.userInfo.companyId;//GUID!
arguments.requestArguments.usrUid=idpUserData.contactId;//userId; //GUID! arguments.requestArguments.usrUid=idpUserData.userInfo.contactId;//userId; //GUID!
} catch (e) { } catch (e) {
return representationOf( {"exception"=e, "idpResponse"=result} ); return representationOf( {"exception"=e, "idpResponse"=result} );
} }
var usrCustomerInfo=getUsrCustomerInfo(idpUserData.contactId); var usrCustomerInfo=getUsrCustomerInfo(idpUserData.userInfo.contactId);
if (lCase(arguments.cfc) EQ 'user') { if (lCase(arguments.cfc) EQ 'user') {
if (structIsEmpty(usrCustomerInfo)) return representationOf("User information not found").withStatus(404); if (structIsEmpty(usrCustomerInfo)) return representationOf("User information not found").withStatus(404);