Merge branch 'develop'

Author: eveffer

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",

src/auth/actions/auth-check.ts

@@ -1,6 +1,6 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
+import { defineAPIAction } from "../../api/cloud-action.ts";
 
-const authCheck = new CloudAPIAction("authCheck", {
+const authCheck = defineAPIAction("authCheck", {
   description: "Check if user is authenticated",
   action({ inRequest }) {
     const user = inRequest.context.get("user");

src/auth/actions/get-account.ts

@@ -1,7 +1,7 @@
-import { CloudAPIAction } from "../../api/cloud-action.ts";
+import { defineAPIAction } from "../../api/cloud-action.ts";
 import type { SessionData } from "../types.ts";
 
-export const getAccount = new CloudAPIAction("getAccount", {
+export const getAccount = defineAPIAction("getAccount", {
   description: "Gets the account for the current authenticated user",
   async action({ inRequest, inCloud }) {
     const user = inRequest.context.get<SessionData>("user");

src/auth/actions/login.ts

@@ -1,8 +1,8 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
+import { defineAPIAction } from "~/api/cloud-action.ts";
 
 import { raiseServerException } from "~/serve/server-exception.ts";
 
-const login = new CloudAPIAction("login", {
+const login = defineAPIAction("login", {
   label: "Login",
   description: "Login to the system",
   authRequired: false,

src/auth/actions/logout.ts

@@ -1,6 +1,6 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
+import { defineAPIAction } from "@inspatial/cloud";
 
-const logout = new CloudAPIAction("logout", {
+const logout = defineAPIAction("logout", {
   label: "Logout",
   description: "Logout user",
   async action({ inCloud, inRequest, inResponse }) {

src/auth/actions/register-account.ts

@@ -1,7 +1,7 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
 import { raiseCloudException } from "~/serve/exeption/cloud-exception.ts";
+import { defineAPIAction } from "@inspatial/cloud";
 
-export const registerAccount = new CloudAPIAction("registerAccount", {
+export const registerAccount = defineAPIAction("registerAccount", {
   label: "Register Account",
   description: "Create a new acount and assign the given user as the owner.",
   authRequired: false,
@@ -33,11 +33,10 @@ export const registerAccount = new CloudAPIAction("registerAccount", {
     });
     await user.save();
     await user.runAction("setPassword", { password });
-    const account = await orm.createEntry("account", {
+    await orm.createEntry("account", {
       name: `${firstName} ${lastName}'s Account`,
       users: [{ user: user.$id, isOwner: true }],
     });
-    await account.enqueueAction("initialize");
     return await inCloud.auth.createUserSession(user, inRequest, inResponse);
   },
   params: [{

src/auth/actions/register-user.ts

@@ -1,7 +1,7 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
+import { defineAPIAction } from "~/api/cloud-action.ts";
 import { raiseCloudException } from "../../serve/exeption/cloud-exception.ts";
 
-const registerUser = new CloudAPIAction("registerUser", {
+const registerUser = defineAPIAction("registerUser", {
   description: "Register a new user",
   hideFromApi: true,
   async action({ orm, params }) {

src/auth/actions/reset-password.ts

@@ -1,6 +1,6 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
+import { defineAPIAction } from "~/api/cloud-action.ts";
 
-export const resetPassword = new CloudAPIAction("resetPassword", {
+export const resetPassword = defineAPIAction("resetPassword", {
   description: "Reset user password",
   authRequired: false,
   label: "Reset Password",

src/auth/actions/set-new-password.ts

@@ -1,7 +1,7 @@
-import { CloudAPIAction } from "~/api/cloud-action.ts";
+import { defineAPIAction } from "~/api/cloud-action.ts";
 import { raiseServerException } from "~/serve/server-exception.ts";
 
-export const setNewPassword = new CloudAPIAction("setNewPassword", {
+export const setNewPassword = defineAPIAction("setNewPassword", {
   description: "Reset user password",
   authRequired: false,
   async action({ orm, params }) {

src/auth/actions/switch-account.ts

@@ -0,0 +1,46 @@
+import { defineAPIAction } from "../../api/cloud-action.ts";
+import { raiseServerException } from "../../serve/server-exception.ts";
+import type { SessionData } from "../types.ts";
+
+export const switchAccount = defineAPIAction("switchAccount", {
+  label: "Switch Logged-in Account",
+  description:
+    "Switch the current logged-in account to another account that the user has access to",
+  params: [{
+    key: "accountId",
+    label: "Account ID",
+    type: "DataField",
+    description: "The ID of the account to switch to",
+    required: true,
+  }],
+  async action({
+    inCloud,
+    inRequest,
+    params,
+  }) {
+    const { accountId } = params;
+    const user = inRequest.context.get<SessionData>("user");
+    if (!user) {
+      raiseServerException(401, "unauthorized");
+    }
+    const foundId = user.accounts.find((acc) => acc.accountId === accountId);
+    if (!foundId) {
+      raiseServerException(403, "forbidden");
+    }
+    user.accountId = accountId;
+    const orm = inCloud.orm.withUser(inCloud.orm.systemGobalUser);
+    const sessionEntry = await orm.findEntry("userSession", {
+      sessionId: user.sessionId,
+    });
+    if (!sessionEntry) {
+      raiseServerException(401, "unauthorized");
+    }
+    sessionEntry.update({
+      sessionData: user,
+    });
+    await sessionEntry.save();
+    inRequest.context.update("user", user);
+    inCloud.inCache.setValue("userSession", user.sessionId, user);
+    return user;
+  },
+});