Fix Travis tests

Author: FlyersWeb

.travis.yml

@@ -1,16 +1,20 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
+  - 7.2
+  - 7.3
+
+services:
+  - postgresql
 
 before_script:
+  - psql -c 'create database symfony_test;' -U postgres
   - phpenv config-rm xdebug.ini
   - cd back-end
   - composer self-update
   - composer install
+  - APP_ENV=test bin/console doctrine:schema:create -q
+  - APP_ENV=test bin/console doctrine:fixtures:load -q --purge-with-truncate
 
 script:
-  - phpunit -c app
+  - phpunit

README.md

@@ -1,4 +1,4 @@
-angular-symfony
+angular-symfony [![Build Status](https://travis-ci.org/FlyersWeb/angular-symfony.svg?branch=upgrade)](https://travis-ci.org/FlyersWeb/angular-symfony)
 ===============
 
 Project Bootstrap for an Angular 2+ and Symfony 4+ webservices project.
@@ -13,7 +13,7 @@ Buy me a coffee
 
 [![Buy me a coffee](https://raw.githubusercontent.com/FlyersWeb/angular-symfony/upgrade/buy-me-a-coffee.png)](https://paypal.me/nac1dbois)
 
-I'm working on this project in my free time and offering it free of charges. To help me work more on this you can help me by sending me a tip.
+I'm working on this project in my free time and offering it free of charges. To help me work more on this you send me tips to buy more coffee :)
 
 Installation
 ------------
@@ -32,6 +32,10 @@ Log in application docker image :
 
 	docker-compose exec application bash
 
+Install dependencies :
+
+	composer install
+
 Update schemas (FOSUserBundle) :
 
 	php bin/console doctrine:schema:create

back-end/.env

@@ -25,7 +25,7 @@ APP_SECRET=abb685fe97081c338ed39e8b1cb4bd69
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # For a PostgreSQL database, use: "postgresql://db_user:[email protected]:5432/db_name?serverVersion=11"
 # IMPORTANT: You MUST configure your db driver and server version, either here or in config/packages/doctrine.yaml
-DATABASE_URL=postgresql://postgres:postgres@database:5432/symfony_test?serverVersion=10.10
+DATABASE_URL=postgresql://postgres:postgres@database:5432/symfony_dev?serverVersion=10.10
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/swiftmailer-bundle ###

back-end/.env.test

@@ -3,3 +3,4 @@ KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
+DATABASE_URL=postgresql://postgres@localhost:5432/symfony_test?serverVersion=9.2

back-end/composer.json

@@ -6,6 +6,7 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "friendsofsymfony/rest-bundle": "^2.6",
+        "friendsofsymfony/user-bundle": "^2.0",
         "nelmio/cors-bundle": "^2.0",
         "sensio/framework-extra-bundle": "^5.1",
         "symfony/asset": "4.3.*",
@@ -34,6 +35,7 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "symfony/debug-pack": "*",
         "symfony/maker-bundle": "^1.0",
+        "symfony/phpunit-bridge": "^4.3",
         "symfony/profiler-pack": "*",
         "symfony/test-pack": "*",
         "symfony/web-server-bundle": "4.3.*"

back-end/src/Controller/DefaultController.php

@@ -42,6 +42,6 @@ public function loginAction(Request $request, UserManagerInterface $userManager,
             throw new HttpException(403, "Error User Bad Password");
         }
 
-        return $this->json(['secret' => $user->getPassword()]);
+        return $this->json(['secret' => $user->getSalt()]);
     }
 }

back-end/src/Security/Authentication/Provider/WsseProvider.php

@@ -27,7 +27,7 @@ public function authenticate(TokenInterface $token)
         $user = $this->userProvider->loadUserByUsername($token->getUsername());
 
         // Check digest and replay attempts and return token with user roles
-        if ($user && $this->validateDigest($token->digest, $token->nonce, $token->created, $user->getPassword())) {
+        if ($user && $this->validateDigest($token->digest, $token->nonce, $token->created, $user->getSalt())) {
             $authenticatedToken = new WsseUserToken($user->getRoles());
             $authenticatedToken->setUser($user);
 
@@ -49,15 +49,15 @@ protected function validateDigest($digest, $nonce, $created, $secret)
         if (strtotime($created) > time()) {
             return false;
         }
-
+        
         // Expire timestamp after 5 minutes
         if (time() - strtotime($created) > self::TOKEN_DURATION) {
             return false;
         }
-
+        
         // Try to fetch the cache item from pool
         $cacheItem = $this->cachePool->getItem(md5($nonce));
-
+        
         // Validate that the nonce is *not* in cache
         // if it is, this could be a replay attack
         if ($cacheItem->isHit()) {

back-end/tests/Controller/ApiControllerTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Test\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class ApiControllerTest extends WebTestCase
+{
+    public function testGetHelloWhithoutToken()
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/api/hello');
+
+        $this->assertEquals(401, $client->getResponse()->getStatusCode());
+    }
+
+    public function testGetHelloWhithToken()
+    {
+        $client = static::createClient();
+        // User created by running doctrine fixtures
+        $client->request('POST', '/login', ['username' => 'bob', 'password' => 'Abc123']);
+        // Get user secret
+        $content = json_decode($client->getResponse()->getContent(), true);
+
+        // User created by running doctrine fixtures
+        $username = 'bob';
+        // User secret returned after login
+        $secret = $content['secret'];
+        // Generate a random string to prevent replay attacks
+        $nonce = base64_encode(substr(md5(rand()), 0, 10));
+        // Token work for 5 minutes
+        $created = date("Y-m-d\TH:i:s\Z", strtotime('now -2 minute'));
+        // Generate the shared secret digest
+        $digest = base64_encode(sha1(base64_decode($nonce) . $created . $secret, true));
+        // X-WSSE header sent
+        $userToken = 'UsernameToken Username="' . $username . '", PasswordDigest="' . $digest . '", Nonce="' . $nonce . '", Created="' . $created . '"';
+
+        $client = static::createClient();
+        $client->request('GET', '/api/hello', [], [], [
+            'HTTP_X-WSSE' => $userToken
+        ]);
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($client->getResponse()->getContent(), true);
+        $this->assertEquals('world', $content['hello']);
+    }
+}

back-end/tests/Controller/DefaultControllerTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Test\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class DefaultControllerTest extends WebTestCase
+{
+    public function testGetIndex()
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+    }
+
+    public function testPostLogin()
+    {
+        $client = static::createClient();
+        // User created by running doctrine fixtures
+        $client->request('POST', '/login', ['username' => 'bob', 'password' => 'Abc123']);
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        // Get the user secret (we use the salt because it can be disclosed)
+        $content = json_decode($client->getResponse()->getContent(), true);
+        $this->assertEquals("e4TNCCgLvPbDRh7ih+pK58pab0NToFzdZHuPmA0e", $content['secret']);
+    }
+}

dockerify/docker-compose.yml

@@ -2,9 +2,6 @@ application:
     build: ../back-end
     volumes:
         - ../back-end:/var/www
-        # - ./php-fpm/php.ini:/usr/local/etc/php/php.ini
-        # - ./php-fpm/timezone.ini:/usr/local/etc/php/conf.d/timezone.ini
-        # - ./php-fpm/symfony.pool.conf:/usr/local/etc/php-fpm.d/symfony.pool.conf
     links:
         - database
 

front-end/.tool-versions

@@ -1,4 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 
 import { HelloComponent } from './hello.component';
 
@@ -8,6 +10,10 @@ describe('HelloComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
+      imports: [
+        HttpClientTestingModule,
+        RouterTestingModule,
+      ],
       declarations: [ HelloComponent ]
     })
     .compileComponents();

front-end/src/app/hello/hello.component.spec.ts

@@ -1,13 +1,21 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LoginComponent } from './login.component';
+import { ReactiveFormsModule } from '@angular/forms';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('LoginComponent', () => {
   let component: LoginComponent;
   let fixture: ComponentFixture<LoginComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
+      imports: [
+        ReactiveFormsModule,
+        HttpClientTestingModule,
+        RouterTestingModule
+      ],
       declarations: [ LoginComponent ]
     })
     .compileComponents();

front-end/src/app/login/login.component.spec.ts

@@ -1,9 +1,14 @@
 import { TestBed } from '@angular/core/testing';
 
 import { WSSEService } from './wsse.service';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('WSSEService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => TestBed.configureTestingModule({
+    imports: [
+      HttpClientTestingModule,
+    ]
+  }));
 
   it('should be created', () => {
     const service: WSSEService = TestBed.get(WSSEService);