Skip to content

Commit 4f4b69b

Browse files
angelo-vangelo-v
authored
Merge pull request SolidOS#381 from solid/solid-logic-update
Solid logic update
2 parents c509180 + b49e727 commit 4f4b69b

38 files changed

Lines changed: 2592 additions & 818 deletions

‎package-lock.json‎

Lines changed: 2438 additions & 787 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"path-browserify": "^1.0.1",
6464
"rdflib": "^2.1.7",
6565
"solid-auth-client": "^2.5.5",
66-
"solid-logic": "^1.2.9",
66+
"solid-logic": "^1.3.1",
6767
"solid-namespace": "^0.5.0",
6868
"stream-browserify": "^3.0.0",
6969
"uuid": "^8.3.2"
@@ -78,9 +78,9 @@
7878
"@babel/preset-env": "^7.12.11",
7979
"@babel/preset-typescript": "^7.12.7",
8080
"@storybook/addon-actions": "^6.1.15",
81-
"@storybook/addon-essentials": "^6.1.15",
81+
"@storybook/addon-essentials": "^6.1.20",
8282
"@storybook/addon-links": "^6.1.15",
83-
"@storybook/html": "^6.1.15",
83+
"@storybook/html": "^6.1.20",
8484
"@types/jest": "^26.0.20",
8585
"@types/jsdom": "^16.2.6",
8686
"@types/node": "^14.14.22",
@@ -97,7 +97,7 @@
9797
"solid-auth-cli": "^1.0.15",
9898
"standard": "^16.0.3",
9999
"ts-jest": "^26.4.4",
100-
"typedoc": "^0.20.19",
100+
"typedoc": "^0.20.28",
101101
"typescript": "^4.1.3",
102102
"webpack": "^4.46.0",
103103
"webpack-cli": "^3.3.12"

‎src/logic.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
//
33

44
import * as debug from './debug'
5-
import { fetch } from 'solid-auth-client'
6-
// import { SolidLogic } from 'solid-logic'
5+
import auth from 'solid-auth-client'
76
import { SolidLogic } from 'solid-logic'
87

9-
export const solidLogicSingleton = new SolidLogic({ fetch })
8+
export const solidLogicSingleton = new SolidLogic({ fetch: auth.fetch }, auth)
109

1110
debug.log('Unique quadstore initialized.')
1211

‎test/unit/acl/access-controller.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ import { solidLogicSingleton } from '../../../src/logic'
77
const store = solidLogicSingleton.store
88

99
silenceDebugMessages()
10+
jest.mock('solid-auth-client', () => ({
11+
currentSession: () => Promise.resolve(),
12+
trackSession: () => null
13+
}))
1014
const dom = new JSDOM('<!DOCTYPE html><p>Hello world</p>').window.document
1115

1216
describe('AccessController', () => {

‎test/unit/acl/access-groups.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import { solidLogicSingleton } from '../../../src/logic'
88
const store = solidLogicSingleton.store
99

1010
silenceDebugMessages()
11-
jest.mock('solid-auth-client')
11+
jest.mock('solid-auth-client', () => ({
12+
currentSession: () => Promise.resolve(),
13+
trackSession: () => null
14+
}))
1215
const dom = new JSDOM('<!DOCTYPE html><p>Hello world</p>').window.document
1316

1417
describe('AccessGroups', () => {

‎test/unit/acl/acl-control.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import {
99
} from '../../../src/acl/acl-control'
1010

1111
silenceDebugMessages()
12-
jest.mock('solid-auth-client')
12+
jest.mock('solid-auth-client', () => ({
13+
currentSession: () => Promise.resolve(),
14+
trackSession: () => null
15+
}))
1316
const window = new JSDOM('<!DOCTYPE html><p>Hello world</p>').window
1417
const dom = window.document
1518

‎test/unit/acl/acl.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ import { createGraphFromTurtle } from '../helpers/createGraphFromTurtle'
3939
import { createAgentMapFromTurtle } from '../helpers/createAgentMapFromTurtle'
4040

4141
silenceDebugMessages()
42-
jest.mock('solid-auth-client')
42+
jest.mock('solid-auth-client', () => ({
43+
currentSession: () => Promise.resolve(),
44+
trackSession: () => null
45+
}))
4346

4447
describe('ACLbyCombination', () => {
4548
it('exists', () => {

‎test/unit/acl/add-agent-buttons.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import { solidLogicSingleton } from '../../../src/logic'
77
const store = solidLogicSingleton.store
88

99
silenceDebugMessages()
10-
jest.mock('solid-auth-client')
10+
jest.mock('solid-auth-client', () => ({
11+
currentSession: () => Promise.resolve(),
12+
trackSession: () => null
13+
}))
1114
const dom = new JSDOM('<!DOCTYPE html><p>Hello world</p>').window.document
1215

1316
function instantiateAddAgentButtons () {

‎test/unit/acl/index.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ import { acl, aclControl } from '../../../src/acl/index'
55

66
silenceDebugMessages()
77

8+
jest.mock('solid-auth-client', () => ({
9+
currentSession: () => Promise.resolve(),
10+
trackSession: () => null
11+
}))
12+
813
describe('acl related APIs', () => {
914
it('exports some methods in the acl module', () => {
1015
expect(Acl).toEqual(expect.objectContaining(acl))

‎test/unit/authn/authn.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ import { AppDetails, AuthenticationContext } from '../../../src/authn/types'
2727
import { sym } from 'rdflib'
2828

2929
silenceDebugMessages()
30-
jest.mock('solid-auth-client')
30+
jest.mock('solid-auth-client', () => ({
31+
currentSession: () => Promise.resolve(),
32+
trackSession: () => null
33+
}))
3134
const window = new JSDOM('<!DOCTYPE html><p>Hello world</p>').window
3235
const dom = window.document
3336

0 commit comments

Comments
 (0)