Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8143c77

Browse files
author
Benjamin RICHARD
committed
fix #127 for http scheme forced
1 parent b205aa3 commit 8143c77

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

‎assets/js/form-devxpress-angular/src/app/home/home.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export class HomeComponent {
1414
}
1515

1616
getRedirectUri() {
17-
return `http://${host}/demo/form/devxpress-angular`
17+
return `//${host}/demo/form/devxpress-angular`
1818
}
1919
}

‎assets/js/form-devxpress-angular/src/app/shared/login/login.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ export class LoginComponent {
3131
}
3232

3333
getRedirectUri() {
34-
return `http://${host}/demo/form/devxpress-angular`;
34+
return `//${host}/demo/form/devxpress-angular`;
3535
}
3636
}

‎assets/js/form-devxpress-angular/src/app/shared/services/user.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class User {
2626
}
2727

2828
authenticate(credentials: { login: string; password: string }): Observable<UserModel> {
29-
const jwtLoginUri = `http://${host}${loginInfos.uriLogin.jwt}`
29+
const jwtLoginUri = `//${host}${loginInfos.uriLogin.jwt}`
3030

3131
// it seems that if you don't type the body, then it won't be sent over POST HTTP
3232
const formatedCredentials: {} = {}

‎assets/js/form-devxpress-angular/src/environments/environment.prod.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import { host, apiPlatformPrefix } from '../../../lib/config'
33
export const environment = {
44
production: true,
55
rest: {
6-
baseUrl: `http://${host}${apiPlatformPrefix}/`
6+
baseUrl: `//${host}${apiPlatformPrefix}/`
77
},
88
};

‎assets/js/form-devxpress-angular/src/environments/environment.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export const environment = {
88
production: false,
99
useMock : false,
1010
rest: {
11-
baseUrl: `http://${host}${apiPlatformPrefix}/`
11+
baseUrl: `//${host}${apiPlatformPrefix}/`
1212
},
1313
};

‎assets/js/form-devxpress-vuejs/services/books.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const getBooks = {
2020
pageInfo: {},
2121
}
2222

23-
const uri = `http://${host}${apiPlatformPrefix}/books`
23+
const uri = `//${host}${apiPlatformPrefix}/books`
2424

2525
export const dataSource = {
2626
store: new CustomStore({

‎config/packages/security.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@ security:
9595
invalidate_session: true
9696

9797
main:
98-
anonymous: ~
98+
anonymous: ~

‎src/Command/DumpJsConfig.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ protected function displayJsConfigArguments(OutputInterface $output, $apiPlatfor
238238
'Js config file creation',
239239
'=======================',
240240
'arguments:',
241-
'host:port = ' . $host . ':' . $port,
241+
'host:port = ' . $host . ($port !== 80 ? ':' . $port : ''),
242242
'quasarStyle = ' . $quasarStyle,
243243
'apiPlatform = ' . $apiPlatformOutput(),
244244
]);

‎src/Controller/Api/TokenController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace App\Controller\Api;
44

5-
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
5+
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
66
use Symfony\Component\HttpFoundation\JsonResponse;
77
use Symfony\Component\HttpKernel\Exception\HttpException;
88
use Symfony\Component\Routing\Annotation\Route;
99
use Symfony\Component\HttpFoundation\Response;
1010
use Symfony\Component\HttpFoundation\Request;
1111
use App\Security\CsrfToken;
1212

13-
class TokenController extends Controller
13+
class TokenController extends AbstractController
1414
{
1515
/**
1616
* For SPA, to get a new valid token

‎templates/command/config.js.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const host = '{{ host }}:{{ port }}'
1+
export const host = '{{ host }}{% ifport!=80 %}:{{ port }}{% endif %}'
22
export const env = '{{ env }}'
33
export function isProduction () {
44
return env === 'prod'

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /