Merge pull request #141 from supertokens/fix/login-methods-api

fix: Use tenants login method API for fetching tenants
supertokens · Mar 20, 2024 · 2a9f5fc · 2a9f5fc
2 parents 0b6c1f5 + 6ba131a
commit 2a9f5fc
Show file tree

Hide file tree

Showing 16 changed files with 114 additions and 281 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.11.0] - 2024-03-20
+
+-   Removes the tenants list API and uses the login methods API to get tenants and its login methods
+
 ## [0.10.5] - 2024-03-19
 
 -   Fixes UI bugs on search and Login methods section in userDetails page.

diff --git a/api_spec.yaml b/api_spec.yaml
@@ -1231,47 +1231,6 @@ paths:
                                         type: array
                                         items:
                                             type: string
-    /dashboard/api/tenants/list:
-        get:
-            tags:
-                - Multitenancy
-            summary: Get all tenants created in the core
-            responses:
-                200:
-                    description: Success
-                    content:
-                        application/json:
-                            schema:
-                                type: object
-                                properties:
-                                    status:
-                                        type: string
-                                        default: "OK"
-                                    coreConfig:
-                                        type: object
-                                    tenants:
-                                        type: array
-                                        items:
-                                            type: object
-                                            properties:
-                                                tenantId:
-                                                    type: string
-                                                emailPassword:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
-                                                passwordless:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
-
-                                                thirdParty:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
     /dashboard/api/tenants/login-methods:
         get:
             tags:
@@ -1295,41 +1254,10 @@ paths:
                                             properties:
                                                 tenantId:
                                                     type: string
-                                                emailPassword:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
-                                                thirdPartyEmailPassword:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
-                                                    nullable: true
-                                                passwordless:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
-                                                        contactMethod:
-                                                            type: string
-                                                            enum: [PHONE, EMAIL, EMAIL_OR_PHONE]
-                                                            nullable: true
-                                                thirdPartPasswordless:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
-                                                        contactMethod:
-                                                            type: string
-                                                            enum: [PHONE, EMAIL, EMAIL_OR_PHONE]
-                                                            nullable: true
-                                                    nullable: true
-                                                thirdParty:
-                                                    type: object
-                                                    properties:
-                                                        enabled:
-                                                            type: boolean
+                                                firstFactors:
+                                                    type: array
+                                                    items:
+                                                        type: string
 
     /dashboard/api/userroles/roles:
         get:

diff --git a/build/static/js/bundle.js b/build/static/js/bundle.js
diff --git a/build/static/js/bundle.js.map b/build/static/js/bundle.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dashboard",
-	"version": "0.10.5",
+	"version": "0.11.0",
 	"private": true,
 	"dependencies": {
 		"@babel/core": "^7.16.0",

diff --git a/src/api/tenants/list.ts b/src/api/tenants/list.ts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022, VRAI Labs and/or its affiliates. All rights reserved.
+/* Copyright (c) 2024, VRAI Labs and/or its affiliates. All rights reserved.
  *
  * This software is licensed under the Apache License, Version 2.0 (the
  * "License") as published by the Apache Software Foundation.
@@ -15,42 +15,31 @@
 
 import { getApiUrl, useFetchData } from "../../utils";
 
+export type PasswordlessContactMethod = "PHONE" | "EMAIL" | "EMAIL_OR_PHONE";
+
 export type Tenant = {
 	tenantId: string;
-	emailPassword: {
-		enabled: boolean;
-	};
-	passwordless: {
-		enabled: boolean;
-	};
-	thirdParty: {
-		enabled: boolean;
-	};
+	firstFactors: string[];
 };
 
-type TenantsListResponse = {
+type TenantsLoginMethodsResponse = {
 	status: "OK";
 	tenants: Tenant[];
 };
 
 type TenantsListService = {
-	fetchTenants: () => Promise<TenantsListResponse>;
+	fetchTenants: () => Promise<TenantsLoginMethodsResponse | undefined>;
 };
 
-export const useGetTenantsList = (): TenantsListService => {
+export const useGetTenants = (): TenantsListService => {
 	const fetchData = useFetchData();
-	const fetchTenants = async (): Promise<TenantsListResponse> => {
+	const fetchTenants = async (): Promise<TenantsLoginMethodsResponse> => {
 		const response = await fetchData({
 			method: "GET",
-			url: getApiUrl("/api/tenants/list"),
+			url: getApiUrl("/api/tenants/login-methods"),
 		});
 
-		return response.ok
-			? await response.json()
-			: {
-					status: "OK",
-					tenants: [],
-			  };
+		return response.ok ? await response.json() : undefined;
 	};
 
 	return {

diff --git a/src/api/tenants/login-methods.ts b/src/api/tenants/login-methods.ts
diff --git a/src/constants.ts b/src/constants.ts
@@ -27,3 +27,13 @@ export enum HTTPStatusCodes {
 	FORBIDDEN = 403,
 	NOT_FOUND = 404,
 }
+
+export const FactorIds = {
+	EMAILPASSWORD: "emailpassword",
+	OTP_EMAIL: "otp-email",
+	OTP_PHONE: "otp-phone",
+	LINK_EMAIL: "link-email",
+	LINK_PHONE: "link-phone",
+	THIRDPARTY: "thirdparty",
+	TOTP: "totp",
+};
diff --git a/src/ui/components/createUser/CreatePasswordlessUser.tsx b/src/ui/components/createUser/CreatePasswordlessUser.tsx
@@ -14,7 +14,7 @@
  */
 
 import { useContext, useEffect, useState } from "react";
-import { PasswordlessContactMethod } from "../../../api/tenants/login-methods";
+import { PasswordlessContactMethod } from "../../../api/tenants/list";
 import useCreateUserService, { CreatePasswordlessUserPayload } from "../../../api/user/create";
 import { getApiUrl, getImageUrl } from "../../../utils";
 import { PopupContentContext } from "../../contexts/PopupContentContext";