Skip to content

Commit

Permalink
rename profile/turtle to profile/card
Browse files Browse the repository at this point in the history
  • Loading branch information
ylebre committed Mar 8, 2021
1 parent ad85be1 commit 1922389
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ To test whether your server is install correctly, you can run Solid's [webid-pro
Go to https://solidcommunity.net and create a Solid pod.
Go to https://generator.inrupt.com/text-editor and log in with https://solidcommunity.net. Tick all 4 boxes in the consent dialog.
Click 'Load', type something, click 'Save'.
Grant access to co-editor https://your-nextcloud-server.com/apps/solid/@your-username/profile/turtle#me.
For instance if you're using the [development install](#development-install), that would be https://localhost/apps/solid/@alice/profile/turtle#me
Grant access to co-editor https://your-nextcloud-server.com/apps/solid/@your-username/profile/card#me.
For instance if you're using the [development install](#development-install), that would be https://localhost/apps/solid/@alice/profile/card#me
Now in a separate browser window, log in to https://generator.inrupt.com/text-editor with https://your-nextcloud-server.com.
You should be able to edit the file as a co-author now, using your Nextcloud account as a webid identity provider.
2 changes: 1 addition & 1 deletion env-vars-server.list
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SERVER_ROOT=https://server
STORAGE_ROOT=https://server/apps/solid/@alice/storage
ALICE_WEBID=https://server/apps/solid/@alice/profile/turtle#me
ALICE_WEBID=https://server/apps/solid/@alice/profile/card#me
COOKIE_TYPE=nextcloud-compatible
USERNAME=alice
PASSWORD=alice123
6 changes: 3 additions & 3 deletions env-vars-testers.list
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
WEBID_ALICE=https://server/apps/solid/@alice/profile/turtle#me
WEBID_ALICE=https://server/apps/solid/@alice/profile/card#me
OIDC_ISSUER_ALICE=https://server
STORAGE_ROOT_ALICE=https://server/apps/solid/@alice/storage
WEBID_BOB=https://thirdparty/apps/solid/@alice/profile/turtle#me
WEBID_BOB=https://thirdparty/apps/solid/@alice/profile/card#me
OIDC_ISSUER_BOB=https://thirdparty
STORAGE_ROOT_BOB=https://thirdparty/
ALICE_WEBID=https://server/apps/solid/@alice/profile/turtle#me
ALICE_WEBID=https://server/apps/solid/@alice/profile/card#me
SERVER_ROOT_ESCAPED=https:\/\/server
SERVER_ROOT=https://server
STORAGE_ROOT=https://server/apps/solid/@alice/storage
2 changes: 1 addition & 1 deletion env-vars-thirdparty.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SERVER_ROOT=https://thirdparty
ALICE_WEBID=https://thirdparty/apps/solid/@alice/profile/turtle#me
ALICE_WEBID=https://thirdparty/apps/solid/@alice/profile/card#me
COOKIE_TYPE=nextcloud-compatible
USERNAME=alice
PASSWORD=alice123
2 changes: 1 addition & 1 deletion env.list
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ALICE_WEBID=https://server/apps/solid/@alice/profile/turtle#me
ALICE_WEBID=https://server/apps/solid/@alice/profile/card#me
COOKIE_TYPE=nextcloud-compatible
2 changes: 1 addition & 1 deletion solid/lib/Controller/AppController.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private function getAppsList() {
}

private function getProfilePage() {
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $this->userId, "path" => "/turtle"))) . "#me";
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $this->userId, "path" => "/card"))) . "#me";
}
private function getStorageUrl($userId) {
$storageUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.storage.handleHead", array("userId" => $userId, "path" => "foo")));
Expand Down
2 changes: 1 addition & 1 deletion solid/lib/Controller/CalendarController.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private function generateDefaultAcl($userId) {
}

private function getUserProfile($userId) {
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/turtle"))) . "#me";
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/card"))) . "#me";
}
private function getCalendarUrl($userId) {
$calendarUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.calendar.handleHead", array("userId" => $userId, "path" => "foo")));
Expand Down
2 changes: 1 addition & 1 deletion solid/lib/Controller/ContactsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private function generateDefaultAcl($userId) {
}

private function getUserProfile($userId) {
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/turtle"))) . "#me";
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/card"))) . "#me";
}
private function getContactsUrl($userId) {
$contactsUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.contacts.handleHead", array("userId" => $userId, "path" => "foo")));
Expand Down
2 changes: 1 addition & 1 deletion solid/lib/Controller/PageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private function getUserProfile($userId) {
$profile = array(
'id' => $userId,
'displayName' => $user->getDisplayName(),
'profileUri' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/turtle"))) . "#me",
'profileUri' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/card"))) . "#me",
'navigation' => array(
"profile" => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.page.profile", array("userId" => $this->userId))),
"launcher" => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.app.appLauncher", array())),
Expand Down
4 changes: 2 additions & 2 deletions solid/lib/Controller/ProfileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private function generateDefaultAcl($userId) {
}

private function getUserProfileUri($userId) {
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/turtle"))) . "#me";
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/card"))) . "#me";
}
private function getProfileUrl($userId) {
$profileUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleHead", array("userId" => $userId, "path" => "foo")));
Expand Down Expand Up @@ -266,7 +266,7 @@ private function getUserProfile($userId) {
$profile = array(
'id' => $userId,
'displayName' => $user->getDisplayName(),
'profileUri' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/turtle"))) . "#me",
'profileUri' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/card"))) . "#me",
'friends' => $friends,
'inbox' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.storage.handleGet", array("userId" => $userId, "path" => "/inbox/"))),
'preferences' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.storage.handleGet", array("userId" => $userId, "path" => "/settings/preferences.ttl"))),
Expand Down
2 changes: 1 addition & 1 deletion solid/lib/Controller/ServerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private function checkApproval($clientId) {
}

private function getProfilePage() {
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $this->userId, "path" => "/turtle"))) . "#me";
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $this->userId, "path" => "/card"))) . "#me";
}

private function getResponseType() {
Expand Down
2 changes: 1 addition & 1 deletion solid/lib/Controller/StorageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private function getFileSystem() {
}

private function getUserProfile($userId) {
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/turtle"))) . "#me";
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/card"))) . "#me";
}
private function getStorageUrl($userId) {
$storageUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.storage.handleHead", array("userId" => $userId, "path" => "foo")));
Expand Down
2 changes: 1 addition & 1 deletion solid/lib/ServerConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function setProfileData($userId, $profileData) {
$graph = new \EasyRdf_Graph();
$graph->parse($profileData, 'turtle');
$data = $graph->toRdfPhp();
$subject = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/turtle"))) . "#me";
$subject = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.profile.handleGet", array("userId" => $userId, "path" => "/card"))) . "#me";
$subjectData = $data[$subject];
$fields = array(
"name" => $subjectData['http://xmlns.com/foaf/0.1/name'][0]['value']
Expand Down

0 comments on commit 1922389

Please sign in to comment.