sasjs/core
1
0
Fork 0
mirror of https://github.com/sasjs/core.git synced 2026-01-09 02:10:06 +00:00
Code Issues Projects Releases Wiki Activity

fix: adding base_uri in all calls to cover instances where viya calls are not on localhost

Browse Source
This commit is contained in:
vrh
2020-09-07 14:01:39 +02:00
parent 58358c916d
commit 3eae34d8b7
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
all.sas
View File

@@ -10603,7 +10603,7 @@ run;
libname &libref1 JSON fileref=&fname1; libname &libref1 JSON fileref=&fname1;
data _null_; data _null_;
set &libref1..links; set &libref1..links;
if rel='members' then call symputx('mref',quote(trim(href)),'l'); if rel='members' then call symputx('mref',quote("&base_uri"!!trim(href)),'l');
run; run;
/* get the children */ /* get the children */
@@ -10633,7 +10633,7 @@ run;
%put NOTE:;%put NOTE- &sysmacroname: &path/&name NOT FOUND;%put NOTE- ; %put NOTE:;%put NOTE- &sysmacroname: &path/&name NOT FOUND;%put NOTE- ;
%return; %return;
%end; %end;
proc http method="DELETE" url="&uri" &oauth_bearer; proc http method="DELETE" url="&base_uri&uri" &oauth_bearer;
headers headers
%if &grant_type=authorization_code %then %do; %if &grant_type=authorization_code %then %do;
"Authorization"="Bearer &&&access_token_var" "Authorization"="Bearer &&&access_token_var"
@@ -10892,9 +10892,9 @@ libname &libref1 JSON fileref=&fname1;
data _null_; data _null_;
set &libref1..links; set &libref1..links;
if rel='deleteRecursively' then if rel='deleteRecursively' then
call symputx('href',quote(trim(href)),'l'); call symputx('href',quote("&base_uri"!!trim(href)),'l');
else if rel='members' then else if rel='members' then
call symputx('mref',quote(cats(href,'?recursive=true')),'l'); call symputx('mref',quote(cats("&base_uri",href,'?recursive=true')),'l');
run; run;
/* before we can delete the folder, we need to delete the children */ /* before we can delete the folder, we need to delete the children */
@@ -10915,7 +10915,7 @@ data _null_;
set &libref1a..items_links; set &libref1a..items_links;
if href=:'/folders/folders' then return; if href=:'/folders/folders' then return;
if rel='deleteResource' then if rel='deleteResource' then
call execute('proc http method="DELETE" url='!!quote(trim(href)) call execute('proc http method="DELETE" url='!!quote("&base_uri"!!trim(href))
!!'; headers "Authorization"="Bearer &&&access_token_var" ' !!'; headers "Authorization"="Bearer &&&access_token_var" '
!!' "Accept"="*/*";run; /**/'); !!' "Accept"="*/*";run; /**/');
run; run;
@@ -11166,7 +11166,7 @@ options noquotelenmax;
%if "&root"="/" %then %do; %if "&root"="/" %then %do;
/* if root just list root folders */ /* if root just list root folders */
proc http method='GET' out=&fname1 &oauth_bearer proc http method='GET' out=&fname1 &oauth_bearer
url='%sysfunc(getoption(servicesbaseurl))/folders/rootFolders'; url="&base_uri/folders/rootFolders";
%if &grant_type=authorization_code %then %do; %if &grant_type=authorization_code %then %do;
headers "Authorization"="Bearer &&&access_token_var"; headers "Authorization"="Bearer &&&access_token_var";
%end; %end;
@@ -11189,7 +11189,7 @@ options noquotelenmax;
/* now get the followon link to list members */ /* now get the followon link to list members */
data _null_; data _null_;
set &libref1..links; set &libref1..links;
if rel='members' then call symputx('href',quote(trim(href)),'l'); if rel='members' then call symputx('href',quote("&base_uri"!!trim(href)),'l');
run; run;
%local fname2 libref2; %local fname2 libref2;
%let fname2=%mf_getuniquefileref(); %let fname2=%mf_getuniquefileref();

2
doxy/DoxygenLayout.xml
View File

@@ -16,7 +16,7 @@
<tab type="classmembers" visible="no" title="" intro=""/> <tab type="classmembers" visible="no" title="" intro=""/>
</tab> </tab>
<tab type="filelist" visible="yes" title="" intro="List of Files Used in the Macro Core Library"/> <tab type="filelist" visible="yes" title="" intro="List of Files Used in the Macro-Core Library"/>
<tab type="examples" visible="yes" title="" intro=""/> <tab type="examples" visible="yes" title="" intro=""/>
</navindex> </navindex>

4
viya/mv_deletefoldermember.sas
View File

@@ -98,7 +98,7 @@ run;
libname &libref1 JSON fileref=&fname1; libname &libref1 JSON fileref=&fname1;
data _null_; data _null_;
set &libref1..links; set &libref1..links;
if rel='members' then call symputx('mref',quote(trim(href)),'l'); if rel='members' then call symputx('mref',quote("&base_uri"!!trim(href)),'l');
run; run;
/* get the children */ /* get the children */
@@ -128,7 +128,7 @@ run;
%put NOTE:;%put NOTE- &sysmacroname: &path/&name NOT FOUND;%put NOTE- ; %put NOTE:;%put NOTE- &sysmacroname: &path/&name NOT FOUND;%put NOTE- ;
%return; %return;
%end; %end;
proc http method="DELETE" url="&uri" &oauth_bearer; proc http method="DELETE" url="&base_uri&uri" &oauth_bearer;
headers headers
%if &grant_type=authorization_code %then %do; %if &grant_type=authorization_code %then %do;
"Authorization"="Bearer &&&access_token_var" "Authorization"="Bearer &&&access_token_var"

6
viya/mv_deleteviyafolder.sas
View File

@@ -88,9 +88,9 @@ libname &libref1 JSON fileref=&fname1;
data _null_; data _null_;
set &libref1..links; set &libref1..links;
if rel='deleteRecursively' then if rel='deleteRecursively' then
call symputx('href',quote(trim(href)),'l'); call symputx('href',quote("&base_uri"!!trim(href)),'l');
else if rel='members' then else if rel='members' then
call symputx('mref',quote(cats(href,'?recursive=true')),'l'); call symputx('mref',quote(cats("&base_uri",href,'?recursive=true')),'l');
run; run;
/* before we can delete the folder, we need to delete the children */ /* before we can delete the folder, we need to delete the children */
@@ -111,7 +111,7 @@ data _null_;
set &libref1a..items_links; set &libref1a..items_links;
if href=:'/folders/folders' then return; if href=:'/folders/folders' then return;
if rel='deleteResource' then if rel='deleteResource' then
call execute('proc http method="DELETE" url='!!quote(trim(href)) call execute('proc http method="DELETE" url='!!quote("&base_uri"!!trim(href))
!!'; headers "Authorization"="Bearer &&&access_token_var" ' !!'; headers "Authorization"="Bearer &&&access_token_var" '
!!' "Accept"="*/*";run; /**/'); !!' "Accept"="*/*";run; /**/');
run; run;

4
viya/mv_getfoldermembers.sas
View File

@@ -64,7 +64,7 @@ options noquotelenmax;
%if "&root"="/" %then %do; %if "&root"="/" %then %do;
/* if root just list root folders */ /* if root just list root folders */
proc http method='GET' out=&fname1 &oauth_bearer proc http method='GET' out=&fname1 &oauth_bearer
url='%sysfunc(getoption(servicesbaseurl))/folders/rootFolders'; url="&base_uri/folders/rootFolders";
%if &grant_type=authorization_code %then %do; %if &grant_type=authorization_code %then %do;
headers "Authorization"="Bearer &&&access_token_var"; headers "Authorization"="Bearer &&&access_token_var";
%end; %end;
@@ -87,7 +87,7 @@ options noquotelenmax;
/* now get the followon link to list members */ /* now get the followon link to list members */
data _null_; data _null_;
set &libref1..links; set &libref1..links;
if rel='members' then call symputx('href',quote(trim(href)),'l'); if rel='members' then call symputx('href',quote("&base_uri"!!trim(href)),'l');
run; run;
%local fname2 libref2; %local fname2 libref2;
%let fname2=%mf_getuniquefileref(); %let fname2=%mf_getuniquefileref();