Reorganize layout and code cleanup

3 files changed, 157 insertions, 0 deletions

diff --git a/src/main/java/com/juick/www/api/webfinger/Resource.java b/src/main/java/com/juick/www/api/webfinger/Resource.java
new file mode 100644
index 00000000..1529ea09
--- /dev/null
+++ b/src/main/java/com/juick/www/api/webfinger/Resource.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2008-2019, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.www.api.webfinger;
+
+import com.juick.model.User;
+import com.juick.www.api.webfinger.model.Account;
+import com.juick.www.api.webfinger.model.Link;
+import com.juick.server.util.HttpNotFoundException;
+import com.juick.service.UserService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.UriComponentsBuilder;
+import rocks.xmpp.addr.Jid;
+
+import javax.inject.Inject;
+import java.util.Collections;
+
+import static com.juick.www.api.activity.model.Context.ACTIVITY_MEDIA_TYPE;
+
+@RestController
+public class Resource {
+    @Inject
+    private UserService userService;
+    @Value("${web_domain:localhost}")
+    private String domain;
+    @Value("${ap_base_uri:http://localhost:8080/}")
+    private String baseUri;
+
+    @GetMapping(value = "/.well-known/webfinger", produces = "application/jrd+json;charset=utf-8")
+    public Account getWebResource(@RequestParam String resource) {
+        if (resource.startsWith("acct:")) {
+            Jid account = Jid.of(resource.substring(5));
+            if (account.getDomain().equals(domain)) {
+                User user = userService.getUserByName(account.getLocal());
+                if (!user.isAnonymous()) {
+                    UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(baseUri);
+                    builder.path(String.format("/u/%s", user.getName()));
+                    Link blog = new Link();
+                    blog.setRel("self");
+                    blog.setType(ACTIVITY_MEDIA_TYPE);
+                    blog.setHref(builder.toUriString());
+                    Account result = new Account();
+                    result.setSubject(resource);
+                    result.setLinks(Collections.singletonList(blog));
+                    return result;
+                }
+            }
+        }
+        throw new HttpNotFoundException();
+    }
+}
diff --git a/src/main/java/com/juick/www/api/webfinger/model/Account.java b/src/main/java/com/juick/www/api/webfinger/model/Account.java
new file mode 100644
index 00000000..92008604
--- /dev/null
+++ b/src/main/java/com/juick/www/api/webfinger/model/Account.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2008-2019, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.www.api.webfinger.model;
+
+import java.util.List;
+
+public class Account {
+    private String subject;
+    private List<Link> links;
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public List<Link> getLinks() {
+        return links;
+    }
+
+    public void setLinks(List<Link> links) {
+        this.links = links;
+    }
+}
diff --git a/src/main/java/com/juick/www/api/webfinger/model/Link.java b/src/main/java/com/juick/www/api/webfinger/model/Link.java
new file mode 100644
index 00000000..437b53f7
--- /dev/null
+++ b/src/main/java/com/juick/www/api/webfinger/model/Link.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008-2019, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.www.api.webfinger.model;
+
+public class Link {
+    private String rel;
+    private String type;
+    private String href;
+
+    public String getRel() {
+        return rel;
+    }
+
+    public void setRel(String rel) {
+        this.rel = rel;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getHref() {
+        return href;
+    }
+
+    public void setHref(String href) {
+        this.href = href;
+    }
+}