Skip to content

Commit 3076b37

Browse files
author
ci bot
committed
Merge branch 'sso' into 'enterprise'
fix(sso): remove max_age See merge request dkinternal/observability/dataops-observability!46
2 parents 905c60e + ed11e13 commit 3076b37

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
*<p style="text-align: center;">DataOps Observability is part of DataKitchen's Open Source Data Observability. DataOps Observability monitors every data journey from data source to customer value, from any team development environment into production, across every tool, team, environment, and customer so that problems are detected, localized, and understood immediately.</p>*
77

8-
![DatKitchen Open Source Data Observability](https://datakitchen.io/wp-content/uploads/2024/04/both-products.png)
8+
[![DatKitchen Open Source Data Observability](https://datakitchen.io/wp-content/uploads/2024/04/both-products.png)](https://datakitchen.storylane.io/share/g01ss0plyamz)
9+
[Interactive Product Tour](https://datakitchen.storylane.io/share/g01ss0plyamz)
910

1011
## Developer Setup
1112

common/auth/keys/lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def extract_key(value: str) -> AuthenticationKeyParts:
9494
Given an authenticaton key, extract the key id and passphrase.
9595
9696
An authentication key is always 2 components of identical length. A UUID representing the primary key for the API
97-
key, and the actual passphrase which is also a UUID.
97+
key, and the actual passphrase which is a string of random characters.
9898
"""
9999
key_bytes: bytes = b64decode(value)
100100
key_text = key_bytes.decode("utf-8")

observability_ui/libs/core/src/lib/services/auth/session.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe('Session Service', () => {
8080
it('should set the token into the cookies', () => {
8181
const token = 'my-test-token';
8282
sessionService.setToken(token);
83-
expect(cookieService.set).toBeCalledWith(cookieKeys.token, token, { path: cookiePath });
83+
expect(cookieService.set).toBeCalledWith(cookieKeys.token, token, { path: cookiePath, secure: true });
8484
});
8585
});
8686

observability_ui/libs/core/src/lib/services/auth/session.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class SessionService {
4949
}
5050

5151
setToken(token: string): void {
52-
this.cookieService.set(cookieKeys.token, token, { path: cookiePath });
52+
this.cookieService.set(cookieKeys.token, token, { path: cookiePath, secure: true });
5353
}
5454

5555
removeToken(): void {

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools ~= 65.3", "wheel", "build"]
2+
requires = ["setuptools", "wheel", "build"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
@@ -34,14 +34,15 @@ dependencies = [
3434
"marshmallow~=3.19.0",
3535
"marshmallow-union==0.1.15.post1",
3636
"msgpack==1.0.4",
37+
"oauthlib~=3.2",
3738
"peewee~=3.16.0",
3839
"PyJWT~=2.4",
3940
"PyMySQL==1.1.1",
4041
"pybars3~=0.9.7",
4142
"requests_extensions~=1.1.3",
4243
"tomli==2.0.1",
43-
"Werkzeug==2.2.3",
44-
"yoyo-migrations~=8.2.0",
44+
"WTForms==3.0.1",
45+
"yoyo-migrations==9.0.0",
4546
]
4647

4748
[project.optional-dependencies]

0 commit comments

Comments
 (0)