Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.1.15 #132

Merged
merged 113 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
6559773
user-info
Mar 26, 2024
987aab0
user-info
Mar 26, 2024
b098e82
user-info
Mar 26, 2024
d0875bc
user-info
Mar 26, 2024
27f1a8d
user-info
Mar 26, 2024
cfa20bb
user-info
Mar 26, 2024
930ad3c
user-info
Mar 26, 2024
5c7c861
user-info
Mar 26, 2024
34fa549
user-info
Mar 27, 2024
6791402
user-info
Mar 27, 2024
4fcc9f7
user-info
Mar 27, 2024
3147a19
user-info
Mar 27, 2024
ebc2ba9
user-info
Mar 27, 2024
2558b58
user-info
Mar 27, 2024
0277918
user-info
Mar 27, 2024
77b27c3
user-info
Mar 27, 2024
c81d6b0
user-info
Mar 27, 2024
8761626
user-info
Mar 27, 2024
65f39a0
user-info
Mar 27, 2024
dd2df15
user-info
Mar 27, 2024
ef19e78
user-info
Mar 27, 2024
9d90bda
user-info
Mar 27, 2024
f5df2f3
Merge branch 'InterNetX:master' into master
Arturexe Mar 28, 2024
fe9cb7c
TRNTYUI-938
Mar 28, 2024
91c5208
TRNTYUI-938
Mar 28, 2024
fe3bf36
TRNTYUI-938
Mar 28, 2024
139a6ac
Merge pull request #103 from Arturexe/master
adelholtz Mar 28, 2024
58f346b
Repo visualizer: update diagram
repo-visualizer Mar 28, 2024
a03e10e
TRNTYUI-900
Apr 2, 2024
9627af8
Merge branch 'InterNetX:master' into master
Arturexe Apr 3, 2024
89f09e0
Merge pull request #104 from Arturexe/master
adelholtz Apr 3, 2024
fa5d60c
Repo visualizer: update diagram
repo-visualizer Apr 3, 2024
5c4b090
Update index.d.ts
ChripIX Apr 12, 2024
fb1cb78
Repo visualizer: update diagram
repo-visualizer Apr 12, 2024
72f9341
TRNTYUI-1215
thomashilz Apr 15, 2024
091c80f
Merge pull request #105 from huiz1990/TRNTYUI-1215
ChripIX Apr 16, 2024
72d1adc
Repo visualizer: update diagram
repo-visualizer Apr 16, 2024
1e621d8
TRNTYUI-938
thomashilz Apr 17, 2024
2617d81
Merge pull request #106 from huiz1990/TRNTYUI-938
ChripIX Apr 17, 2024
7ac685c
Repo visualizer: update diagram
repo-visualizer Apr 17, 2024
89a2d16
TRNTYUI-1207
thomashilz Apr 25, 2024
99380fe
Merge pull request #107 from huiz1990/TRNTYUI-1207
ChripIX Apr 25, 2024
577f4cf
Repo visualizer: update diagram
repo-visualizer Apr 25, 2024
0e522a0
TRNTYUI-1207
thomashilz Apr 25, 2024
dc5f266
Merge branch 'master' into TRNTYUI-1207
thomashilz Apr 25, 2024
6fc6596
Merge pull request #108 from huiz1990/TRNTYUI-1207
ChripIX Apr 25, 2024
a2ac0a2
Repo visualizer: update diagram
repo-visualizer Apr 25, 2024
c0007bf
TRNTYUI-1207
thomashilz Apr 25, 2024
8ba7ca6
Merge pull request #109 from huiz1990/TRNTYUI-1207
ChripIX Apr 25, 2024
cc5ddbb
Repo visualizer: update diagram
repo-visualizer Apr 25, 2024
5869de9
TRNTYUI-1207
thomashilz Apr 26, 2024
b11ca64
TRNTYUI-1207
thomashilz Apr 26, 2024
3805517
Merge pull request #111 from huiz1990/TRNTYUI-1207
ChripIX Apr 26, 2024
f8a275d
Repo visualizer: update diagram
repo-visualizer Apr 26, 2024
7840893
TRNTYUI-1112
thomashilz May 14, 2024
d2e94bd
Merge pull request #115 from huiz1990/TRNTYUI-1112
ChripIX May 15, 2024
6fc3ea7
Repo visualizer: update diagram
repo-visualizer May 15, 2024
afccae6
TRNTYUI-1112-V2
thomashilz May 15, 2024
9b76da9
Merge pull request #116 from huiz1990/TRNTYUI-1112-V2
ChripIX May 15, 2024
d9d99e6
Repo visualizer: update diagram
repo-visualizer May 15, 2024
8751ca9
TRNTYUI-1207
thomashilz Jul 24, 2024
b1b4837
Merge pull request #117 from huiz1990/TRNTYUI-1207
InterNetX Jul 24, 2024
4fdb6f7
Repo visualizer: update diagram
repo-visualizer Jul 24, 2024
6d6848d
TRNTYUI-1207
thomashilz Jul 24, 2024
b0477e8
Merge pull request #118 from huiz1990/TRNTYUI-1207
ChripIX Jul 24, 2024
7bf41b6
Repo visualizer: update diagram
repo-visualizer Jul 24, 2024
039b52a
TRNTYUI-1298
thomashilz Jul 25, 2024
6dea155
Merge pull request #119 from huiz1990/TRNTYUI-1298
InterNetX Jul 25, 2024
4eb5b72
Repo visualizer: update diagram
repo-visualizer Jul 25, 2024
a21aac4
TRNTYUI-1301
thomashilz Aug 2, 2024
4bf247f
Merge pull request #120 from huiz1990/TRNTYUI-1301
InterNetX Aug 2, 2024
64f2cc6
Repo visualizer: update diagram
repo-visualizer Aug 2, 2024
570ed31
Fix typo
ChripIX Aug 5, 2024
715e3da
Repo visualizer: update diagram
repo-visualizer Aug 5, 2024
9e2de1a
fix header setting
adelholtz Aug 7, 2024
da55729
Merge branch 'master' of github.com:InterNetX/js-domainrobot-sdk
adelholtz Aug 7, 2024
fd22349
Repo visualizer: update diagram
repo-visualizer Aug 7, 2024
9067d4c
update yarn.lock
adelholtz Aug 7, 2024
c672b1b
Merge branch 'master' of github.com:InterNetX/js-domainrobot-sdk
adelholtz Aug 7, 2024
aa94d94
Repo visualizer: update diagram
repo-visualizer Aug 7, 2024
dd3687f
Bump tar from 6.2.0 to 6.2.1
dependabot[bot] Aug 7, 2024
ba33bf8
TRNTYUI-1298
thomashilz Aug 21, 2024
6da2601
Merge pull request #122 from huiz1990/TRNTYUI-1298
InterNetX Aug 21, 2024
6d05979
Repo visualizer: update diagram
repo-visualizer Aug 21, 2024
3641560
TRNTYUI-1298
thomashilz Aug 21, 2024
c0dcde1
Merge branch 'master' into TRNTYUI-1298
thomashilz Aug 21, 2024
abf98d3
Merge pull request #123 from huiz1990/TRNTYUI-1298
InterNetX Aug 21, 2024
45e2863
Repo visualizer: update diagram
repo-visualizer Aug 21, 2024
56c7b93
TRNTYUI-1216
thomashilz Oct 1, 2024
ac9f2e8
Merge pull request #125 from huiz1990/TRNTYUI-1216
ChripIX Oct 1, 2024
69f0e0a
Repo visualizer: update diagram
repo-visualizer Oct 1, 2024
fbfbc15
TRNTYUI-1216
thomashilz Oct 2, 2024
fbcc043
Merge pull request #126 from huiz1990/TRNTYUI-1216
adelholtz Oct 4, 2024
259599c
Repo visualizer: update diagram
repo-visualizer Oct 4, 2024
671c218
TRNTYUI-1216
thomashilz Oct 4, 2024
a9b782e
Merge pull request #127 from huiz1990/TRNTYUI-1216
adelholtz Oct 4, 2024
733308e
Repo visualizer: update diagram
repo-visualizer Oct 4, 2024
dac5e70
TRNTYUI-1325
ChripIX Oct 11, 2024
17cb84b
Repo visualizer: update diagram
repo-visualizer Oct 11, 2024
4df48bf
Merge pull request #121 from InterNetX/dependabot/npm_and_yarn/tar-6.2.1
ChripIX Oct 11, 2024
f77dcc0
Repo visualizer: update diagram
repo-visualizer Oct 11, 2024
8f1b3ae
TRNTYUI-1325
ChripIX Oct 11, 2024
feae563
Merge branch 'master' of github.com:InterNetX/js-domainrobot-sdk
ChripIX Oct 11, 2024
a159b74
Repo visualizer: update diagram
repo-visualizer Oct 11, 2024
0a0cfbe
TRNTYUI-1325
ChripIX Oct 11, 2024
5ce2142
Merge branch 'master' of github.com:InterNetX/js-domainrobot-sdk
ChripIX Oct 11, 2024
7802166
Repo visualizer: update diagram
repo-visualizer Oct 11, 2024
58ecd40
TRNTYUI-1325
ChripIX Oct 11, 2024
f12fe5b
Merge branch 'master' of github.com:InterNetX/js-domainrobot-sdk
ChripIX Oct 11, 2024
100e0ab
Repo visualizer: update diagram
repo-visualizer Oct 11, 2024
9c17950
TRNTYUI-1325
ChripIX Oct 11, 2024
2cf72d6
Merge branch 'master' of github.com:InterNetX/js-domainrobot-sdk
ChripIX Oct 11, 2024
3b499fc
Repo visualizer: update diagram
repo-visualizer Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .yarn/install-state.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion diagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
288 changes: 161 additions & 127 deletions index.d.ts

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "js-domainrobot-sdk",
"version": "2.1.14",
"version": "2.1.15",
"description": "A (node)js package for easy integration of the domainrobot API powered by InterNetX GmbH.",
"main": "index.js",
"types": "index.d.ts",
Expand Down Expand Up @@ -42,10 +42,10 @@
"cross-env": "^6.0.3",
"mocha": "^9.1.0",
"nyc": "^15.1.0",
"webpack": "^4.41.4"
"webpack": "^5.94.0"
},
"dependencies": {
"axios": "^0.21.1",
"axios": "^0.28.0",
"chai": "^4.3.4",
"yarn.lock": "^0.0.1-security"
}
Expand Down
1 change: 1 addition & 0 deletions release-notes/v2.1.15.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* update definitions
24 changes: 13 additions & 11 deletions src/services/DomainRobotService.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,15 @@ class DomainRobotService {
}
}

this.axiosconfig = {}
// decide which authentcation method we should use
// its either 'basic auth' or via 'session_id'
if (this.domainRobotConfig.auth !== undefined) {
// set basic axios config
this.axiosconfig = {
auth: {
username: this.domainRobotConfig.auth.user,
password: this.domainRobotConfig.auth.password
}
};
this.axiosconfig.auth = {
username: this.domainRobotConfig.auth.user,
password: this.domainRobotConfig.auth.password
}
} else if (this.domainRobotConfig.session_id !== null && this.domainRobotConfig.session_id !== undefined) {
// set the session_id header for authentication
axios.defaults.headers.common[Headers.DOMAINROBOT_HEADER_SESSION_ID] = this.domainRobotConfig.session_id;
Expand All @@ -73,6 +72,9 @@ class DomainRobotService {
* @param {object} headers
*/
headers(headers) {
if(!this.axiosconfig.headers) {
this.axiosconfig.headers = {};
}
this.axiosconfig.headers = headers;
return this;
}
Expand Down Expand Up @@ -113,9 +115,9 @@ class DomainRobotService {
}

let result;
if (this.domainRobotConfig.isMockRequest === true){
result = this.domainRobotConfig.mockResponse;
}else{
if (this.domainRobotConfig.isMockRequest === true) {
result = this.domainRobotConfig.mockResponse;
} else {
result = await this.axios(requestOptions);
}

Expand All @@ -136,8 +138,8 @@ class DomainRobotService {
return domainRobotResult;
} catch (error) {
// a connection error (e.g. timeout, wrong address etc.) or some error that didn't return a response occured
if (error.response === undefined){
throw error
if (error.response === undefined) {
throw error
}
throw new DomainRobotException(
error.response.data,
Expand Down
5 changes: 3 additions & 2 deletions src/services/UserService.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ class User extends DomainRobotService {
}

return await this.sendGetRequest(
this.domainRobotConfig.url + "/user/" + user + "/" + context + queryString
);
this.domainRobotConfig.url + "/user/" + user + "/" + context + queryString
)

}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/swagger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
```bash
yarn

#after installation is complete
# after installation is complete
yarn update:specs
```

Expand All @@ -12,11 +12,11 @@ or with npm
```bash
npm run install

#after installation is complete
# after installation is complete
npm run update:specs
```

Run the tests to check that everything is still ok and nothing is broken.
See tests/Readme.md for more information on how to run the tests.

If the tests are all ok commit the new swagger files and publish a new npm package version.
If the tests are all ok commit the new swagger files and publish a new npm package version.
Loading
Loading