2.0-beta.2

Author: zmh-program

index.ts

@@ -1,40 +1,37 @@
-const express = require('express');
+import {isExistRepo} from "./utils";
+
 const logger = (require("log4js")).getLogger("Backend");
 const stats = require('./stats');
 const conf = require('./config');
-const app = express();
+const utils = require('./utils');
+const app = require('express')();
 
 logger.level = "debug";
 app.set('views',__dirname + '/views');
 app.set("view engine","ejs");
 
-
-const notAccess = (username) => {
-    return ( ! username ) || (! ( conf.requires.includes("*") || conf.requires.includes(username)));
-}
-
-app.get('/', function(req, res) {
+app.get('/', function(req: any, res: any) {
     res.render('index');
 })
 
-app.get('/user/:user/', async function (req, res) {
+app.get('/user/:user/', async function (req: any, res: any) {
   res.type('svg');
 
   try {
     const username = req.params['user'];
-    if (notAccess(username)) throw new Error();
+    if (await utils.isAuthenticated(username)) throw new Error();
     res.render('user', await stats.getAccount(username, req.query['theme'] === 'dark'));
   } catch (e) {
     res.render('error', {dark: req.query['theme'] === 'dark'});
   }
 });
 
-app.get('/repo/:user/:repo/', async function (req, res) {
+app.get('/repo/:user/:repo/', async function (req: any, res: any) {
   res.type('svg');
   try {
     const username = req.params['user'], repo = req.params['repo'];
 
-    if (notAccess(username) || (!repo.length)) throw new Error();
+    if (await isExistRepo(username, repo)) throw new Error();
     res.render('repo', await stats.getRepository(username, repo, req.query['theme'] === 'dark'))
   } catch (e) {
     res.render('error', {dark: req.query['theme'] === 'dark'});

utils.ts

@@ -48,27 +48,27 @@ export async function request(url: string): Promise<any> {
     return response.data;
 }
 
-export async function requestUser(user): Promise<any> {
+export async function requestUser(user: string): Promise<any> {
     return await request(`/users/${user}`);
 }
 
-export async function listRepos(user): Promise<object> {
-    return Object.values(await request(`/users/${user}/repos`)).filter(repo => !repo['fork']);
+export async function listRepos(user: string): Promise<object> {
+    return Object.values(await request(`/users/${user}/repos`)).filter((repo: object): boolean => !repo['fork']);
 }
 
-export async function requestRepo(user, repo): Promise<any> {
+export async function requestRepo(user: string, repo: string): Promise<any> {
     return await request(`/repos/${user}/${repo}`);
 }
 
-export async function requestLanguage(user, repo): Promise<any> {
+export async function requestLanguage(user: string, repo: string): Promise<any> {
     return await request(`/repos/${user}/${repo}/languages`);
 }
 
-export function getLicense(license: object | undefined | null): string {
+export function getLicense(license: any): string {
     return license ? license['spdx_id'] : "Empty";
 }
 
-async function _isAuthenticated(user): Promise<boolean> {
+async function _isAuthenticated(user: string): Promise<boolean> {
     user = user.trim();
     try {
         return (!!user.length) &&
@@ -80,10 +80,11 @@ async function _isAuthenticated(user): Promise<boolean> {
 }
 export const isAuthenticated = cache.wrap(_isAuthenticated);
 
-async function _isExistRepo(user, repo): Promise<boolean> {
+async function _isExistRepo(user: string, repo: string): Promise<boolean> {
     user = user.trim(); repo = repo.trim();
     try {
-        return await isAuthenticated(user) &&
+        return (await isAuthenticated(user)) &&
+            (!!repo.length) &&
             ((await requestRepo(user, repo))['message'] !== "Not Found");
     } catch {
         return false;