Refactor API to use login().then().catch()

Author: dmitrizagidulin

README.md

@@ -9,3 +9,25 @@ Connect.
 This is an Authentication helper library that wraps an OpenID Connect (OIDC)
 Relying Party library, [`oidc-rp`](https://github.com/anvilresearch/oidc-rp).
 It is meant to be used in browser-side applications, as part of `solid-client`.
+
+### Usage
+
+```js
+  // Using a standard "document loaded" event listener
+  //  (equivalent to jQuery's $(document).ready())
+  // Trigger a login() check on page load, in case user is logged in already
+  document.addEventListener('DOMContentLoaded', function () {
+    SolidClient.auth.login()
+      .then(function (webId) {
+        // User is logged in, you can display their webId, load their profile, etc
+        // Solid.auth.webId is set to the current user's webId URI
+        // Also, SolidClient.auth.accessToken is set to the current user's access token
+      })
+      .catch(function (error) {
+        // An error has occurred while logging in, display it to user
+      })
+  })
+```
+
+Called by itself, `login()` will perform Provider Discovery and kick off the
+OAuth2/OpenID Connect `/authorize` process.

demo/.acl

@@ -0,0 +1,8 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+<#Public>
+    a <http://www.w3.org/ns/auth/acl#Authorization> ;
+    <http://www.w3.org/ns/auth/acl#accessTo> <.> ;
+    <http://www.w3.org/ns/auth/acl#agentClass> <http://xmlns.com/foaf/0.1/Agent> ;
+    <http://www.w3.org/ns/auth/acl#defaultForNew> <.> ;
+    <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read> .

demo/index.html

@@ -59,18 +59,16 @@ <h5>App body</h5>
 <script>
 
   // Using a standard "document loaded" event listener
-  //  (equivalent to jQuery's $(document).ready()
+  //  (equivalent to jQuery's $(document).ready())
+  // Trigger a login() check on page load, in case user is logged in already
   document.addEventListener('DOMContentLoaded', function () {
-    // Init the solid auth helper, inject whatever behavior you want to happen
-    //   when authentication succeeds.
-    SolidClient.auth.init({
-      onLoginSuccess: function (webId, accessToken) {
+    SolidClient.auth.login()
+      .then(function (webId, accessToken) {
         loginSuccess(webId, accessToken)
-      },
-      onProviderSelected: function (providerUri) {
-        providerSelected(providerUri)
-      }
-    })
+      })
+      .catch(function (error) {
+        console.error('Error logging in:', error)
+      })
     init()
   })
 
@@ -81,9 +79,8 @@ <h5>App body</h5>
   function initButton(id, action) {
     document.getElementById(id).addEventListener('click', action)
   }
-  function loginSuccess (webId, accessToken) {
-    console.log('onLoginSuccess() callback! webId: ', webId,
-      'access_token: ', accessToken)
+  function loginSuccess (webId) {
+    console.log('onLoginSuccess() callback! webId: ', webId)
     hide('noWebId')
     show('logoutDiv')
     setField('webId', webId)

demo/solid-client.min.js

@@ -0,0 +1,50 @@
+const webpackConfig = require('./webpack.config.js')
+webpackConfig.entry = {}
+
+module.exports = function(config) {
+  config.set({
+    basePath: '',
+
+    frameworks: ['mocha', 'sinon-chai'],
+
+    client: {
+      chai: {
+        includeStack: true
+      }
+    },
+
+    files: [
+      'dist/solid-auth-oidc.min.js',
+      'test/unit/*-test.js'
+    ],
+
+    preprocessors: {
+      // 'dist/solid-auth-oidc.min.js': ['webpack'],
+      './tests/**/*-test.js': ['babel']
+    },
+
+    babelPreprocessor: {
+      options: {
+        presets: [ 'es2015' ],
+        sourceMap: 'inline'
+      }
+    },
+
+    port: 9876,
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['Chrome'],
+
+    colors: true,
+
+    webpack: webpackConfig,
+
+    singleRun: true
+  })
+}

karma.conf.js

@@ -15,12 +15,13 @@
     "build-dist": "webpack --progress --colors --optimize-occurrence-order --optimize-dedupe",
     "build-lib": "babel src -d lib",
     "dist": "npm run build && npm run build-dist",
+    "karma": "./node_modules/.bin/karma start",
     "postversion": "git push --follow-tags",
     "prepublish": "npm run build && npm run test",
     "preversion": "npm test",
     "standard": "standard src/*",
     "tape": "tape test/unit/*.js",
-    "test": "npm run standard && npm run tape"
+    "test": "npm run standard && npm run dist && npm run karma"
   },
   "repository": {
     "type": "git",
@@ -49,15 +50,23 @@
   },
   "homepage": "https://github.com/solid/solid-auth-oidc",
   "dependencies": {
-    "oidc-rp": "^0.1.0"
+    "oidc-rp": "git://github.com/anvilresearch/oidc-rp.git#lib"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
     "babel-core": "^6.21.0",
     "babel-loader": "^6.2.5",
     "babel-preset-es2015": "^6.18.0",
+    "karma": "^1.3.0",
+    "karma-babel-preprocessor": "^6.0.1",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.2.4",
+    "karma-webpack": "^1.8.1",
+    "mocha": "^3.2.0",
+    "sinon": "^1.17.7",
+    "sinon-chai": "^2.8.0",
     "standard": "^5.4.1",
-    "tape": "^4.6.3",
     "webpack": "^1.14.0"
   },
   "standard": {