Skip to content

fix(oauth): treat naive datetime values as UTC when converting to timestamps #1970

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.

Sign up for GitHub

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

Merged
WilliamBergamin merged 5 commits into from
Oct 1, 2026
Merged

fix(oauth): treat naive datetime values as UTC when converting to timestamps #1970

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8c683d
fix(oauth): treat naive datetime values as UTC when converting to tim…
kwy404 Sep 24, 2026
dac8de3
Trigger CLA check
kwy404 Sep 25, 2026
1c008a4
test: force a non-UTC timezone for the naive datetime case
kwy404 Sep 25, 2026
9b07398
Remove redundant comment
kwy404 Oct 1, 2026
df19931
Merge branch 'main' into fix-naive-datetime-timestamp
WilliamBergamin Oct 1, 2026
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
5 changes: 4 additions & 1 deletion slack_sdk/oauth/installation_store/internals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
from typing import Type, TypeVar, Union


Expand Down Expand Up @@ -28,6 +28,9 @@ def _timestamp_to_type(ts: Union[TimestampType, datetime, str], target_type: Typ
# see https://github.com/google/pytype/issues/1012

elif isinstance(ts, datetime):
if ts.tzinfo is None:
# naive datetime values (e.g., loaded from a database) are stored in UTC

@WilliamBergamin WilliamBergamin Oct 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code is self explanatory 🙏 I don't think we need this comment

Once removed we should be good to merge 🚀

Suggested change
# naive datetime values (e.g., loaded from a database) are stored in UTC

@kwy404 kwy404 Oct 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in 9b07398, thanks!

ts = ts.replace(tzinfo=timezone.utc)
result = target_type(ts.timestamp())
elif isinstance(ts, str):
try:
Expand Down
13 changes: 13 additions & 0 deletions tests/slack_sdk/oauth/installation_store/test_internals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import os
import sys
import time
import unittest
from datetime import datetime, timezone
from unittest import mock

import pytest

Expand Down Expand Up @@ -38,6 +41,16 @@ def test_timestamp_to_type(ts, target_type, expected_result):
assert result == expected_result


@pytest.mark.skipif(not hasattr(time, "tzset"), reason="time.tzset is not available on this platform")
def test_timestamp_to_type_naive_datetime_is_utc():
try:
with mock.patch.dict(os.environ, {"TZ": "America/New_York"}):
time.tzset()
assert _timestamp_to_type(datetime(2023, 11, 28, 22, 9, 7), int) == 1701209347
finally:
time.tzset()


def test_timestamp_to_type_invalid_str():
match = "Invalid isoformat string"
with pytest.raises(ValueError, match=match):
Expand Down
Loading