Updated pull request based on branch V4.1.0 from solid/node-solid-server#701

smalinin · 2018-06-08T10:26:10Z

No description provided.

- fix code style for camelCase - fix code style for remove semicolons - fix tests - use rdflib for WebID+Delegate

- register created wrong card file, because renegotiate TLS was missied

…tls.hbs

Sync with branch V4.1.0 from solid/node-solid-server

RubenVerborgh · 2018-06-08T11:13:30Z

@smalinin Thanks, could you summarize the changes?

Note: lets make this a squash merge, because of the difficult history tail (with "sync" commits instead of merge commits).

RubenVerborgh · 2018-06-08T11:14:23Z

Also, the build is currently broken because of

/home/travis/build/solid/node-solid-server/lib/requests/login-request.js:175:11: Infix operators must be spaced.

…-TLS

smalinin · 2018-06-08T16:20:11Z

It looks, that only the next fixes were added

fix account-template.js
- for use both externalWebID and external Delegate
- for add oidcIssuer relation to card
fix Login - it doesn't work properly with external WebID
fix account template test for work with updated function templateSubstitutionsFor()

dmitrizagidulin · 2018-06-08T16:24:06Z

static/databrowser.html

+ outliner.GotoSubject(subject, true, undefined, true, undefined);

- // Authenticate the user
- UI.authn.checkUser()


Why remove the authn.checkUser() call here, in databrowser? It's currently necessary..

I have fixed the above.

dmitrizagidulin · 2018-06-08T16:25:42Z

@smalinin any particular reason for all the chmod 100644 → 100755 changes?

dmitrizagidulin · 2018-06-14T16:35:48Z

lib/models/account-template.js

 tlsCertExponent: userAccount.tlsCertificateExponent,
- addOwlSameAs
+ addOwlSameAs,
+ serverUri: accountManager.host.serverUri


If the accountManager is only being used to get the host instance, maybe just pass in host directly? Instead of the full accountManager?

dmitrizagidulin · 2018-06-14T16:38:17Z

lib/requests/login-request.js

- if (this.clientId){
+ let uri
+
+ if (this.authQueryParams['client_id']){


Why the change from this.clientId to this.authQueryParams['client_id'] here? Was clientId not being properly initialized?

Remove handle for /logout and /goodbye

dmitrizagidulin · 2018-07-09T15:36:49Z

@smalinin Thanks for the fixes! There's still 3 .acl files with chmod changes, but overall 👍 from me!

smalinin · 2018-07-09T16:26:38Z

@dmitrizagidulin Could you write me the filenames with a problem in chmod? I have rechecked all files and I could not found such issue!

dmitrizagidulin · 2018-07-09T16:28:27Z

@smalinin sure thing! (you can see them towards the top of the Files Changed tab)

default-templates/new-account/.acl
default-templates/new-account/.meta.acl
default-templates/new-account/inbox/.acl

smalinin · 2018-07-09T16:40:40Z

@dmitrizagidulin Ok, I see, it looks that in my prev PR for Node-solid-server, I changed chmod for these files to rwxrwxr-x mode, and this was missed in prev PR review stage. Now I set chmod to rw-rw-r-- for all .acl files, that is the properly value.

dmitrizagidulin · 2018-07-09T16:41:16Z

No prob. Thanks again!

RubenVerborgh · 2018-07-09T16:43:24Z

Reminder that we should squash this into one commit, as 41d9bb5 is problematic (not a merge commit, will mess with our history).

kidehen · 2018-07-19T18:27:30Z

@RubenVerborgh @dmitrizagidulin ,

What does "Reminder that we should squash this into one commit, as 41d9bb5 is problematic (not a merge commit, will mess with our history)." mean in regards to:

Actions Items?
Action item ownership?

RubenVerborgh · 2018-07-19T19:39:20Z

Actions Items?

Whoever merges this, should squash merge, not create a merge commit.

Action item ownership?

The merger.

RubenVerborgh · 2018-07-19T19:41:12Z

Assigning this to @kjetilk for now, as a reminder we need to look into this.

RubenVerborgh · 2018-07-19T20:59:38Z

@smalinin @kidehen We have discussed this, and @justinwb will be following up on this PR with you. Thanks for your patience.

smalinin · 2018-07-20T14:54:49Z

@RubenVerborgh Basically I could create fork from current state on solid:v4.1.0 , apply all changes above and create a new PR(it is not problem). Will it be better for you ?

RubenVerborgh · 2018-07-20T20:09:56Z

@smalinin That would help. Note that a new PR is not needed for that, you can just force push to the branch (but I don't mind either).

kidehen · 2018-07-29T16:51:36Z

@justinwb,

What's happening here?

justinwb · 2018-07-29T17:19:08Z

@kidehen just left you a note on Gitter. Summation - we’ve got it on the backlog to merge as soon as we wrap a couple more priority items for the 5.0 release. One thing that would help speed things up a ton when we merge is if the contributors in that pull can go through and add as many comments as possible ahead of time so we’re not going back and forth with a ton of questions

smalinin · 2018-07-30T10:50:35Z

@RubenVerborgh I have recreated PR #728 with fresh fork and collect all changes to one commit.

RubenVerborgh · 2018-08-10T21:44:09Z

Note, the branch has been renamed into feature/webid-delegation, since this will not be part of v4.1.

RubenVerborgh · 2018-08-10T21:44:22Z

Following up in #728.

smalinin added 21 commits March 16, 2018 20:20

Add WebID+Delegate support for TLS and OIDC modes
9e13ad6

Fix pull req
fd0efa7
- fix code style for camelCase - fix code style for remove semicolons - fix tests - use rdflib for WebID+Delegate

Fix package-lock.json
c60e933

Fix package-lock.json
00baf01

Fix package-lock.json
3e9f21c

Fix index.html
659137c

Fix camelCase related issue in account-template.js
b15e66b

Fix issue for Register in WebID+OIDC+Delegate mode
f972227
- register created wrong card file, because renegotiate TLS was missied

remove outdated fix from login-request.js, login-auth-tls.hbs, login-…
93b16e8
…tls.hbs

Rollback some changes from index.html and fix camelCase issues
d5dea3d

Fix message in authenticator.js
d555c75

remove unused code
eb8ea51

Fix pyramiding in web_util.js
16823f7

Fix Login with Certificate (WebID+Delegate TLS) for authMode = OIDC
bc00bb9

Sync with master ver 4.0.14
41d9bb5

Fix error with compare
5eeae53

Fix account-template-test.js
8ac24bb

Sync with master ver 4.1.0
c7bd4a5

Sync with solid/node-solid-server
0da5126

Merge pull request#2from solid/v4.1.0
5ab02bc
Sync with branch V4.1.0 from solid/node-solid-server

Apply last changes from branch openlink_webid_delegate_pull_req
ab2b1cf

smalinin mentioned this pull request Jun 8, 2018
Updated pull request base on version 4.0.14 from master branch #698
Closed

RubenVerborgh added the on-hold label Jun 8, 2018

smalinin added 2 commits June 8, 2018 23:28

Fix infix operator
81e954e

iodcIssuer must be added to card on both servers WebID-OIDC and WebID…
20987f6
…-TLS

dmitrizagidulin reviewed Jun 8, 2018
View reviewed changes

smalinin added 2 commits June 9, 2018 03:37

Revert changes in databrowser.html
701d5ea

Fix chmod
661432b

dmitrizagidulin reviewed Jun 14, 2018
View reviewed changes

smalinin added 3 commits July 9, 2018 19:40

Fix create-app.js
d448829
Remove handle for /logout and /goodbye

Fix login-request.js for use this.clientId
868422f

Fix account-template.js for use host instance
808bd70

RubenVerborgh assigned kjetilk and justinwb and unassigned kjetilk Jul 19, 2018

smalinin mentioned this pull request Jul 30, 2018
Fixes for WebID delegation (to be detailed) #728
Closed

RubenVerborgh changed the base branch from v4.1.0 to feature/webid-delegationAugust 10, 2018 21:43

RubenVerborgh closed this Aug 10, 2018

Updated pull request based on branch V4.1.0 from solid/node-solid-server#701

Updated pull request based on branch V4.1.0 from solid/node-solid-server #701

Uh oh!

Conversation

smalinin commented Jun 8, 2018

Uh oh!

RubenVerborgh commented Jun 8, 2018

Uh oh!

RubenVerborgh commented Jun 8, 2018

Uh oh!

smalinin commented Jun 8, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dmitrizagidulinJun 8, 2018

Choose a reason for hiding this comment

Uh oh!

smalininJun 8, 2018

Choose a reason for hiding this comment

Uh oh!

dmitrizagidulin commented Jun 8, 2018

Uh oh!

dmitrizagidulinJun 14, 2018

Choose a reason for hiding this comment

Uh oh!

smalininJul 9, 2018

Choose a reason for hiding this comment

Uh oh!

dmitrizagidulinJun 14, 2018

Choose a reason for hiding this comment

Uh oh!

smalininJul 9, 2018

Choose a reason for hiding this comment

Uh oh!

dmitrizagidulin commented Jul 9, 2018

Uh oh!

smalinin commented Jul 9, 2018

Uh oh!

dmitrizagidulin commented Jul 9, 2018

Uh oh!

smalinin commented Jul 9, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dmitrizagidulin commented Jul 9, 2018

Uh oh!

RubenVerborgh commented Jul 9, 2018

Uh oh!

kidehen commented Jul 19, 2018

Uh oh!

RubenVerborgh commented Jul 19, 2018

Uh oh!

RubenVerborgh commented Jul 19, 2018

Uh oh!

RubenVerborgh commented Jul 19, 2018

Uh oh!

smalinin commented Jul 20, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RubenVerborgh commented Jul 20, 2018

Uh oh!

kidehen commented Jul 29, 2018

Uh oh!

justinwb commented Jul 29, 2018

Uh oh!

smalinin commented Jul 30, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RubenVerborgh commented Aug 10, 2018

Uh oh!

RubenVerborgh commented Aug 10, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

smalinin commented Jun 8, 2018•
edited
Loading

smalinin commented Jul 9, 2018•
edited
Loading

smalinin commented Jul 20, 2018•
edited
Loading

smalinin commented Jul 30, 2018•
edited
Loading