Revert "feat(server): use region apis"

This reverts commit 8d48c16.

packages/react/src/GoogleLoginButton/GoogleLoginButton.tsx

@@ -20,13 +20,15 @@ const LOGIN_PATH = 'users/oidc/google/login';
  */
 export default function GoogleSSOButton(props: {
   href?: string;
+  workspace?: string;
   database?: string;
   newTenantName?: string;
 }) {
-  const { database, newTenantName } = props;
+  const { workspace, database, newTenantName } = props;
   const { basePath } = useNileConfig();
+  const encodedWorkspace = encodeURIComponent(workspace ?? '');
   const encodedDatabase = encodeURIComponent(database ?? '');
-  const contextHref = `${basePath}/databases/${encodedDatabase}/${LOGIN_PATH}`;
+  const contextHref = `${basePath}/workspaces/${encodedWorkspace}/databases/${encodedDatabase}/${LOGIN_PATH}`;
   const query = newTenantName
     ? '?newTenant=' + encodeURIComponent(newTenantName)
     : '';

packages/react/test/GoogleLoginButton/GoogleSSOButton.test.tsx

@@ -16,12 +16,12 @@ describe('google sso button', () => {
   it('renders using the context', () => {
     render(
       <NileProvider>
-        <GoogleSSOButton database="database" />
+        <GoogleSSOButton workspace="workspace" database="database" />
       </NileProvider>
     );
     screen.getByText('Continue with Google');
     expect(screen.getByRole('link').getAttribute('href')).toEqual(
-      'https://api.thenile.dev/databases/database/users/oidc/google/login'
+      'https://api.thenile.dev/workspaces/workspace/databases/database/users/oidc/google/login'
     );
   });
 });

packages/react/test/SSO/Okta.test.tsx

@@ -20,7 +20,7 @@ describe('Okta', () => {
       <NileProvider api={api}>
         <Okta
           onSuccess={onSuccess}
-          callbackUrl="http://localhost:8080/databases/database/tenants/tenantId/auth/oidc/callback"
+          callbackUrl="http://localhost:8080/workspaces/workspace/databases/database/tenants/tenantId/auth/oidc/callback"
           providers={[]}
         />
       </NileProvider>

packages/server/README.md

@@ -10,9 +10,9 @@ import Server from '@niledatabase/server';
 const connection = {
   user: process.env.NILE_USER,
   password: process.env.NILE_PASSWORD,
-  host: process.env.NILE_DB_HOST,
 };
 const nile = Server({
+  workspace: String(process.env.NILE_WORKSPACE),
   database: String(process.env.NILE_DATABASE),
   api: {
     basePath: String(process.env.BASE_PATH),

packages/server/src/auth/index.ts

@@ -15,7 +15,9 @@ export default class Auth extends Config {
     super(config);
   }
   get loginUrl() {
-    return `/databases/${encodeURIComponent(this.database)}/users/login`;
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/users/login`;
   }
 
   login = async (
@@ -117,13 +119,17 @@ export default class Auth extends Config {
   };
 
   loginSSOUrl = (provider: string) => {
-    return `/databases/${encodeURIComponent(this.database)}/tenants/${
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/tenants/${
       this.tenantId ?? '{tenantId}'
     }/auth/oidc/providers/${provider}/login`;
   };
 
   get signUpUrl() {
-    return `/databases/${encodeURIComponent(this.database)}/users`;
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/users`;
   }
 
   signUp = async (
@@ -156,13 +162,17 @@ export default class Auth extends Config {
   };
 
   updateProviderUrl(providerName: string) {
-    return `/databases/${encodeURIComponent(this.database)}/tenants/${
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/tenants/${
       this.tenantId ? encodeURIComponent(this.tenantId) : '{tenantId}'
     }/auth/oidc/providers/${encodeURIComponent(providerName)}`;
   }
 
   get listTenantProvidersUrl() {
-    return `/databases/${encodeURIComponent(this.database)}/tenants/${
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/tenants/${
       this.tenantId ? encodeURIComponent(this.tenantId) : '{tenantId}'
     }/auth/oidc/providers`;
   }
@@ -194,7 +204,9 @@ export default class Auth extends Config {
   };
 
   providerUrl(email?: undefined | string) {
-    return `/databases/${encodeURIComponent(
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(
       this.database
     )}/tenants/auth/oidc/providers${
       email ? `?email=${encodeURIComponent(email)}` : ''
@@ -222,6 +234,6 @@ export default class Auth extends Config {
       tenantId = getTenantFromHttp(param, this);
     }
 
-    return `${this.api.basePath}/databases/${this.database}/tenants/${tenantId}/auth/oidc/callback`;
+    return `${this.api.basePath}/workspaces/${this.workspace}/databases/${this.database}/tenants/${tenantId}/auth/oidc/callback`;
   };
 }

packages/server/src/auth/login/login.test.ts

@@ -39,6 +39,8 @@ describe('login', () => {
   it('goes to the right url', () => {
     const _config = new Config(config);
     const auth = new Auth(_config);
-    expect(auth.loginUrl).toEqual('/databases/database/users/login');
+    expect(auth.loginUrl).toEqual(
+      '/workspaces/workspace/databases/database/users/login'
+    );
   });
 });

packages/server/src/auth/providers/providers.test.ts

@@ -24,7 +24,8 @@ describe('listProviders', () => {
     const res = await listProviders();
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/tenants/auth/oidc/providers'
+      _config.api.basePath +
+        '/workspaces/workspace/databases/database/tenants/auth/oidc/providers'
     );
   });
 });
@@ -50,7 +51,7 @@ describe('updateProvider', () => {
     //@ts-expect-error - test
     expect(res.config).toEqual(
       _config.api.basePath +
-        '/databases/database/tenants/tenantId/auth/oidc/providers/okta'
+        '/workspaces/workspace/databases/database/tenants/tenantId/auth/oidc/providers/okta'
     );
   });
 });

packages/server/src/auth/signUp/signUp.test.ts

@@ -20,7 +20,7 @@ describe('signUp', () => {
     const res = await signUp({ email: 'email', password: 'password' });
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/users'
+      _config.api.basePath + '/workspaces/workspace/databases/database/users'
     );
   });
 });

packages/server/src/tenants/createTenant/createTenant.test.ts

@@ -26,7 +26,7 @@ describe('createUser', () => {
     const res = await createTenant(params);
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/tenants'
+      _config.api.basePath + '/workspaces/workspace/databases/database/tenants'
     );
   });
 });

packages/server/src/tenants/getTenant/getTenant.test.ts

@@ -24,7 +24,8 @@ describe('getTenant', () => {
     const res = await getTenant();
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/tenants/123'
+      _config.api.basePath +
+        '/workspaces/workspace/databases/database/tenants/123'
     );
   });
 });

packages/server/src/tenants/index.ts

@@ -8,10 +8,14 @@ export default class Tenants extends Config {
     super(config);
   }
   get tenantsUrl() {
-    return `/databases/${encodeURIComponent(this.database)}/tenants`;
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/tenants`;
   }
   get tenantUrl() {
-    return `/databases/${encodeURIComponent(this.database)}/tenants/${
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/tenants/${
       this.tenantId ?? '{tenantId}'
     }`;
   }

packages/server/src/types.ts

@@ -15,7 +15,7 @@ export type ServerConfig = {
   database: string;
   tenantId?: string | null | undefined;
   userId?: string | null | undefined;
-  workspace?: string;
+  workspace: string;
   db?: Knex.Config;
   api?: {
     basePath?: string;
@@ -28,6 +28,7 @@ export type InstanceConfig = {
   database?: string;
   tenantId?: string | null | undefined;
   userId?: string | null | undefined;
+  workspace?: string;
   db?: Knex.Config;
   api?: {
     basePath?: string;

packages/server/src/users/createTenantUser/createTenantUser.test.ts

@@ -26,7 +26,8 @@ describe('createUser', () => {
     const res = await createTenantUser(params);
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/tenants/tenant/users'
+      _config.api.basePath +
+        '/workspaces/workspace/databases/database/tenants/tenant/users'
     );
   });
 });

packages/server/src/users/index.ts

@@ -9,7 +9,9 @@ export default class Users extends Config {
   }
 
   get baseUrl() {
-    return `/databases/${encodeURIComponent(this.database)}`;
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}`;
   }
 
   get usersUrl() {
@@ -54,7 +56,9 @@ export default class Users extends Config {
   };
 
   get meUrl() {
-    return `/databases/${encodeURIComponent(this.database)}/users/me`;
+    return `/workspaces/${encodeURIComponent(
+      this.workspace
+    )}/databases/${encodeURIComponent(this.database)}/users/me`;
   }
 
   me = async (

packages/server/src/users/listTenantUsers/listTenantUsers.test.ts

@@ -24,7 +24,8 @@ describe('listTenantUsers', () => {
     const res = await listTenantUsers();
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/tenants/tenant/users'
+      _config.api.basePath +
+        '/workspaces/workspace/databases/database/tenants/tenant/users'
     );
   });
 });

packages/server/src/users/listUsers/listUsers.test.ts

@@ -23,7 +23,7 @@ describe('listUsers', () => {
     const res = await listUsers();
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/users'
+      _config.api.basePath + '/workspaces/workspace/databases/database/users'
     );
   });
 });

packages/server/src/users/me/me.test.ts

@@ -24,7 +24,7 @@ describe('me', () => {
     const res = await me();
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/users/me'
+      _config.api.basePath + '/workspaces/workspace/databases/database/users/me'
     );
   });
 });

packages/server/src/users/updateUser/updateUser.test.ts

@@ -26,7 +26,8 @@ describe('updateUser', () => {
     const res = await updateUser(userId, params);
     //@ts-expect-error - test
     expect(res.config).toEqual(
-      _config.api.basePath + '/databases/database/users/12345'
+      _config.api.basePath +
+        '/workspaces/workspace/databases/database/users/12345'
     );
     //@ts-expect-error - test
     expect(res.payload.path.method).toEqual('PUT');

packages/server/src/utils/Config.ts

@@ -34,7 +34,7 @@ type DBConfig = {
 };
 export class Config {
   database: string;
-  workspace?: string;
+  workspace: string;
 
   db: DBConfig;