diff --git a/docker-compose-dev-deps.yml b/docker-compose-dev-deps.yml index 01adda9..051d4cc 100644 --- a/docker-compose-dev-deps.yml +++ b/docker-compose-dev-deps.yml @@ -2,7 +2,7 @@ version: "3" services: forgejo: - image: codeberg.org/forgejo/forgejo:1.18.0-1 + image: codeberg.org/forgejo/forgejo:1.20.1-0 container_name: hostea-dash-forgejo network_mode: host environment: diff --git a/integration/conf/app.ini b/integration/conf/app.ini index a48b049..4cacc61 100644 --- a/integration/conf/app.ini +++ b/integration/conf/app.ini @@ -1,10 +1,10 @@ ; SPDX-FileCopyrightText: 2023 Aravinth Manivannan -; +; ; SPDX-License-Identifier: AGPL-3.0-or-later - APP_NAME = Forgejo:+Beyond+Coding+We+Forge RUN_USER = git RUN_MODE = prod +WORK_PATH = /data/gitea [cors] ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -12,19 +12,19 @@ RUN_MODE = prod ; ; ; ; More information about CORS can be found here: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#The_HTTP_response_headers ; ; enable cors headers (disabled by default) -ENABLED = true +ENABLED = true ; ; ; ; scheme of allowed requests ; SCHEME = http ; ; ; ; list of requesting domains that are allowed -ALLOW_DOMAIN = * +ALLOW_DOMAIN = * ; ; ; ; allow subdomains of headers listed above to request ; ALLOW_SUBDOMAIN = false ; ; ; ; list of methods allowed to request -METHODS = GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS +METHODS = GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS ; ; ; ; max time to cache response ; MAX_AGE = 10m @@ -33,36 +33,36 @@ METHODS = GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS ALLOW_CREDENTIALS = true ; ; ; ; headers to permit -HEADERS = Content-Type,User-Agent +HEADERS = Content-Type,User-Agent [federation] ENABLED = true [database] -DB_TYPE = sqlite3 -HOST = localhost:3306 -NAME = forgejo -USER = root -PASSWD = -SCHEMA = +DB_TYPE = sqlite3 +HOST = localhost:3306 +NAME = forgejo +USER = root +PASSWD = +SCHEMA = SSL_MODE = disable -CHARSET = utf8 -PATH = /data/gitea/gitea.db -LOG_SQL = false +CHARSET = utf8 +PATH = /data/gitea/gitea.db +LOG_SQL = false [repository] ROOT = /data/git/repositories [server] -SSH_DOMAIN = localhost -DOMAIN = localhost -HTTP_PORT = 3000 -ROOT_URL = http://localhost:3000/ -DISABLE_SSH = false -SSH_PORT = 22 +SSH_DOMAIN = localhost +DOMAIN = localhost +HTTP_PORT = 3000 +ROOT_URL = http://localhost:3000/ +DISABLE_SSH = false +SSH_PORT = 22 LFS_START_SERVER = true -LFS_JWT_SECRET = J38QUokkI8qtDatFMChy6dDqwGPRtn-I5bn6hs1gpA8 -OFFLINE_MODE = false +LFS_JWT_SECRET = J38QUokkI8qtDatFMChy6dDqwGPRtn-I5bn6hs1gpA8 +OFFLINE_MODE = false [lfs] PATH = /data/git/lfs @@ -71,16 +71,16 @@ PATH = /data/git/lfs ENABLED = false [service] -REGISTER_EMAIL_CONFIRM = false -ENABLE_NOTIFY_MAIL = false -DISABLE_REGISTRATION = false -ALLOW_ONLY_EXTERNAL_REGISTRATION = false -ENABLE_CAPTCHA = false -REQUIRE_SIGNIN_VIEW = false -DEFAULT_KEEP_EMAIL_PRIVATE = false +REGISTER_EMAIL_CONFIRM = false +ENABLE_NOTIFY_MAIL = false +DISABLE_REGISTRATION = false +ALLOW_ONLY_EXTERNAL_REGISTRATION = false +ENABLE_CAPTCHA = false +REQUIRE_SIGNIN_VIEW = false +DEFAULT_KEEP_EMAIL_PRIVATE = false DEFAULT_ALLOW_CREATE_ORGANIZATION = true -DEFAULT_ENABLE_TIMETRACKING = true -NO_REPLY_ADDRESS = noreply.localhost +DEFAULT_ENABLE_TIMETRACKING = true +NO_REPLY_ADDRESS = noreply.localhost [picture] ENABLE_FEDERATED_AVATAR = true @@ -93,10 +93,10 @@ ENABLE_OPENID_SIGNUP = true PROVIDER = file [log] -MODE = console -LEVEL = info +MODE = console +LEVEL = info ROOT_PATH = /data/gitea/log -ROUTER = console +ROUTER = console [repository.pull-request] DEFAULT_MERGE_STYLE = merge @@ -105,6 +105,9 @@ DEFAULT_MERGE_STYLE = merge DEFAULT_TRUST_MODEL = committer [security] -INSTALL_LOCK = true -INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE2OTUwNDM4MzR9.OXP0MrWVJQb-3RFPcVPK7eDSPbMzc-lTjLkWjzZVouM +INSTALL_LOCK = true +INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE2OTUwNDM4MzR9.OXP0MrWVJQb-3RFPcVPK7eDSPbMzc-lTjLkWjzZVouM PASSWORD_HASH_ALGO = pbkdf2 + +[oauth2] +JWT_SECRET = Cx6QQekcNbTO5viT791CMafI_GvsiQtvLZWYaSUR-Fs diff --git a/integration/forgejo.py b/integration/forgejo.py index 9c707b3..b303154 100755 --- a/integration/forgejo.py +++ b/integration/forgejo.py @@ -281,6 +281,12 @@ class Forgejo: def create_access_token_payload(name: str): data = { "name": name, + "scopes": [ + "read:issue", + "write:notification", + "read:repository", + "read:user", + ], } return data