Skip to content

Commit 9dad049

Browse files
author
ctranxuan
committed
Merge branch 'feat16065'
Conflicts: twitter/scripts/streamdataio.min.js
2 parents 2a0c405 + 8c89827 commit 9dad049

22 files changed

+396
-7753
lines changed

‎.gitignore

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,37 @@ dist
133133

134134
### jsDoc ###
135135
jsdoc
136+
137+
### Emacs ###
138+
# -*- mode: gitignore; -*-
139+
*~
140+
\#*\#
141+
/.emacs.desktop
142+
/.emacs.desktop.lock
143+
*.elc
144+
auto-save-list
145+
tramp
146+
.\#*
147+
148+
# Org-mode
149+
.org-id-locations
150+
*_archive
151+
152+
# flymake-mode
153+
*_flymake.*
154+
155+
# eshell files
156+
/eshell/history
157+
/eshell/lastdir
158+
159+
# elpa packages
160+
/elpa/
161+
162+
# reftex files
163+
*.rel
164+
165+
# AUCTeX auto folder
166+
/auto/
167+
168+
# cask packages
169+
.cask/

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# streamdata-js
1+
# streamdataio-js
22
<a href="http://streamdata.io" target="_blank">streamdata.io</a> Javascript SDK package containing SDK, <a href="http://streamdataio.github.io/streamdataio-js/" target="_blank">documentation</a> and sample applications.
33

44
The SDK allows the use of the streamdata.io proxy to get data pushed from various sources and to use them in your application.

‎doc/Streamdata.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ <h5>Returns:</h5>
400400

401401
<span class="jsdoc-message">
402402
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha5</a>
403-
on Wed Jun 17 2015 11:08:43 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
403+
on Wed Jun 10 2015 17:08:22 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
404404
</span>
405405
</footer>
406406
</div>

‎doc/StreamdataError.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ <h5>Returns:</h5>
710710

711711
<span class="jsdoc-message">
712712
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha5</a>
713-
on Wed Jun 17 2015 11:08:43 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
713+
on Wed Jun 10 2015 17:08:22 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
714714
</span>
715715
</footer>
716716
</div>

‎doc/StreamdataEventSource.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ <h5>Returns:</h5>
13791379

13801380
<span class="jsdoc-message">
13811381
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha5</a>
1382-
on Wed Jun 17 2015 11:08:43 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
1382+
on Wed Jun 10 2015 17:08:22 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
13831383
</span>
13841384
</footer>
13851385
</div>

‎doc/api.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ <h1 class="page-title">Source: /var/lib/jenkins/jobs/JavascriptSDK_Compile/works
312312

313313
<span class="jsdoc-message">
314314
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha5</a>
315-
on Wed Jun 17 2015 11:08:43 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
315+
on Wed Jun 10 2015 17:08:22 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
316316
</span>
317317
</footer>
318318
</div>

‎doc/classes.list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ <h3 class="subsection-title">Classes</h3>
163163

164164
<span class="jsdoc-message">
165165
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha5</a>
166-
on Wed Jun 17 2015 11:08:43 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
166+
on Wed Jun 10 2015 17:08:22 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
167167
</span>
168168
</footer>
169169
</div>

‎doc/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h2 id="2-use-streamdata-io-to-connect-to-your-api">2. Use streamdata.io to conn
105105
<p>Create a <code>StreamDataEventSource</code> object into your JavaScript code.</p>
106106
<pre><code class="lang-javascript"> var myEventSource = streamdataio.createEventSource(&quot;http://mysite.com/myJsonRestService&quot;,&lt;app_token&gt;);
107107
</code></pre>
108-
<p>The <code>StreamDataEventSource</code> is the entry point for establishing a data stream connection to the given URL.</p>
108+
<p>The <code>StreamDataEventSource</code> is the entry point for establishing a data stream connection to the given URL. </p>
109109
<p>It uses an application <strong>token</strong> to identify and authorize the stream connection to be established.</p>
110110
<p>To get a valid <strong>token</strong>, please visit <a href="http://streamdata.io" target="_blank">streamdata.io web site</a> to register and create an application.</p>
111111
<p>It uses standard HTTP Server-Sent Events to get the data you required through streamdata.io proxy.</p>
@@ -208,7 +208,7 @@ <h3 id="2-2-angular-js-example">2.2 Angular.js example</h3>
208208
<p><a href="https://github.com/streamdataio/streamdataio-js/tree/master/stockmarket-angular" target="_blank">Stock Market Angular</a></p>
209209
<h1 id="security">Security</h1>
210210
<h2 id="1-tls-encryption">1. TLS Encryption</h2>
211-
<p>streamdata.io proxy uses Transport Layer Security (TLS) as a default to encrypt messages while in transport across the Internet.</p>
211+
<p>streamdata.io proxy uses Transport Layer Security (TLS) as a default to encrypt messages while in transport across the Internet. </p>
212212
<p><strong>Recommendation</strong>:</p>
213213
<p>Even if streamdata.io proxy can be used without TLS encryption, we strongly recommend to always use https (thus TLS) with applications using streamdata.io.</p>
214214
<p>Using TLS ensures that client messages are protected when being sent to and from streamdata.io. This prevents intercepted messages from being viewed by unauthorized parties.</p>
@@ -358,7 +358,7 @@ <h2>
358358

359359
<span class="jsdoc-message">
360360
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha5</a>
361-
on Wed Jun 17 2015 11:08:43 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
361+
on Wed Jun 10 2015 17:08:22 GMT+0200 (CEST) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
362362
</span>
363363
</footer>
364364
</div>

‎stockmarket-angular/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# streamdata-js/stockmarket-angular
22
This sample application shows how to use the <a href="http://streamdata.io" target="_blank">streamdata.io</a> Javascript SDK with AngularJS.
33

4-
The streamdata.io SDK allows the use of streamdata.io to get data pushed from various sources and use them in your application.
4+
The streamdata.io JavaScript SDK allows the use of streamdata.io to get data pushed from various sources and use them in your application.
55

6-
To run the sample, open the index.html in your browser (Chrome, Firefox, Safari).
7-
You will be asked to fill in a public and a private key. To get them, connect to the <a href="https://portal.streamdata.io/" target="_blank">streamdata.io portal</a> and follow the guidelines.
6+
To run the sample, open the index.html in your browser (Chrome, Firefox, Safari, IE > 10).
7+
You will be asked to fill in you application Token. To get them, connect to the <a href="https://portal.streamdata.io/" target="_blank">streamdata.io portal</a> and follow the guidelines.
88

99
If you have any questions or feedback, feel free to ask: <a href="mailto://[email protected]">[email protected]</a>
1010

‎stockmarket-angular/index.html

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,27 @@ <h3 class="text-muted">Stock-Market demo with <img src="img/angular.png" style="
3434
</div>
3535
</div>
3636
<div class="form-group">
37-
<label for="inputPublicKey" class="col-sm-3 control-label">Public Key</label>
37+
<label for="inputPublicKey" class="col-sm-3 control-label">Application token</label>
3838
<div class="col-sm-8">
39-
<input id="inputPublicKey" class="form-control" placeholder="Your public key" type="text" ng-model="controller.Pk" required>
39+
<input id="inputPublicKey" class="form-control" placeholder="Your App Token" type="text" ng-model="controller.token" required>
4040
</div>
4141
<img src="img/info.png" class="col-sm-1" style="width: inherit; margin-top: 5px; padding-left: 0px;"
4242
ng-model="controller.popupPk.content" popup="controller.popupPk.options"/>
4343
</div>
4444
<div class="form-group">
45-
<label for="inputPrivateKey" class="col-sm-3 control-label">Private Key</label>
45+
<label for="inputPrivateKey" class="col-sm-3 control-label">Authenticate with signature (HMAC)</label>
4646
<div class="col-sm-8">
47-
<input id="inputPrivateKey" class="form-control" placeholder="Your private key" type="text" ng-model="controller.pk" required>
47+
<input type="checkbox" id="signature" name="signature" ng-model="controller.signature" />
48+
<img src="img/info.png" style="padding-left: 10px; margin-top: -20px;"
49+
ng-model="controller.popupSignature.content" popup="controller.popupSignature.options">
50+
</img>
51+
</div>
52+
53+
</div>
54+
<div class="form-group" ng-show="controller.signature">
55+
<label for="inputPrivateKey" class="col-sm-3 control-label">Private key for signature</label>
56+
<div class="col-sm-8">
57+
<input id="inputPrivateKey" class="form-control" placeholder="Your private key" type="text" ng-model="controller.pk" ng-required="controller.signature">
4858
</div>
4959
</div>
5060
<div class="form-group">
@@ -156,6 +166,7 @@ <h3 class="text-muted">Stock-Market demo with <img src="img/angular.png" style="
156166
<script src="scripts/diffview.js"></script>
157167

158168
<script src="scripts/streamdataio.min.js"></script>
169+
<script src="scripts/streamdataio-auth.min.js"></script>
159170
<script src="scripts/main.js"></script>
160171
</body>
161172
</html>

0 commit comments

Comments
 (0)