X Tutup
Skip to content

Get rid of os.environment access in default arguments #48

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
seratch merged 1 commit into from
Aug 27, 2020
Merged

Get rid of os.environment access in default arguments #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 30 additions & 11 deletions slack_bolt/adapter/aws_lambda/lambda_s3_oauth_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,17 @@ def __init__(
*,
client: Optional[WebClient] = None,
logger: Optional[Logger] = None,
oauth_state_bucket_name: str = os.environ["SLACK_STATE_S3_BUCKET_NAME"],
installation_bucket_name: str = os.environ["SLACK_INSTALLATION_S3_BUCKET_NAME"],
oauth_state_bucket_name: Optional[str] = None, # required
installation_bucket_name: Optional[str] = None, # required
oauth_state_cookie_name: str = "slack-app-oauth-state",
oauth_state_expiration_seconds: int = 60 * 10, # 10 minutes
client_id: str = os.environ["SLACK_CLIENT_ID"],
client_secret: str = os.environ["SLACK_CLIENT_SECRET"],
scopes: Optional[str] = os.environ.get("SLACK_SCOPES", None),
user_scopes: Optional[str] = os.environ.get("SLACK_USER_SCOPES", None),
redirect_uri: Optional[str] = os.environ.get("SLACK_REDIRECT_URI", None),
install_path: str = os.environ.get("SLACK_LAMBDA_PATH", "/slack/install"),
redirect_uri_path: str = os.environ.get(
"SLACK_LAMBDA_PATH", "/slack/oauth_redirect"
),
client_id: Optional[str] = None, # required
client_secret: Optional[str] = None, # required
scopes: Optional[str] = None, # required
user_scopes: Optional[str] = None,
redirect_uri: Optional[str] = None,
install_path: Optional[str] = None, # required
redirect_uri_path: Optional[str] = None, # required
success_url: Optional[str] = None,
failure_url: Optional[str] = None,
):
Expand All @@ -40,6 +38,27 @@ def __init__(

self.s3_client = boto3.client("s3")

oauth_state_bucket_name = (
oauth_state_bucket_name
or os.environ["SLACK_STATE_S3_BUCKET_NAME"] # required
)
installation_bucket_name = (
installation_bucket_name
or os.environ["SLACK_INSTALLATION_S3_BUCKET_NAME"] # required
)

client_id = client_id or os.environ["SLACK_CLIENT_ID"] # required
client_secret = client_secret or os.environ["SLACK_CLIENT_SECRET"] # required
scopes = scopes or os.environ.get("SLACK_SCOPES", None)
user_scopes = user_scopes or os.environ.get("SLACK_USER_SCOPES", None)
redirect_uri = redirect_uri or os.environ.get("SLACK_REDIRECT_URI", None)
install_path = install_path or os.environ.get(
"SLACK_LAMBDA_PATH", "/slack/install"
)
redirect_uri_path = redirect_uri_path or os.environ.get(
"SLACK_LAMBDA_PATH", "/slack/oauth_redirect"
)

self.oauth_state_store = AmazonS3OAuthStateStore(
logger=self.logger,
s3_client=self.s3_client,
Expand Down
15 changes: 10 additions & 5 deletions slack_bolt/oauth/async_oauth_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,21 @@ def _init_internal_utils(self):
def sqlite3(
cls,
database: str,
client_id: Optional[str] = os.environ.get("SLACK_CLIENT_ID", None),
client_secret: Optional[str] = os.environ.get("SLACK_CLIENT_SECRET", None),
scopes: List[str] = os.environ.get("SLACK_SCOPES", "").split(","),
user_scopes: List[str] = os.environ.get("SLACK_USER_SCOPES", "").split(","),
redirect_uri: Optional[str] = os.environ.get("SLACK_REDIRECT_URI", None),
client_id: Optional[str] = None, # required
client_secret: Optional[str] = None, # required
scopes: Optional[List[str]] = None,
user_scopes: Optional[List[str]] = None,
redirect_uri: Optional[str] = None,
oauth_state_cookie_name: str = OAuthStateUtils.default_cookie_name,
oauth_state_expiration_seconds: int = OAuthStateUtils.default_expiration_seconds,
logger: Optional[Logger] = None,
) -> "AsyncOAuthFlow":

client_id = client_id or os.environ["SLACK_CLIENT_ID"] # required
client_secret = client_secret or os.environ["SLACK_CLIENT_SECRET"] # required
scopes = scopes or os.environ.get("SLACK_SCOPES", "").split(",")
user_scopes = user_scopes or os.environ.get("SLACK_USER_SCOPES", "").split(",")
redirect_uri = redirect_uri or os.environ.get("SLACK_REDIRECT_URI", None)
return AsyncOAuthFlow(
client=create_async_web_client(),
logger=logger,
Expand Down
15 changes: 10 additions & 5 deletions slack_bolt/oauth/oauth_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,21 @@ def _init_internal_utils(self):
def sqlite3(
cls,
database: str,
client_id: Optional[str] = os.environ.get("SLACK_CLIENT_ID", None),
client_secret: Optional[str] = os.environ.get("SLACK_CLIENT_SECRET", None),
scopes: List[str] = os.environ.get("SLACK_SCOPES", "").split(","),
user_scopes: List[str] = os.environ.get("SLACK_USER_SCOPES", "").split(","),
redirect_uri: Optional[str] = os.environ.get("SLACK_REDIRECT_URI", None),
client_id: Optional[str] = None, # required
client_secret: Optional[str] = None, # required
scopes: Optional[List[str]] = None,
user_scopes: Optional[List[str]] = None,
redirect_uri: Optional[str] = None,
oauth_state_cookie_name: str = OAuthStateUtils.default_cookie_name,
oauth_state_expiration_seconds: int = OAuthStateUtils.default_expiration_seconds,
logger: Optional[Logger] = None,
) -> "OAuthFlow":

client_id = client_id or os.environ["SLACK_CLIENT_ID"] # required
client_secret = client_secret or os.environ["SLACK_CLIENT_SECRET"] # required
scopes = scopes or os.environ.get("SLACK_SCOPES", "").split(",")
user_scopes = user_scopes or os.environ.get("SLACK_USER_SCOPES", "").split(",")
redirect_uri = redirect_uri or os.environ.get("SLACK_REDIRECT_URI", None)
return OAuthFlow(
client=WebClient(),
logger=logger,
Expand Down
X Tutup