-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'SPSH-1035' of https://github.com/dBildungsplattform/dbi…
…ldungs-iam-server into SPSH-1035
- Loading branch information
Showing
30 changed files
with
1,177 additions
and
136 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,72 @@ | ||
| { | ||
| "HOST": { | ||
| "PORT": 8080 | ||
| }, | ||
| "FRONTEND": { | ||
| "PORT": 8080, | ||
| "SECURE_COOKIE": true, | ||
| "SESSION_SECRET": "SessionSecretForDevelopment", | ||
| "SESSION_TTL_MS": 3600000, | ||
| "BACKEND_ADDRESS": "http://dbildungs-iam-server-backend:80", | ||
| "DEFAULT_AUTH_REDIRECT": "/", | ||
| "TRUST_PROXY": 1, | ||
| "ERROR_PAGE_REDIRECT": "/login-error" | ||
| }, | ||
| "DB": { | ||
| "USE_SSL": true | ||
| }, | ||
| "KEYCLOAK": { | ||
| "ADMIN_REALM_NAME": "SPSH", | ||
| "REALM_NAME": "SPSH", | ||
| "ADMIN_CLIENT_ID": "spsh-admin", | ||
| "CLIENT_ID": "spsh", | ||
| "TEST_CLIENT_ID": "spsh-test" | ||
| }, | ||
| "REDIS": { | ||
| "HOST": "dbildungs-iam-server-redis", | ||
| "PORT": 6379, | ||
| "USERNAME": "default", | ||
| "USE_TLS": false | ||
| }, | ||
| "LDAP": { | ||
| "URL": "ldap://spsh-xxx.svc.cluster.local", | ||
| "BIND_DN": "cn=admin,dc=schule-sh,dc=de", | ||
| "ADMIN_PASSWORD": "password" | ||
| }, | ||
| "DATA": { | ||
| "ROOT_ORGANISATION_ID": "d39cb7cf-2f9b-45f1-849f-973661f2f057" | ||
| }, | ||
| "LOGGING": { | ||
| "DEFAULT_LOG_LEVEL": "info", | ||
| "PERSON_MODULE_LOG_LEVEL": "debug", | ||
| "PERSON_API_MODULE_LOG_LEVEL": "debug", | ||
| "ORGANISATION_MODULE_LOG_LEVEL": "debug", | ||
| "ORGANISATION_API_MODULE_LOG_LEVEL": "debug", | ||
| "ROLLE_MODULE_LOG_LEVEL": "debug", | ||
| "ROLLE_API_MODULE_LOG_LEVEL": "debug", | ||
| "KEYCLOAK_ADMINISTRATION_MODULE_LOG_LEVEL": "debug", | ||
| "HEALTH_MODULE_LOG_LEVEL": "debug", | ||
| "BACKEND_FOR_FRONTEND_MODULE_LOG_LEVEL": "debug" | ||
| }, | ||
| "ITSLEARNING": { | ||
| "ENABLED": "false", | ||
| "ENDPOINT": "https://itslearning.example.com", | ||
| "USERNAME": "username", | ||
| "PASSWORD": "password", | ||
| "ROOT_OEFFENTLICH": "oeffentlich", | ||
| "ROOT_ERSATZ": "ersatz" | ||
| }, | ||
| "OX": { | ||
| "ENABLED": "false", | ||
| "ENDPOINT": "https://ox_ip:ox_port/webservices/OXUserService", | ||
| "USERNAME": "username", | ||
| "PASSWORD": "password" | ||
| } | ||
| "HOST": { | ||
| "PORT": 8080 | ||
| }, | ||
| "FRONTEND": { | ||
| "PORT": 8080, | ||
| "SECURE_COOKIE": true, | ||
| "SESSION_SECRET": "SessionSecretForDevelopment", | ||
| "SESSION_TTL_MS": 3600000, | ||
| "BACKEND_ADDRESS": "http://dbildungs-iam-server-backend:80", | ||
| "DEFAULT_AUTH_REDIRECT": "/", | ||
| "TRUST_PROXY": 1, | ||
| "ERROR_PAGE_REDIRECT": "/login-error" | ||
| }, | ||
| "DB": { | ||
| "USE_SSL": true | ||
| }, | ||
| "KEYCLOAK": { | ||
| "ADMIN_REALM_NAME": "SPSH", | ||
| "REALM_NAME": "SPSH", | ||
| "ADMIN_CLIENT_ID": "spsh-admin", | ||
| "CLIENT_ID": "spsh", | ||
| "TEST_CLIENT_ID": "spsh-test" | ||
| }, | ||
| "REDIS": { | ||
| "HOST": "dbildungs-iam-server-redis", | ||
| "PORT": 6379, | ||
| "USERNAME": "default", | ||
| "USE_TLS": false | ||
| }, | ||
| "LDAP": { | ||
| "URL": "ldap://spsh-xxx.svc.cluster.local", | ||
| "BIND_DN": "cn=admin,dc=schule-sh,dc=de", | ||
| "ADMIN_PASSWORD": "password" | ||
| }, | ||
| "DATA": { | ||
| "ROOT_ORGANISATION_ID": "d39cb7cf-2f9b-45f1-849f-973661f2f057" | ||
| }, | ||
| "LOGGING": { | ||
| "DEFAULT_LOG_LEVEL": "info", | ||
| "PERSON_MODULE_LOG_LEVEL": "debug", | ||
| "PERSON_API_MODULE_LOG_LEVEL": "debug", | ||
| "ORGANISATION_MODULE_LOG_LEVEL": "debug", | ||
| "ORGANISATION_API_MODULE_LOG_LEVEL": "debug", | ||
| "ROLLE_MODULE_LOG_LEVEL": "debug", | ||
| "ROLLE_API_MODULE_LOG_LEVEL": "debug", | ||
| "KEYCLOAK_ADMINISTRATION_MODULE_LOG_LEVEL": "debug", | ||
| "HEALTH_MODULE_LOG_LEVEL": "debug", | ||
| "BACKEND_FOR_FRONTEND_MODULE_LOG_LEVEL": "debug" | ||
| }, | ||
| "ITSLEARNING": { | ||
| "ENABLED": "false", | ||
| "ENDPOINT": "https://itslearning.example.com", | ||
| "USERNAME": "username", | ||
| "PASSWORD": "password", | ||
| "ROOT_OEFFENTLICH": "oeffentlich", | ||
| "ROOT_ERSATZ": "ersatz" | ||
| }, | ||
| "PRIVACYIDEA": { | ||
| "ENDPOINT": "http://localhost:5000", | ||
| "USERNAME": "admin", | ||
| "PASSWORD": "admin", | ||
| "USER_RESOLVER": "mariadb_resolver", | ||
| "REALM": "defrealm" | ||
| }, | ||
| "OX": { | ||
| "ENABLED": "false", | ||
| "ENDPOINT": "https://ox_ip:ox_port/webservices/OXUserService", | ||
| "USERNAME": "username", | ||
| "PASSWORD": "password" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
src/modules/privacy-idea-administration/api/assign-hardware-token.body.params.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { ApiProperty } from '@nestjs/swagger'; | ||
| import { IsNotEmpty, IsString } from 'class-validator'; | ||
|
|
||
| export class AssignHardwareTokenBodyParams { | ||
| @IsNotEmpty() | ||
| @IsString() | ||
| @ApiProperty({ required: true }) | ||
| public serial!: string; | ||
|
|
||
| @IsNotEmpty() | ||
| @IsString() | ||
| @ApiProperty({ required: true }) | ||
| public otp!: string; | ||
|
|
||
| @IsNotEmpty() | ||
| @IsString() | ||
| @ApiProperty({ required: true }) | ||
| public referrer!: string; | ||
|
|
||
| @IsNotEmpty() | ||
| @IsString() | ||
| @ApiProperty({ required: true }) | ||
| public userId!: string; | ||
| } |
Oops, something went wrong.