Skip to content

Commit

Permalink
Merge branch 'solid-org'
Browse files Browse the repository at this point in the history
Remove github dependencies (direct and indirect).
  • Loading branch information
justinwb committed Sep 4, 2018
2 parents 938cb9d + 89c90fc commit ae99c39
Show file tree
Hide file tree
Showing 9 changed files with 306 additions and 375 deletions.
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

### Install

You can install and run the server either using Node.js directly or using
[Docker](https://www.docker.com/). This and the following sections describe the
You can install and run the server either using Node.js directly or using
[Docker](https://www.docker.com/). This and the following sections describe the
first approach, for the second approach see the section [use Docker](#use-docker)
Section below.

Expand Down Expand Up @@ -306,7 +306,7 @@ In order to really get a feel for the Solid platform, and to test out `solid`,
you will need the following:

1. A WebID profile and browser certificate from one of the Solid-compliant
identity providers, such as [databox.me](https://databox.me).
identity providers, such as [solid.community](https://solid.community).

2. A server-side SSL certificate for `solid` to use (see the section below
on creating a self-signed certificate for testing).
Expand Down Expand Up @@ -409,6 +409,12 @@ npm run test-(acl|formats|params|patch)
<td><a href="https://twitter.com/KKjernsmo">Twitter/@KKjernsmo</a></td>
<td><a href="https://solid.kjernsmo.net/profile/card#me">WebID</a></td>
</tr>
<tr>
<th align="left">Justin Bingham</th>
<td><a href="https://github.com/justinwb">GitHub/justinwb</a></td>
<td><a href="https://twitter.com/justinwb">Twitter/@justinwb</a></td>
<td><a href="https://justin.janeirodigital.exchange/profile/card#me">WebID</a></td>
</tr>
</tbody>
</table>

Expand Down
2 changes: 1 addition & 1 deletion lib/api/authn/webid-oidc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const PasswordChangeRequest = require('../../requests/password-change-request')
const {
AuthCallbackRequest,
LogoutRequest
} = require('oidc-auth-manager').handlers
} = require('@solid/oidc-auth-manager').handlers

/**
* Sets up OIDC authentication for the given app.
Expand Down
4 changes: 2 additions & 2 deletions lib/models/authenticator.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const debug = require('./../debug').authentication
const validUrl = require('valid-url')
const webid = require('webid/tls')
const provider = require('oidc-auth-manager/src/preferred-provider')
const { domainMatches } = require('oidc-auth-manager/src/oidc-manager')
const provider = require('@solid/oidc-auth-manager/src/preferred-provider')
const { domainMatches } = require('@solid/oidc-auth-manager/src/oidc-manager')

/**
* Abstract Authenticator class, representing a local login strategy.
Expand Down
2 changes: 1 addition & 1 deletion lib/models/oidc-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const url = require('url')
const path = require('path')
const debug = require('../debug').authentication

const OidcManager = require('oidc-auth-manager')
const OidcManager = require('@solid/oidc-auth-manager')

/**
* Returns an instance of the OIDC Authentication Manager, initialized from
Expand Down
Loading

0 comments on commit ae99c39

Please sign in to comment.