Merge pull request #147 from solid/dz_oidc

Add WebID-OIDC authentication method

Author: dmitrizagidulin

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}

package.json

@@ -24,11 +24,6 @@
     "postversion": "git push --follow-tags",
     "prepublish": "npm run test && npm run build"
   },
-  "babel": {
-    "presets": [
-      "es2015"
-    ]
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/solid/solid-client"
@@ -57,10 +52,11 @@
   "dependencies": {
     "rdflib": "^0.13.0",
     "shorthash": "0.0.2",
+    "solid-auth-oidc": "0.0.5",
     "solid-auth-tls": "0.0.4",
     "solid-namespace": "^0.1.0",
     "solid-permissions": "^0.5.1",
-    "solid-web-client": "^0.2.0"
+    "solid-web-client": "^0.3.0"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
@@ -69,7 +65,7 @@
     "json-loader": "^0.5.4",
     "nock": "^9.0.2",
     "qunit": "^0.9.0",
-    "sinon": "^1.17.6",
+    "sinon": "^2.1.0",
     "standard": "^5.4.1",
     "tape": "^4.4.0",
     "webpack": "^1.13.1"

src/index.js

@@ -34,9 +34,11 @@ https://github.com/solid/solid
  */
 
 const rdf = require('./util/rdf-parser')
-const webClient = require('solid-web-client')(rdf)
+const ClientAuthOIDC = require('solid-auth-oidc')
+const auth = new ClientAuthOIDC()
+const webClient = require('solid-web-client')(rdf, { auth })
 const ClientAuthTLS = require('solid-auth-tls')
-const auth = new ClientAuthTLS(webClient)
+const tls = new ClientAuthTLS(webClient)
 const identity = require('./identity')
 const ns = require('solid-namespace')(rdf)
 const acl = require('solid-permissions')
@@ -50,13 +52,14 @@ const Solid = {
   AppRegistration: require('./solid/app-registration'),
   appRegistry: require('./app-registry'),
   auth,
+  tls,
   config: require('../config'),
-  currentUser: auth.currentUser.bind(auth),
+  currentUser: tls.currentUser.bind(tls),
   identity: require('./identity'),
-  login: auth.login.bind(auth),
+  login: tls.login.bind(tls),
   meta: require('./meta'),
   rdflib: rdf,
-  signup: auth.signup.bind(auth),
+  signup: tls.signup.bind(tls),
   status: require('./status'),
   typeRegistry: require('./type-registry'),
   vocab: ns,

webpack.config.js

@@ -35,8 +35,12 @@ module.exports = {
     fs: 'empty'
   },
   externals: {
-    xhr2: 'XMLHttpRequest',
-    xmlhttprequest: 'XMLHttpRequest'
+    'xhr2': 'XMLHttpRequest',
+    'xmlhttprequest': 'XMLHttpRequest',
+    'node-fetch': 'fetch',
+    'text-encoding': 'TextEncoder',
+    'urlutils': 'URL',
+    'webcrypto': 'crypto'
   },
   devtool: 'source-map'
 }