@kevisual/auth 1.0.5-alpha.1 → 1.0.5

package/dist/create-token.d.ts

@@ -13,6 +13,19 @@ declare const createToken: (user: {
     username: string;
     [key: string]: any;
 }, secret: string, expiresIn?: string) => Promise<string>;
+/**
+ * check token
+ * @param token
+ * @param secret
+ * @returns
+ */
 declare const checkToken: (token: string, secret: string) => Promise<jwt.Jwt>;
+/**
+ * check auth and return token user
+ * @param token
+ * @param secret
+ * @returns
+ */
+declare const checkTokenUser: (token: string, secret: string) => Promise<string | jwt.JwtPayload>;
 
-export { checkToken, createToken };
+export { checkToken, checkTokenUser, createToken };

package/dist/{create-token.js → create-token.mjs}

@@ -6332,8 +6332,24 @@ const createToken = async (user, secret, expiresIn = '7d') => {
         expiresIn
     });
 };
+/**
+ * check token
+ * @param token
+ * @param secret
+ * @returns
+ */
 const checkToken = async (token, secret) => {
     return jwt.verify(token, secret, { complete: true });
 };
+/**
+ * check auth and return token user
+ * @param token
+ * @param secret
+ * @returns
+ */
+const checkTokenUser = async (token, secret) => {
+    const result = await checkToken(token, secret);
+    return result.payload;
+};
 
-export { checkToken, createToken };
+export { checkToken, checkTokenUser, createToken };

package/dist/index.d.ts

@@ -34,6 +34,12 @@ declare const createToken: (user: {
     username: string;
     [key: string]: any;
 }, secret: string, expiresIn?: string) => Promise<string>;
+/**
+ * check token
+ * @param token
+ * @param secret
+ * @returns
+ */
 declare const checkToken: (token: string, secret: string) => Promise<jwt.Jwt>;
 
 type CreateAuthRouteOptions = {

package/dist/{index.js → index.mjs}

@@ -7457,6 +7457,12 @@ const createToken = async (user, secret, expiresIn = '7d') => {
         expiresIn
     });
 };
+/**
+ * check token
+ * @param token
+ * @param secret
+ * @returns
+ */
 const checkToken = async (token, secret) => {
     return jwt.verify(token, secret, { complete: true });
 };

package/dist/is-me.d.ts

@@ -0,0 +1,14 @@
+type MeAuthOptions = {
+    id?: string;
+    username?: string;
+    orgs?: string[];
+};
+/**
+ * check is me
+ * @param tokenUser
+ * @param opts
+ * @returns
+ */
+declare const isMe: (tokenUser: any, opts: MeAuthOptions) => Promise<boolean>;
+
+export { isMe };

package/dist/is-me.mjs

@@ -0,0 +1,28 @@
+/**
+ * check is me
+ * @param tokenUser
+ * @param opts
+ * @returns
+ */
+const isMe = async (tokenUser, opts) => {
+    if (!opts.id && !opts.username && !opts.orgs) {
+        return false;
+    }
+    if (opts.id && tokenUser?.id === opts.id) {
+        return true;
+    }
+    if (opts.username && tokenUser?.username === opts.username) {
+        return true;
+    }
+    if (opts.orgs && tokenUser?.orgs) {
+        const orgs = tokenUser.orgs;
+        for (const org of opts.orgs) {
+            if (orgs.includes(org)) {
+                return true;
+            }
+        }
+    }
+    return false;
+};
+
+export { isMe };

package/dist/proxy.d.ts

@@ -19,7 +19,8 @@ declare class AuthQuery {
 type AuthProxy = {
     queryMe: (token: string) => Promise<any>;
     /**
-     * 代理设置token用户
+     * 代理设置token用户, 自己去处理ctx.state['tokenUser']
+     * 可能tokenUser的内容会有一些特殊的处理
      * @param ctx
      * @param data
      * @returns

package/dist/{proxy.js → proxy.mjs}

@@ -18,7 +18,7 @@ class AuthQuery {
     path;
     constructor(opts) {
         this.host = opts?.host || 'localhost:114000';
-        this.path = opts?.path || '/api/auth';
+        this.path = opts?.path || '/api/router';
         const protol = opts?.protol || 'http';
         this.url = `${protol}://${this.host}${this.path}`;
     }
@@ -51,7 +51,7 @@ const createAuthRoute = ({ app, addToApp = true, proxy }) => {
     const authRouteFn = async (ctx) => {
         const token = ctx.query.token;
         if (!token) {
-            app.throw(401, 'Token is Unauthorized');
+            ctx.throw(401, 'Token is Unauthorized');
         }
         if (proxy?.cacheMe) {
             const cache = await proxy?.cacheMe?.(token);
@@ -67,21 +67,21 @@ const createAuthRoute = ({ app, addToApp = true, proxy }) => {
         }
         try {
             const result = await proxy?.queryMe?.(token);
-            if (result.code === 200) {
-                result.payload = result.data;
+            if (result.code !== 200) {
+                ctx.throw(result.code, result.message);
             }
             if (proxy?.setTokenUser) {
                 await proxy?.setTokenUser?.(ctx, result.data);
             }
             else {
-                ctx.state['tokenUser'] = result.payload;
+                ctx.state['tokenUser'] = result.data;
             }
             if (proxy?.setCahceMe) {
                 await proxy?.setCahceMe?.(token, result.data);
             }
         }
         catch (e) {
-            app.throw(401, 'Token is invalid');
+            ctx.throw(401, 'Token is invalid');
         }
     };
     let authRoute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/auth",
-  "version": "1.0.5-alpha.1",
+  "version": "1.0.5",
   "description": "",
   "main": "dist/index.js",
   "type": "module",
@@ -20,9 +20,6 @@
   ],
   "author": "",
   "license": "ISC",
-  "peerDependencies": {
-    "@kevisual/router": ">=0.0.4"
-  },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
@@ -31,7 +28,7 @@
     "@types/jsonwebtoken": "^9.0.7",
     "crypto-js": "^4.2.0",
     "jsonwebtoken": "^9.0.2",
-    "rollup": "^4.27.2",
+    "rollup": "^4.28.1",
     "rollup-plugin-dts": "^6.1.1",
     "tslib": "^2.8.1"
   },
@@ -41,20 +38,24 @@
   },
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.js"
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.mjs"
     },
     "./token": {
-      "import": "./dist/create-token.js",
-      "require": "./dist/create-token.js"
+      "import": "./dist/create-token.mjs",
+      "require": "./dist/create-token.mjs"
     },
     "./salt": {
-      "import": "./dist/create-token.js",
-      "require": "./dist/create-token.js"
+      "import": "./dist/create-token.mjs",
+      "require": "./dist/create-token.mjs"
     },
     "./proxy": {
-      "import": "./dist/proxy.js",
-      "require": "./dist/proxy.js"
+      "import": "./dist/proxy.mjs",
+      "require": "./dist/proxy.mjs"
+    },
+    "./is-me": {
+      "import": "./dist/is-me.mjs",
+      "require": "./dist/is-me.mjs"
     }
   },
   "publishConfig": {

package/src/create-token.ts

@@ -24,6 +24,23 @@ export const createToken = async (
   });
 };
 
+/**
+ * check token
+ * @param token
+ * @param secret
+ * @returns
+ */
 export const checkToken = async (token: string, secret: string) => {
   return jwt.verify(token, secret, { complete: true });
 };
+
+/**
+ * check auth and return token user
+ * @param token
+ * @param secret
+ * @returns
+ */
+export const checkTokenUser = async (token: string, secret: string) => {
+  const result = await checkToken(token, secret);
+  return result.payload;
+};

package/src/is-me.ts

@@ -0,0 +1,32 @@
+type MeAuthOptions = {
+  id?: string;
+  username?: string;
+  orgs?: string[];
+};
+
+/**
+ * check is me
+ * @param tokenUser
+ * @param opts
+ * @returns
+ */
+export const isMe = async (tokenUser: any, opts: MeAuthOptions) => {
+  if (!opts.id && !opts.username && !opts.orgs) {
+    return false;
+  }
+  if (opts.id && tokenUser?.id === opts.id) {
+    return true;
+  }
+  if (opts.username && tokenUser?.username === opts.username) {
+    return true;
+  }
+  if (opts.orgs && tokenUser?.orgs) {
+    const orgs = tokenUser.orgs;
+    for (const org of opts.orgs) {
+      if (orgs.includes(org)) {
+        return true;
+      }
+    }
+  }
+  return false;
+};

package/src/proxy.ts

@@ -23,7 +23,7 @@ export class AuthQuery {
   path: string;
   constructor(opts?: AuthProxyOptions) {
     this.host = opts?.host || 'localhost:114000';
-    this.path = opts?.path || '/api/auth';
+    this.path = opts?.path || '/api/router';
     const protol = opts?.protol || 'http';
     this.url = `${protol}://${this.host}${this.path}`;
   }
@@ -51,7 +51,8 @@ export class AuthQuery {
 type AuthProxy = {
   queryMe: (token: string) => Promise<any>;
   /**
-   * 代理设置token用户
+   * 代理设置token用户, 自己去处理ctx.state['tokenUser']
+   * 可能tokenUser的内容会有一些特殊的处理
    * @param ctx
    * @param data
    * @returns
@@ -73,7 +74,7 @@ export const createAuthRoute = ({ app, addToApp = true, proxy }: CreateAuthRoute
   const authRouteFn = async (ctx: any) => {
     const token = ctx.query.token;
     if (!token) {
-      app.throw(401, 'Token is Unauthorized');
+      ctx.throw(401, 'Token is Unauthorized');
     }
     if (proxy?.cacheMe) {
       const cache = await proxy?.cacheMe?.(token);
@@ -88,19 +89,19 @@ export const createAuthRoute = ({ app, addToApp = true, proxy }: CreateAuthRoute
     }
     try {
       const result = await proxy?.queryMe?.(token);
-      if (result.code === 200) {
-        result.payload = result.data;
+      if (result.code !== 200) {
+        ctx.throw(result.code, result.message);
       }
       if (proxy?.setTokenUser) {
         await proxy?.setTokenUser?.(ctx, result.data);
       } else {
-        ctx.state['tokenUser'] = result.payload;
+        ctx.state['tokenUser'] = result.data;
       }
       if (proxy?.setCahceMe) {
         await proxy?.setCahceMe?.(token, result.data);
       }
     } catch (e) {
-      app.throw(401, 'Token is invalid');
+      ctx.throw(401, 'Token is invalid');
     }
   };
   let authRoute;