Skip to content

Commit

Permalink
Merge pull request #43 from ibm-cloud-security/development
Browse files Browse the repository at this point in the history
Merge development branch to master
  • Loading branch information
TalAviel authored Jul 21, 2020
2 parents 5f39337 + 421df62 commit d83c235
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "8"
- "12"

notifications:
email:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## [v0.4.1](https://github.com/ibm-cloud-security/appid-clientsdk-js/releases/tag/0.4.1) (2020-07-21)

**Added**

- Update dependency versions

## [v0.4.0](https://github.com/ibm-cloud-security/appid-clientsdk-js/releases/tag/0.4.0) (2020-04-10)

**Added**
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import AppID from 'ibmcloud-appid-js';

From the CDN:
```html
<script src="https://cdn.appid.cloud.ibm.com/appid-0.4.0.min.js"></script>
<script src="https://cdn.appid.cloud.ibm.com/appid-0.4.1.min.js"></script>
```

Or for development purposes use the minified file in this repo:
Expand Down
24 changes: 12 additions & 12 deletions dist/appid.min.js

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions dist/appid.umd.min.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions docs/AppID.html
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ <h4 class="name" id="silentSignin"><span class="type-signature">(async) </span>s

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line123">line 123</a>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line131">line 131</a>
</li></ul></dd>


Expand Down Expand Up @@ -1053,7 +1053,7 @@ <h4 class="name" id="getUserInfo"><span class="type-signature">(async) </span>ge

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line161">line 161</a>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line169">line 169</a>
</li></ul></dd>


Expand Down Expand Up @@ -1267,7 +1267,7 @@ <h4 class="name" id="changePassword"><span class="type-signature">(async) </span

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line185">line 185</a>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line193">line 193</a>
</li></ul></dd>


Expand Down Expand Up @@ -1514,7 +1514,7 @@ <h4 class="name" id="changeDetails"><span class="type-signature">(async) </span>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line231">line 231</a>
<a href="index.js.html">index.js</a>, <a href="index.js.html#line239">line 239</a>
</li></ul></dd>


Expand Down Expand Up @@ -1761,7 +1761,7 @@ <h5>Returns:</h5>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 15:52:52 GMT-0600 (Central Standard Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Jul 21 2020 11:34:54 GMT-0500 (Central Daylight Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/global.html
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ <h5>Type:</h5>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 15:52:52 GMT-0600 (Central Standard Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Jul 21 2020 11:34:54 GMT-0500 (Central Daylight Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h2 id="installation">Installation</h2>
<pre class="prettyprint source lang-javascript"><code>import AppID from 'ibmcloud-appid-js';
</code></pre>
<p>From the CDN:</p>
<pre class="prettyprint source lang-html"><code>&lt;script src=&quot;https://cdn.appid.cloud.ibm.com/appid-0.3.0.min.js&quot;>&lt;/script>
<pre class="prettyprint source lang-html"><code>&lt;script src=&quot;https://cdn.appid.cloud.ibm.com/appid-0.4.1.min.js&quot;>&lt;/script>
</code></pre>
<p>Or for development purposes use the minified file in this repo:</p>
<pre class="prettyprint source lang-html"><code>&lt;script type='text/javascript' src=&quot;dist/appid.min.js&quot;>&lt;/script>
Expand Down Expand Up @@ -124,7 +124,7 @@ <h2 id="api-reference">API Reference</h2>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 15:52:52 GMT-0600 (Central Standard Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Jul 21 2020 11:34:54 GMT-0500 (Central Daylight Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
12 changes: 10 additions & 2 deletions docs/index.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,15 @@ <h1 class="page-title">index.js</h1>
async signin() {
this._validateInitalize();
const endpoint = this.openIdConfigResource.getAuthorizationEndpoint();
return this.utils.performOAuthFlowAndGetTokens({origin: this.window.origin, clientId: this.clientId, endpoint});
let origin = this.window.location.origin;
if (!origin) {
origin = this.window.location.protocol + "//" + this.window.location.hostname + (this.window.location.port ? ':' + this.window.location.port : '');
}
return this.utils.performOAuthFlowAndGetTokens({
origin,
endpoint,
clientId: this.clientId
});
}

/**
Expand Down Expand Up @@ -325,7 +333,7 @@ <h1 class="page-title">index.js</h1>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 15:52:52 GMT-0600 (Central Standard Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Jul 21 2020 11:34:54 GMT-0500 (Central Daylight Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ibmcloud-appid-js",
"version": "0.4.0",
"version": "0.4.1",
"description": "IBM Cloud App ID SDK for Single Page Applications",
"keywords": [
"SPA",
Expand Down Expand Up @@ -47,23 +47,22 @@
]
},
"dependencies": {
"jsrsasign": "^8.0.12"
"jsrsasign": "^8.0.20"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.5.5",
"@babel/plugin-transform-runtime": "^7.5.5",
"@babel/preset-env": "^7.5.5",
"babel-cli": "^7.0.0-beta.3",
"chai": "^4.2.0",
"coveralls": "^3.0.6",
"docdash": "^1.1.1",
"@babel/cli": "^7.10.4",
"@babel/core": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"gulp-babel": "^8.0.0",
"jsdoc": "^3.6.3",
"mocha": "^6.2.0",
"chai": "^4.2.0",
"coveralls": "^3.1.0",
"docdash": "^1.2.0",
"jsdoc": "^3.6.4",
"mocha": "^7.2.0",
"node-fetch": "^2.6.0",
"nyc": "^15.0.0",
"webpack": "^4.39.1",
"webpack-cli": "^3.3.6"
"nyc": "^15.1.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12"
}
}
4 changes: 2 additions & 2 deletions sample/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
let tokens;
try {
await appID.init({
clientId: '<SPA_CLIENT_ID>',
discoveryEndpoint: '<WELL_KNOWN_ENDPOINT>'
clientId: '<SPA_CLIENT_ID>',
discoveryEndpoint: '<WELL_KNOWN_ENDPOINT>'
});
} catch (e) {
console.error(e);
Expand Down

0 comments on commit d83c235

Please sign in to comment.