making first version of with credentials

ignatandrei · ignatandrei · commit aa80d56db567 · 2020-06-23T20:33:30.000+03:00
diff --git a/release_notes/version_1.1.2020.11684383.md b/release_notes/version_1.1.2020.11684383.md
diff --git a/src/NetCore2Blockly/NetCore2Blockly/GenerateBlocklyFilesHostedService.cs b/src/NetCore2Blockly/NetCore2Blockly/GenerateBlocklyFilesHostedService.cs
@@ -698,6 +698,7 @@ internal void registerCallback()
         /// <summary>
         /// Initializes a new instance of the <see cref="GenerateBlocklyFilesHostedService"/> class.
         /// </summary>
+        /// <param name="prov"></param>
         /// <param name="api">The API.</param>
         public GenerateBlocklyFilesHostedService(IActionDescriptorCollectionProvider prov, IApiDescriptionGroupCollectionProvider api)
         {
diff --git a/src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.xml b/src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.xml
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html
@@ -34,6 +34,7 @@
     <script src="blockly/DateTime/CurrentDateBlock.js?v=version"></script>
     <script src="/blockly/Http/blocklyXHR.js?v=version"></script>
     <script src="/blockly/Http/blocklyHeader.js?v=version"></script>
+    <script src="/blockly/Http/blocklyCreds.js?v=version"></script>
     <script src="blockly/objects/createObject.js?v=version"></script>
     <script src="blockly/objects/propJS.js?v=version"></script>
     <script src="blockly/auth0/auth0blocks.js?v=version"></script>
@@ -70,7 +71,6 @@
             background-color: #909090; /* Same color as content_border */
             margin: 0 2px;
         }
-
     </style>
 </head>
 <body>
@@ -699,6 +699,18 @@ <h1 id="headerName">
                         </shadow>
                     </value>
                 </block>
+                <block type="credsforhttp">
+                    <value name="HttpDomain">
+                        <shadow type="text">
+                            <field name="TEXT">(localSite)</field>
+                        </shadow>
+                    </value>
+                    <value name="WithCreds">
+                        <shadow type="logic_boolean">
+                            <field name="BOOL">FALSE</field>
+                        </shadow>
+                    </value>                   
+                </block>
                 <block type="blockxhrresult"></block>
                 <block type="httprequest">
                     <value name="TheUrl">
@@ -1155,6 +1167,9 @@ <h1 id="headerName">
             var headersForDomain = interpreter.nativeToPseudo({ '(localSite)': [] });
             interpreter.setProperty(globalObject, 'headersForDomain', headersForDomain);
 
+            var withCredsForDomain = interpreter.nativeToPseudo({ '(localSite)': false });
+            interpreter.setProperty(globalObject, 'withCredsForDomain', withCredsForDomain);
+
 
             // Add an API function for the alert() block, generated for "text_print" blocks.
             var wrapper = function (text) {
@@ -1221,6 +1236,8 @@ <h1 id="headerName">
                 interpreter.createNativeFunction(wrapper));
 
             var wrapper = (href, callback) => {
+                var creds = interpreter.pseudoToNative(withCredsForDomain);
+
                 var heads = interpreter.pseudoToNative(headersForDomain);
                 var hostname = '(localSite)';
                 if (href.startsWith('http://') || href.startsWith('https://')) {
@@ -1230,7 +1247,13 @@ <h1 id="headerName">
                 if (hostname in heads) {
                     arrHeaders = heads[hostname];
                 }
-                return doGet(href, callback, arrHeaders);
+                var withCreds = false;
+                
+                if (hostname in creds) {
+                    withCreds = creds[hostname];
+                }
+                
+                return doGet(href, callback, arrHeaders, withCreds);
             }
             interpreter.setProperty(globalObject, 'getXhr',
                 interpreter.createAsyncFunction(wrapper));
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/Http/BlocklyXHRWrapper.js b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/Http/BlocklyXHRWrapper.js
@@ -1,9 +1,9 @@
 ﻿// XHR wrapper functions
 
-const doGet = (href, callback, headers) => {
+const doGet = (href, callback, headers, withCreds) => {
     console.log(href, callback);
     let req = new XMLHttpRequest();
-	
+    req.withCredentials = withCreds;
     req.open('GET', href, true);
 	if(headers.length>0){
 		//alert(JSON.stringify(headers));
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/Http/blocklyCreds.js b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/Http/blocklyCreds.js
@@ -0,0 +1,23 @@
+﻿Blockly.Blocks['credsforhttp'] = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField("Http with Creds");
+        this.appendValueInput("HttpDomain")
+            .setCheck("String")
+            .appendField("Domain");
+        this.appendValueInput("WithCreds")
+            .setCheck("Boolean")
+            .appendField("With Creds ?");
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        //this.setColour(230);
+        //this.setTooltip("");
+        //this.setHelpUrl("");
+    }
+};
+Blockly.JavaScript['credsforhttp'] = function (block) {
+    var value_httpdomain = Blockly.JavaScript.valueToCode(block, 'HttpDomain', Blockly.JavaScript.ORDER_ATOMIC) || '(localSite)';
+    var value_headername = Blockly.JavaScript.valueToCode(block, 'WithCreds', Blockly.JavaScript.ORDER_ATOMIC);
+    var code = 'withCredsForDomain[' + value_httpdomain + ']=' + value_headername + ';\n';
+    return code;
+};

Original file line number	Diff line number	Diff line change
`@@ -698,6 +698,7 @@ internal void registerCallback()`
`698`	`698`	`/// <summary>`
`699`	`699`	`/// Initializes a new instance of the <see cref="GenerateBlocklyFilesHostedService"/> class.`
`700`	`700`	`/// </summary>`
	`701`	`+ /// <param name="prov"></param>`
`701`	`702`	`/// <param name="api">The API.</param>`
`702`	`703`	`public GenerateBlocklyFilesHostedService(IActionDescriptorCollectionProvider prov, IApiDescriptionGroupCollectionProvider api)`
`703`	`704`	`{`