Skip to content

Commit e50b8bc

Browse files
kjetilkrubensworks
authored andcommitted
Rename originsAllowed to trustedOrigins
1 parent 1425a2f commit e50b8bc

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

bin/solid.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/solid.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env node
2+
const startCli = require('./lib/cli')
3+
startCli()

config/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
'serverUri': 'https://localhost:8443',
1313
'webid': true,
1414
'strictOrigin': true,
15-
'originsAllowed': ['https://apps.solid.invalid'],
15+
'trustedOrigins': ['https://apps.solid.invalid'],
1616
'dataBrowserPath': 'default'
1717

1818
// For use in Enterprises to configure a HTTP proxy for all outbound HTTP requests from the SOLID server (we use

lib/acl-checker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ACLChecker {
1616
this.fetch = options.fetch
1717
this.fetchGraph = options.fetchGraph
1818
this.strictOrigin = options.strictOrigin
19-
this.originsAllowed = options.originsAllowed
19+
this.trustedOrigins = options.trustedOrigins
2020
this.suffix = options.suffix || DEFAULT_ACL_SUFFIX
2121
}
2222

@@ -113,7 +113,7 @@ class ACLChecker {
113113
origin: this.origin,
114114
rdf: rdf,
115115
strictOrigin: this.strictOrigin,
116-
originsAllowed: this.originsAllowed,
116+
trustedOrigins: this.trustedOrigins,
117117
isAcl: uri => this.isAcl(uri),
118118
aclUrlFor: uri => this.aclUrlFor(uri)
119119
}

lib/handlers/allow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function allow (mode) {
4646
},
4747
suffix: ldp.suffixAcl,
4848
strictOrigin: ldp.strictOrigin,
49-
originsAllowed: ldp.originsAllowed
49+
trustedOrigins: ldp.trustedOrigins
5050
})
5151

5252
// Ensure the user has the required permission

lib/ldp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class LDP {
6565
debug.settings('Server URI: ' + this.serverUri)
6666
debug.settings('Auth method: ' + this.auth)
6767
debug.settings('Strict origins: ' + this.strictOrigin)
68-
debug.settings('Allowed origins: ' + this.originsAllowed)
68+
debug.settings('Allowed origins: ' + this.trustedOrigins)
6969
debug.settings('Db path: ' + this.dbPath)
7070
debug.settings('Config path: ' + this.configPath)
7171
debug.settings('Suffix Acl: ' + this.suffixAcl)

0 commit comments

Comments
 (0)