TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-11 20:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: axios, user, zitadel

Browse Source
This commit is contained in:
Max Peintner
2024-11-15 14:27:46 +01:00
parent 1bc174febb
commit fd45c07758
4 changed files with 109 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
acceptance/tests/user.ts
View File

@@ -1,5 +1,5 @@
import { Page } from "@playwright/test";
import fetch from "node-fetch";
import axios from "axios";
import { registerWithPasskey } from "./register";
import { getUserByUsername, removeUser } from "./zitadel";
@@ -40,29 +40,31 @@ class User {
},
};
const response = await fetch(process.env.ZITADEL_API_URL! + "/v2/users/human", {
method: "POST",
body: JSON.stringify(body),
headers: {
"Content-Type": "application/json",
Authorization: "Bearer " + process.env.ZITADEL_SERVICE_USER_TOKEN!,
},
});
if (response.statusCode >= 400 && response.statusCode != 409) {
const error = "HTTP Error: " + response.statusCode + " - " + response.statusMessage;
console.error(error);
throw new Error(error);
try {
const response = await axios.post(`${process.env.ZITADEL_API_URL}/v2/users/human`, body, {
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${process.env.ZITADEL_SERVICE_USER_TOKEN}`,
},
});
if (response.status >= 400 && response.status !== 409) {
const error = `HTTP Error: ${response.status} - ${response.statusText}`;
console.error(error);
throw new Error(error);
}
} catch (error) {
console.error("Error making request:", error);
throw error;
}
return;
}
async remove() {
const resp = await getUserByUsername(this.getUsername());
const resp: any = await getUserByUsername(this.getUsername());
if (!resp || !resp.result || !resp.result[0]) {
return;
}
await removeUser(resp.result[0].userId);
return;
}
public setUserId(userId: string) {
@@ -90,7 +92,7 @@ class User {
}
public getFullName() {
return this.props.firstName + " " + this.props.lastName;
return `${this.props.firstName} ${this.props.lastName}`;
}
}
@@ -132,26 +134,36 @@ export class PasswordUserWithOTP extends User {
switch (this.type) {
case OtpType.sms:
url = url + "sms";
break;
case OtpType.email:
url = url + "email";
break;
}
const response = await fetch(process.env.ZITADEL_API_URL! + "/v2/users/" + this.getUserId() + "/" + url, {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: "Bearer " + process.env.ZITADEL_SERVICE_USER_TOKEN!,
},
});
if (response.statusCode >= 400 && response.statusCode != 409) {
const error = "HTTP Error: " + response.statusCode + " - " + response.statusMessage;
console.error(error);
throw new Error(error);
}
try {
const response = await axios.post(
`${process.env.ZITADEL_API_URL}/v2/users/${this.getUserId()}/${url}`,
{},
{
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${process.env.ZITADEL_SERVICE_USER_TOKEN}`,
},
},
);
// TODO: get code from SMS or Email provider
this.code = "";
return;
if (response.status >= 400 && response.status !== 409) {
const error = `HTTP Error: ${response.status} - ${response.statusText}`;
console.error(error);
throw new Error(error);
}
// TODO: get code from SMS or Email provider
this.code = "";
} catch (error) {
console.error("Error making request:", error);
throw error;
}
}
public getCode() {

62
acceptance/tests/zitadel.ts
View File

@@ -1,4 +1,4 @@
import fetch from "node-fetch";
import axios from "axios";
export async function removeUserByUsername(username: string) {
const resp = await getUserByUsername(username);
@@ -9,18 +9,22 @@ export async function removeUserByUsername(username: string) {
}
export async function removeUser(id: string) {
const response = await fetch(process.env.ZITADEL_API_URL! + "/v2/users/" + id, {
method: "DELETE",
headers: {
Authorization: "Bearer " + process.env.ZITADEL_SERVICE_USER_TOKEN!,
},
});
if (response.statusCode >= 400 && response.statusCode != 404) {
const error = "HTTP Error: " + response.statusCode + " - " + response.statusMessage;
console.error(error);
throw new Error(error);
try {
const response = await axios.delete(`${process.env.ZITADEL_API_URL}/v2/users/${id}`, {
headers: {
Authorization: `Bearer ${process.env.ZITADEL_SERVICE_USER_TOKEN}`,
},
});
if (response.status >= 400 && response.status !== 404) {
const error = `HTTP Error: ${response.status} - ${response.statusText}`;
console.error(error);
throw new Error(error);
}
} catch (error) {
console.error("Error making request:", error);
throw error;
}
return;
}
export async function getUserByUsername(username: string) {
@@ -33,20 +37,24 @@ export async function getUserByUsername(username: string) {
},
],
};
const jsonBody = JSON.stringify(listUsersBody);
const registerResponse = await fetch(process.env.ZITADEL_API_URL! + "/v2/users", {
method: "POST",
body: jsonBody,
headers: {
"Content-Type": "application/json",
Authorization: "Bearer " + process.env.ZITADEL_SERVICE_USER_TOKEN!,
},
});
if (registerResponse.statusCode >= 400) {
const error = "HTTP Error: " + registerResponse.statusCode + " - " + registerResponse.statusMessage;
console.error(error);
throw new Error(error);
try {
const response = await axios.post(`${process.env.ZITADEL_API_URL}/v2/users`, listUsersBody, {
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${process.env.ZITADEL_SERVICE_USER_TOKEN}`,
},
});
if (response.status >= 400) {
const error = `HTTP Error: ${response.status} - ${response.statusText}`;
console.error(error);
throw new Error(error);
}
return response.data;
} catch (error) {
console.error("Error making request:", error);
throw error;
}
const respJson = await registerResponse.json();
return respJson;
}

2
package.json
View File

@@ -34,10 +34,10 @@
"@types/node": "^22.9.0",
"@vitejs/plugin-react": "^4.3.3",
"@zitadel/prettier-config": "workspace:*",
"axios": "^1.7.7",
"dotenv": "^16.4.5",
"eslint": "8.57.1",
"eslint-config-zitadel": "workspace:*",
"node-fetch": "^3.3.2",
"prettier": "^3.2.5",
"prettier-plugin-organize-imports": "^4.1.0",
"tsup": "^8.3.5",

89
pnpm-lock.yaml generated
View File

@@ -26,6 +26,9 @@ importers:
'@zitadel/prettier-config':
specifier: workspace:*
version: link:packages/zitadel-prettier-config
axios:
specifier: ^1.7.7
version: 1.7.7
dotenv:
specifier: ^16.4.5
version: 16.4.5
@@ -35,9 +38,6 @@ importers:
eslint-config-zitadel:
specifier: workspace:*
version: link:packages/eslint-config-zitadel
node-fetch:
specifier: ^3.3.2
version: 3.3.2
prettier:
specifier: ^3.2.5
version: 3.3.3
@@ -1945,10 +1945,6 @@ packages:
resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
engines: {node: '>=0.10'}
data-uri-to-buffer@4.0.1:
resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
engines: {node: '>= 12'}
data-urls@5.0.0:
resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
engines: {node: '>=18'}
@@ -2399,10 +2395,6 @@ packages:
picomatch:
optional: true
fetch-blob@3.2.0:
resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
engines: {node: ^12.20 || >= 14.13}
fflate@0.8.2:
resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
@@ -2456,10 +2448,6 @@ packages:
resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
engines: {node: '>= 6'}
formdata-polyfill@4.0.10:
resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
engines: {node: '>=12.20.0'}
fraction.js@4.3.7:
resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
@@ -3265,10 +3253,6 @@ packages:
node-addon-api@7.1.1:
resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
node-domexception@1.0.0:
resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
engines: {node: '>=10.5.0'}
node-fetch@2.7.0:
resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
engines: {node: 4.x || >=6.0.0}
@@ -3278,10 +3262,6 @@ packages:
encoding:
optional: true
node-fetch@3.3.2:
resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
node-releases@2.0.18:
resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
@@ -4486,10 +4466,6 @@ packages:
engines: {node: '>=12.0.0'}
hasBin: true
web-streams-polyfill@3.3.3:
resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
engines: {node: '>= 8'}
webidl-conversions@3.0.1:
resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
@@ -4657,7 +4633,7 @@ snapshots:
'@babel/traverse': 7.25.9
'@babel/types': 7.26.0
convert-source-map: 2.0.0
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -4744,7 +4720,7 @@ snapshots:
'@babel/parser': 7.26.2
'@babel/template': 7.25.9
'@babel/types': 7.26.0
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -5134,7 +5110,7 @@ snapshots:
'@eslint/eslintrc@2.1.4':
dependencies:
ajv: 6.12.6
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
espree: 9.6.1
globals: 13.24.0
ignore: 5.3.2
@@ -5233,7 +5209,7 @@ snapshots:
'@humanwhocodes/config-array@0.13.0':
dependencies:
'@humanwhocodes/object-schema': 2.0.3
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@@ -5780,7 +5756,7 @@ snapshots:
agent-base@7.1.1:
dependencies:
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
transitivePeerDependencies:
- supports-color
@@ -5955,6 +5931,14 @@ snapshots:
axe-core@4.10.0: {}
axios@1.7.7:
dependencies:
follow-redirects: 1.15.6
form-data: 4.0.0
proxy-from-env: 1.1.0
transitivePeerDependencies:
- debug
axios@1.7.7(debug@4.3.7):
dependencies:
follow-redirects: 1.15.6(debug@4.3.7)
@@ -6266,8 +6250,6 @@ snapshots:
dependencies:
assert-plus: 1.0.0
data-uri-to-buffer@4.0.1: {}
data-urls@5.0.0:
dependencies:
whatwg-mimetype: 4.0.0
@@ -6303,6 +6285,10 @@ snapshots:
dependencies:
ms: 2.1.2
debug@4.3.7:
dependencies:
ms: 2.1.3
debug@4.3.7(supports-color@5.5.0):
dependencies:
ms: 2.1.3
@@ -6779,7 +6765,7 @@ snapshots:
ajv: 6.12.6
chalk: 4.1.2
cross-spawn: 7.0.3
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
doctrine: 3.0.0
escape-string-regexp: 4.0.0
eslint-scope: 7.2.2
@@ -6937,11 +6923,6 @@ snapshots:
optionalDependencies:
picomatch: 4.0.2
fetch-blob@3.2.0:
dependencies:
node-domexception: 1.0.0
web-streams-polyfill: 3.3.3
fflate@0.8.2: {}
figures@3.2.0:
@@ -6974,6 +6955,8 @@ snapshots:
flatted@3.3.1: {}
follow-redirects@1.15.6: {}
follow-redirects@1.15.6(debug@4.3.7):
optionalDependencies:
debug: 4.3.7(supports-color@5.5.0)
@@ -6995,10 +6978,6 @@ snapshots:
combined-stream: 1.0.8
mime-types: 2.1.35
formdata-polyfill@4.0.10:
dependencies:
fetch-blob: 3.2.0
fraction.js@4.3.7: {}
from@0.1.7: {}
@@ -7212,7 +7191,7 @@ snapshots:
http-proxy-agent@7.0.2:
dependencies:
agent-base: 7.1.1
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
transitivePeerDependencies:
- supports-color
@@ -7232,7 +7211,7 @@ snapshots:
https-proxy-agent@7.0.5:
dependencies:
agent-base: 7.1.1
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
transitivePeerDependencies:
- supports-color
@@ -7818,18 +7797,10 @@ snapshots:
node-addon-api@7.1.1:
optional: true
node-domexception@1.0.0: {}
node-fetch@2.7.0:
dependencies:
whatwg-url: 5.0.0
node-fetch@3.3.2:
dependencies:
data-uri-to-buffer: 4.0.1
fetch-blob: 3.2.0
formdata-polyfill: 4.0.10
node-releases@2.0.18: {}
nodemon@3.1.7:
@@ -8764,7 +8735,7 @@ snapshots:
cac: 6.7.14
chokidar: 4.0.1
consola: 3.2.3
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
esbuild: 0.24.0
joycon: 3.1.1
picocolors: 1.1.1
@@ -8922,7 +8893,7 @@ snapshots:
vite-node@2.1.4(@types/node@22.9.0)(sass@1.80.7):
dependencies:
cac: 6.7.14
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
pathe: 1.1.2
vite: 5.4.11(@types/node@22.9.0)(sass@1.80.7)
transitivePeerDependencies:
@@ -8938,7 +8909,7 @@ snapshots:
vite-tsconfig-paths@5.1.2(typescript@5.6.3)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.7)):
dependencies:
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
globrex: 0.1.2
tsconfck: 3.1.4(typescript@5.6.3)
optionalDependencies:
@@ -8967,7 +8938,7 @@ snapshots:
'@vitest/spy': 2.1.4
'@vitest/utils': 2.1.4
chai: 5.1.2
debug: 4.3.7(supports-color@5.5.0)
debug: 4.3.7
expect-type: 1.1.0
magic-string: 0.30.12
pathe: 1.1.2
@@ -9007,8 +8978,6 @@ snapshots:
transitivePeerDependencies:
- debug
web-streams-polyfill@3.3.3: {}
webidl-conversions@3.0.1: {}
webidl-conversions@4.0.2: {}