From 7ed3795da542bab397ee7ed8978bde896abf5cf4 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 6 Feb 2018 17:54:49 +0300
Subject: server: merge api and ws

---
 .../main/java/com/juick/api/controllers/Users.java | 125 ---------------------
 1 file changed, 125 deletions(-)
 delete mode 100644 juick-api/src/main/java/com/juick/api/controllers/Users.java

(limited to 'juick-api/src/main/java/com/juick/api/controllers/Users.java')

diff --git a/juick-api/src/main/java/com/juick/api/controllers/Users.java b/juick-api/src/main/java/com/juick/api/controllers/Users.java
deleted file mode 100644
index b221d9fe..00000000
--- a/juick-api/src/main/java/com/juick/api/controllers/Users.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2008-2017, 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.api.controllers;
-
-import com.juick.User;
-import com.juick.server.util.HttpForbiddenException;
-import com.juick.server.util.HttpNotFoundException;
-import com.juick.service.UserService;
-import com.juick.server.util.UserUtils;
-import com.juick.server.util.WebUtils;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author ugnich
- */
-@RestController
-public class Users {
-    @Inject
-    private UserService userService;
-
-    @RequestMapping(value = "/auth", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public String getAuthToken() {
-        return userService.getHashByUID(UserUtils.getCurrentUser().getUid());
-    }
-
-    @RequestMapping(value = "/users", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public List<User> doGetUsers(
-            @RequestParam(value = "uname", required = false) List<String> unames) {
-        List<com.juick.User> users = new ArrayList<>();
-
-        if (unames != null) {
-            unames.removeIf(WebUtils::isNotUserName);
-
-            if (!unames.isEmpty() && unames.size() < 20)
-                users.addAll(userService.getUsersByName(unames));
-        }
-
-        if (!users.isEmpty())
-            return users;
-        if (!UserUtils.getCurrentUser().isAnonymous()) {
-            return Collections.singletonList(UserUtils.getCurrentUser());
-        }
-
-        throw new HttpNotFoundException();
-    }
-
-    @RequestMapping(value = "/users/read", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public List<User> doGetUserRead(
-            @RequestParam String uname) {
-        User visitor = UserUtils.getCurrentUser();
-        int vuid = visitor.getUid();
-        if (vuid == 0) {
-            throw new HttpForbiddenException();
-        }
-        int uid = 0;
-        if (uname == null) {
-            uid = vuid;
-        } else {
-            if (WebUtils.isUserName(uname)) {
-                com.juick.User u = userService.getUserByName(uname);
-                if (u != null && u.getUid() > 0) {
-                    uid = u.getUid();
-                }
-            }
-        }
-
-        if (uid > 0) {
-            List<Integer> uids = userService.getUserRead(uid);
-            if (uids.size() > 0) {
-                List<com.juick.User> users = userService.getUsersByID(uids);
-                if (users.size() > 0) {
-                    return users;
-                }
-            }
-        }
-        throw new HttpNotFoundException();
-    }
-
-    @RequestMapping(value = "/users/readers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public List<User> doGetUserReaders(
-            @RequestParam String uname) {
-        User visitor = UserUtils.getCurrentUser();
-        int vuid = visitor.getUid();
-        if (vuid == 0) {
-            throw new HttpForbiddenException();
-        }
-        int uid = 0;
-        if (uname == null) {
-            uid = vuid;
-        } else {
-            if (WebUtils.isUserName(uname)) {
-                com.juick.User u = userService.getUserByName(uname);
-                if (u != null && u.getUid() > 0) {
-                    uid = u.getUid();
-                }
-            }
-        }
-
-        if (uid > 0) {
-            return userService.getUserReaders(uid);
-        }
-        throw new HttpNotFoundException();
-    }
-}
-- 
cgit v1.2.3