@ysgroup/core 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ysgroup/core",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/index.ts

@@ -2,12 +2,4 @@
 
 export { YsWsClient, type Envelope } from "./ws";
 export { useYsStore } from "./store";
-export {
-	YsRest,
-	YsRestError,
-	type YsAdminRpcCall,
-	type DeleteBlocker,
-	type DeleteImpact,
-	type RevealedCredential,
-	type TopologyNode,
-} from "./rest";
+export { YsRest, YsRestError, type YsAdminRpcCall, type DeleteBlocker, type DeleteImpact, type RevealedCredential, type TopologyNode } from "./rest";

package/src/rest.ts

@@ -48,13 +48,13 @@ export class YsRest {
   private async request<T>(method: string, path: string, body?: unknown): Promise<T> {
     if (this.rpcCall) {
       try {
-        return await this.rpcCall({
+        return (await this.rpcCall({
           method,
           path,
           access_token: this.getToken(),
           body,
           user_agent: navigator.userAgent,
-        }) as T;
+        })) as T;
       } catch (error) {
         throw rpcError(error);
       }
@@ -84,7 +84,7 @@ export class YsRest {
   private async upload<T>(path: string, file: File): Promise<T> {
     if (this.rpcCall) {
       try {
-        return await this.rpcCall({
+        return (await this.rpcCall({
           method: "POST",
           path,
           access_token: this.getToken(),
@@ -94,7 +94,7 @@ export class YsRest {
             base64: await fileToBase64(file),
           },
           user_agent: navigator.userAgent,
-        }) as T;
+        })) as T;
       } catch (error) {
         throw rpcError(error);
       }
@@ -211,11 +211,11 @@ export class YsRest {
     return this.request("DELETE", `/api/users/${id}`);
   }
   getUserApps(id: string) {
-    return this.request<string[]>("GET", `/api/users/${id}/apps`);
+    return this.request<{ app_id: string; admin: boolean }[]>("GET", `/api/users/${id}/apps`);
   }
-  setUserApps(id: string, appIds: string[]) {
-    return this.request<{ app_ids: string[] }>("PUT", `/api/users/${id}/apps`, {
-      app_ids: appIds,
+  setUserApps(id: string, grants: { app_id: string; admin: boolean }[]) {
+    return this.request<{ grants: { app_id: string; admin: boolean }[] }>("PUT", `/api/users/${id}/apps`, {
+      grants,
     });
   }
   uploadOpenAccountConfirmation(ownerId: string, file: File) {

package/src/store.ts

@@ -139,7 +139,9 @@ export const useYsStore = defineStore("ys", () => {
     if (!ws || !accessToken.value) throw new Error("未登录");
     if (
       String(user.value?.role ?? "") === "Root" ||
-      String(user.value?.username ?? "").trim().toLowerCase() === "root"
+      String(user.value?.username ?? "")
+        .trim()
+        .toLowerCase() === "root"
     ) {
       throw new Error("Root 不允许修改登录密码");
     }
@@ -196,6 +198,11 @@ export const useYsStore = defineStore("ys", () => {
     clearSession();
   }
 
+  function forceLogout(message = "") {
+    clearSession();
+    sessionMessage.value = message;
+  }
+
   function clearSession() {
     user.value = null;
     accessToken.value = "";
@@ -207,8 +214,22 @@ export const useYsStore = defineStore("ys", () => {
   }
 
   return {
-    user, accessToken, refreshToken, connected, isLoggedIn, sessionMessage, tables,
-    tableList, connect, login, loginByCode, waitUntilConnected, changeMyPassword, renew, logout,
+    user,
+    accessToken,
+    refreshToken,
+    connected,
+    isLoggedIn,
+    sessionMessage,
+    tables,
+    tableList,
+    connect,
+    login,
+    loginByCode,
+    waitUntilConnected,
+    changeMyPassword,
+    renew,
+    logout,
+    forceLogout,
     client: () => ws,
   };
 });