Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 6442a9f

Browse files
brunobritodevbrunobritodev
committed
Bug in docker
- requireHttps config was missing
1 parent 381e43f commit 6442a9f

File tree

10 files changed

+146
-160
lines changed

10 files changed

+146
-160
lines changed

‎src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.prod.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { environment } from '@env/environment';
44
export const authProdConfig: AuthConfig = {
55
issuer: environment.IssuerUri,
66
clientId: 'IS4-Admin',
7+
requireHttps: environment.RequireHttps,
78
redirectUri: environment.Uri + "/login-callback",
89
silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
910
scope: "openid profile email jp_api.is4",

‎src/Frontend/Jp.AdminUI/src/app/core/auth/auth-config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { environment } from '@env/environment';
44
export const authConfig: AuthConfig = {
55
issuer: environment.IssuerUri,
66
clientId: 'IS4-Admin',
7+
requireHttps: environment.RequireHttps,
78
redirectUri: environment.Uri + "/login-callback",
89
silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
910
scope: "openid profile email jp_api.is4",

‎src/Frontend/Jp.AdminUI/src/app/core/auth/auth.config.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Frontend/Jp.AdminUI/src/app/core/auth/auth.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
33
import { OAuthErrorEvent, OAuthService } from 'angular-oauth2-oidc';
44
import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs';
55
import { filter, map } from 'rxjs/operators';
6-
import { environment } from '@env/environment.prod';
6+
import { environment } from '@env/environment';
77

88
@Injectable({ providedIn: 'root' })
99
export class AuthService {

‎src/Frontend/Jp.UserManagement/src/app/core/auth/auth-config.prod.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { environment } from '@env/environment';
44
export const authProdConfig: AuthConfig = {
55
issuer: environment.AuthorityUri,
66
clientId: "UserManagementUI",
7+
requireHttps: environment.RequireHttps,
78
redirectUri: environment.Uri + "/login-callback",
89
silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
910
scope: "openid profile email jp_api.user",

‎src/Frontend/Jp.UserManagement/src/app/core/auth/auth-config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { AuthConfig } from 'angular-oauth2-oidc';
22
import { environment } from '@env/environment';
33

4+
45
export const authConfig: AuthConfig = {
56
issuer: environment.AuthorityUri,
67
clientId: "UserManagementUI",
8+
requireHttps: environment.RequireHttps,
79
redirectUri: environment.Uri + "/login-callback",
810
silentRefreshRedirectUri: environment.Uri + '/silent-refresh.html',
911
scope: "openid profile email jp_api.user",

‎src/Frontend/Jp.UserManagement/src/tsconfig.app.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
"node"
99
],
1010
"paths": {
11-
"@angular/*": [
12-
"../node_modules/@angular/*"
13-
],
1411
"@env/*": [
1512
"environments/*"
1613
],
1714
"@core/*": [
1815
"app/core/*"
1916
],
17+
"@angular/*": [
18+
"../node_modules/@angular/*"
19+
]
2020
}
2121
},
2222
"exclude": [

‎src/Frontend/Jp.UserManagement/src/tsconfig.spec.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"outDir": "../out-tsc/spec",
55
"baseUrl": "./",
66
"module": "commonjs",
7+
"target": "es5",
78
"types": [
89
"jasmine",
910
"node"

‎src/Frontend/Jp.UserManagement/tsconfig.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
"src/environments/*"
2222
],
2323
"@core/*": [
24-
"app/core/*"
24+
"src/app/core/*"
2525
],
26+
"@angular/*": [
27+
"node_modules/@angular/*"
28+
]
2629
}
2730
}
2831
}

‎src/Frontend/Jp.UserManagement/tslint.json‎

Lines changed: 132 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,136 @@
11
{
2-
"rulesDirectory": [
3-
"node_modules/codelyzer"
4-
],
5-
"rules": {
6-
"arrow-return-shorthand": true,
7-
"callable-types": true,
8-
"class-name": true,
9-
"comment-format": [
10-
true,
11-
"check-space"
2+
"rulesDirectory": [
3+
"node_modules/codelyzer"
124
],
13-
"curly": false,
14-
"deprecation": {
15-
"severity": "warn"
16-
},
17-
"eofline": false,
18-
"forin": true,
19-
"import-blacklist": [
20-
true,
21-
"rxjs/Rx"
22-
],
23-
"import-spacing": true,
24-
"indent": false,
25-
"interface-over-type-literal": true,
26-
"label-position": true,
27-
"max-line-length": [
28-
true,
29-
350
30-
],
31-
"member-access": false,
32-
"member-ordering": [
33-
true,
34-
{
35-
"order": [
36-
"static-field",
37-
"instance-field",
38-
"static-method",
39-
"instance-method"
40-
]
41-
}
42-
],
43-
"no-arg": true,
44-
"no-bitwise": true,
45-
"no-console": [
46-
true,
47-
"debug",
48-
"info",
49-
"time",
50-
"timeEnd",
51-
"trace"
52-
],
53-
"no-construct": true,
54-
"no-debugger": true,
55-
"no-duplicate-super": true,
56-
"no-empty": false,
57-
"no-empty-interface": true,
58-
"no-eval": true,
59-
"no-inferrable-types": [
60-
true,
61-
"ignore-params"
62-
],
63-
"no-misused-new": true,
64-
"no-non-null-assertion": true,
65-
"no-shadowed-variable": true,
66-
"no-string-literal": false,
67-
"no-string-throw": true,
68-
"no-switch-case-fall-through": true,
69-
"no-trailing-whitespace": false,
70-
"no-unnecessary-initializer": true,
71-
"no-unused-expression": true,
72-
"no-use-before-declare": true,
73-
"no-var-keyword": true,
74-
"object-literal-sort-keys": false,
75-
"one-line": [
76-
true,
77-
"check-open-brace",
78-
"check-catch",
79-
"check-else"
80-
],
81-
"prefer-const": true,
82-
"quotemark": [
83-
false,
84-
"double"
85-
],
86-
"radix": true,
87-
"semicolon": [
88-
true,
89-
"always"
90-
],
91-
"triple-equals": [
92-
true,
93-
"allow-null-check"
94-
],
95-
"typedef-whitespace": [
96-
true,
97-
{
98-
"call-signature": "nospace",
99-
"index-signature": "nospace",
100-
"parameter": "nospace",
101-
"property-declaration": "nospace",
102-
"variable-declaration": "nospace"
103-
}
104-
],
105-
"unified-signatures": true,
106-
"variable-name": false,
107-
"whitespace": [
108-
true,
109-
"check-branch",
110-
"check-decl",
111-
"check-operator",
112-
"check-separator",
113-
"check-type"
114-
],
115-
"directive-selector": [
116-
true,
117-
"attribute",
118-
"app",
119-
"camelCase"
120-
],
121-
"component-selector": [
122-
true,
123-
"element",
124-
"app",
125-
"kebab-case"
126-
],
127-
"no-output-on-prefix": true,
128-
"use-input-property-decorator": true,
129-
"use-output-property-decorator": true,
130-
"use-host-property-decorator": true,
131-
"no-input-rename": true,
132-
"no-output-rename": true,
133-
"use-life-cycle-interface": true,
134-
"use-pipe-transform-interface": true,
135-
"component-class-suffix": true,
136-
"directive-class-suffix": true,
137-
"no-implicit-dependencies": [
5+
"rules": {
6+
"arrow-return-shorthand": true,
7+
"callable-types": true,
8+
"class-name": true,
9+
"comment-format": [
10+
true,
11+
"check-space"
12+
],
13+
"curly": false,
14+
"deprecation": {
15+
"severity": "warn"
16+
},
17+
"eofline": true,
18+
"forin": false,
19+
"import-blacklist": [
20+
true
21+
],
22+
"import-spacing": true,
23+
"indent": [
24+
true,
25+
"spaces"
26+
],
27+
"interface-over-type-literal": true,
28+
"label-position": true,
29+
"max-line-length": [
30+
true,
31+
350
32+
],
33+
"member-access": false,
34+
"member-ordering": [
35+
true,
36+
{
37+
"order": [
38+
"static-field",
39+
"instance-field",
40+
"static-method",
41+
"instance-method"
42+
]
43+
}
44+
],
45+
"no-arg": true,
46+
"no-bitwise": true,
47+
"no-console": [
48+
true,
49+
"debug",
50+
"info",
51+
"time",
52+
"timeEnd",
53+
"trace"
54+
],
55+
"no-construct": true,
56+
"no-debugger": true,
57+
"no-duplicate-super": true,
58+
"no-empty": false,
59+
"no-empty-interface": true,
60+
"no-eval": true,
61+
"no-inferrable-types": false,
62+
"no-misused-new": true,
63+
"no-non-null-assertion": true,
64+
"no-shadowed-variable": true,
65+
"no-string-literal": false,
66+
"no-string-throw": true,
67+
"no-switch-case-fall-through": true,
68+
"no-trailing-whitespace": false,
69+
"no-unnecessary-initializer": true,
70+
"no-unused-expression": true,
71+
"no-use-before-declare": true,
72+
"no-var-keyword": true,
73+
"object-literal-sort-keys": false,
74+
"one-line": [
75+
true,
76+
"check-open-brace",
77+
"check-catch",
78+
// "check-else",
79+
"check-whitespace"
80+
],
81+
"prefer-const": false,
82+
"quotemark": [
83+
false,
84+
"double"
85+
],
86+
"radix": true,
87+
"semicolon": [
88+
true,
89+
"always"
90+
],
91+
"triple-equals": false,
92+
"typedef-whitespace": [
93+
true,
94+
{
95+
"call-signature": "nospace",
96+
"index-signature": "nospace",
97+
"parameter": "nospace",
98+
"property-declaration": "nospace",
99+
"variable-declaration": "nospace"
100+
}
101+
],
102+
"unified-signatures": true,
103+
"variable-name": false,
104+
"whitespace": [
105+
true,
106+
"check-branch",
107+
"check-decl",
108+
"check-operator",
109+
"check-separator",
110+
"check-type"
111+
],
112+
"directive-selector": [
113+
true,
114+
"attribute",
115+
"app",
116+
"camelCase"
117+
],
118+
"component-selector": [
138119
true,
139-
[
140-
"@env",
141-
"@angular",
142-
"@core"
143-
],
144-
"dev"
145-
]
120+
"element",
121+
"app",
122+
"kebab-case"
123+
],
124+
"no-output-on-prefix": true,
125+
"use-input-property-decorator": true,
126+
"use-output-property-decorator": true,
127+
"use-host-property-decorator": true,
128+
"no-input-rename": true,
129+
"no-output-rename": true,
130+
"use-life-cycle-interface": true,
131+
"use-pipe-transform-interface": true,
132+
"component-class-suffix": true,
133+
"directive-class-suffix": true
134+
}
146135
}
147-
}
136+

0 commit comments

Comments
 (0)