Skip to content

Commit fc52114

Browse files
authored
Merge pull request #3 from papermerge/use-new-short-env-var-prefix
use new env var short prefix
2 parents 1f0132e + afbaeef commit fc52114

3 files changed

Lines changed: 13 additions & 25 deletions

File tree

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2024 Eugen Ciur and other contributors
3+
Copyright (c) Eugen Ciur and other contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
# Env2JS
22

3-
Generates JavaScript file based on `PAPERMERGE__` values in environment variables
3+
Generates JavaScript file based on `PM_` values in environment variables
44

55

66
Here is the js template file:
77

88
```
99
window.__PAPERMERGE_RUNTIME_CONFIG__ = {
10-
ocr__lang_codes: "{{ .PAPERMERGE__OCR__LANG_CODES }}",
11-
ocr__default_lang_code: "{{ .PAPERMERGE__OCR__DEFAULT_LANG_CODE }}",
12-
ocr__automatic: {{ .PAPERMERGE__OCR__AUTOMATIC }},
1310
auth_type: "oidc",
14-
oidc_logout_url: "{{ .PAPERMERGE__AUTH__OIDC_LOGOUT_URL }}",
15-
post_logout_redirect_uri: "{{ .PAPERMERGE__AUTH__POST_LOGOUT_REDIRECT_URI }}"
11+
oidc_logout_url: "{{ .PM_OIDC_LOGOUT_URL }}",
12+
post_logout_redirect_uri: "{{ .PM_POST_LOGOUT_REDIRECT_URI }}"
1613
}
1714
```
1815

@@ -26,10 +23,7 @@ Usage:
2623

2724
| Variable | Description |
2825
|----------|-------------|
29-
| `PAPERMERGE__OCR__LANG_CODES` | Available OCR language codes |
30-
| `PAPERMERGE__OCR__DEFAULT_LANG_CODE` | Default OCR language code |
31-
| `PAPERMERGE__OCR__AUTOMATIC` | Enable automatic OCR (true/false) |
32-
| `PAPERMERGE__AUTH__OIDC_LOGOUT_URL` | OIDC provider logout endpoint URL |
33-
| `PAPERMERGE__AUTH__OIDC_CLIENT_ID` | OIDC Client ID |
34-
| `PAPERMERGE__AUTH__POST_LOGOUT_REDIRECT_URI` | URL to redirect to after OIDC logout |
26+
| `PM_OIDC_LOGOUT_URL` | OIDC provider logout endpoint URL |
27+
| `PM_OIDC_CLIENT_ID` | OIDC Client ID |
28+
| `PM_POST_LOGOUT_REDIRECT_URI` | URL to redirect to after OIDC logout |
3529

env2js.go

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ import (
99
)
1010

1111
type CoreContext struct {
12-
PAPERMERGE__OCR__LANG_CODES string
13-
PAPERMERGE__OCR__DEFAULT_LANG_CODE string
14-
PAPERMERGE__OCR__AUTOMATIC bool
15-
PAPERMERGE__AUTH__OIDC_LOGOUT_URL string
16-
PAPERMERGE__AUTH__OIDC_CLIENT_ID string
17-
PAPERMERGE__AUTH__POST_LOGOUT_REDIRECT_URI string
12+
PM_OIDC_LOGOUT_URL string
13+
PM_OIDC_CLIENT_ID string
14+
PM_POST_LOGOUT_REDIRECT_URI string
1815
}
1916

2017
var (
@@ -36,12 +33,9 @@ func main() {
3633
}
3734

3835
data := CoreContext{
39-
PAPERMERGE__OCR__LANG_CODES: os.Getenv("PAPERMERGE__OCR__LANG_CODES"),
40-
PAPERMERGE__OCR__DEFAULT_LANG_CODE: os.Getenv("PAPERMERGE__OCR__DEFAULT_LANG_CODE"),
41-
PAPERMERGE__OCR__AUTOMATIC: getBoolEnv("PAPERMERGE__OCR__AUTOMATIC"),
42-
PAPERMERGE__AUTH__OIDC_LOGOUT_URL: os.Getenv("PAPERMERGE__AUTH__OIDC_LOGOUT_URL"),
43-
PAPERMERGE__AUTH__OIDC_CLIENT_ID: os.Getenv("PAPERMERGE__AUTH__OIDC_CLIENT_ID"),
44-
PAPERMERGE__AUTH__POST_LOGOUT_REDIRECT_URI: os.Getenv("PAPERMERGE__AUTH__POST_LOGOUT_REDIRECT_URI"),
36+
PM_OIDC_LOGOUT_URL: os.Getenv("PM_OIDC_LOGOUT_URL"),
37+
PM_OIDC_CLIENT_ID: os.Getenv("PM_OIDC_CLIENT_ID"),
38+
PM_POST_LOGOUT_REDIRECT_URI: os.Getenv("PM_POST_LOGOUT_REDIRECT_URI"),
4539
}
4640

4741
templ.Execute(os.Stdout, data)

0 commit comments

Comments
 (0)