refactor: change the hostname of the local backed server

cyrildewit · cyrildewit · commit b6eee3d16c63 · 2023-12-11T21:35:15.000+01:00
diff --git a/.env.ci-tests b/.env.ci-tests
@@ -2,7 +2,7 @@ APP_NAME=TalentPulse
 APP_ENV=testing
 APP_KEY=base64:xc00huj08Ru0P59Os7q/ceqOlcjasFfugAMWs0L0pDM=
 APP_DEBUG=true
-APP_URL=https://api.talentpulse.localhost
+APP_URL=https://talentpulse-backend.localhost
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
diff --git a/.env.local b/.env.local
@@ -2,7 +2,7 @@ APP_NAME=TalentPulse
 APP_ENV=local
 APP_KEY=base64:8BYu1rJ3szeYnG8a/JmkjwU4NzzETf9f8wX9cq18T+c=
 APP_DEBUG=true
-APP_URL=https://api.talentpulse.localhost
+APP_URL=https://talentpulse-backend.localhost
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
@@ -38,8 +38,8 @@ MAIL_FROM_ADDRESS="hello@talentpulse.localhost"
 MAIL_FROM_NAME="${APP_NAME}"
 
 # SAML
-SAML2_SP_ENTITYID=https://api.talentpulse.localhost/auth/methods/saml2-sp/metadata
-SAML2_LOGIN_URL=https://talentpulse.localhost/dashboard
+SAML2_SP_ENTITYID=https://talentpulse-backend.localhost/auth/methods/saml2-sp/metadata
+SAML2_LOGIN_URL=https://talentpulse.localhost/app/dashboard
 SAML2_LOGOUT_URL=https://talentpulse.localhost
 SAML2_SP_CERT_X509=MIIDazCCAlOgAwIBAgIUK/oTTlFW/C7Vm2C6sdjWA7+HDc4wDQYJKoZIhvcNAQELBQAwRTELMAkGA1UEBhMCbmwxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMzEyMDQxOTE4MDFaFw0zMzEyMDExOTE4MDFaMEUxCzAJBgNVBAYTAm5sMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvF7zYCAbE5eEzTfkq8JBkadro0y/0kCWx0FYSekN3Aw38kYC6nxWpaawscJF3cz4Pd3zg0jgT34XeO6r3VECM6CshRmkA9fmCM6xD4jI+5dU0fR7PK8/ndnImRFpJodSYKHyb1Nb4plz6lTrTclkkJpYmrI2nlxqke7gmv1axX/3y3DXmS3QUj3aP5++SGIVwdvivXd+fWGvdNcNwbm9laUC5IGGA5CC5SpLlVo0pXdctFjv+1q1fzmlgPkpv/SqNI4JK2WJSalqu43TAvAynUPKGPjYFAbC2hOmnE1xRdnZH24Uz6PN0JKuwSa+iD+x73XazNBE1aGpVhi7iLmgPAgMBAAGjUzBRMB0GA1UdDgQWBBSVvZjErcey8q0Th9clkQmjcSTR4zAfBgNVHSMEGDAWgBSVvZjErcey8q0Th9clkQmjcSTR4zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAIUrTLAHp8IEmOSh3SWaD+D3FA4J6RhwdZvFtk3OLOqDPX4yXOy8PvcbKn7EWV3m/e1KmuGIL7GYrWhC4pMIrdcXEh8Ocv6vdrWXoOOero9rEgWZxbCsmyOJGjKlFE+rAu+12a46xtDgi+/h8n8tVwgguh5UAWtCXJqVQmkqWEk6yMCERWdv68Gi0ZtYnexKMufp8z2mdkN9AAy1OBC4Fwtb6onfXsnpTe+ogkYlOXq9dMdIu96ovNsjl0O00ctZnkPpXFEPp9HAhvpNR2I48xM/ub85jB+HaKeUnDyn/OxAa8KrxMTiTPMU4NmXObONtQb+qwEe9z3Gco3gASZCEN
 SAML2_SP_CERT_PRIVATEKEY=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvF7zYCAbE5eEzTfkq8JBkadro0y/0kCWx0FYSekN3Aw38kYC6nxWpaawscJF3cz4Pd3zg0jgT34XeO6r3VECM6CshRmkA9fmCM6xD4jI+5dU0fR7PK8/ndnImRFpJodSYKHyb1Nb4plz6lTrTclkkJpYmrI2nlxqke7gmv1axX/3y3DXmS3QUj3aP5++SGIVwdvivXd+fWGvdNcNwbm9laUC5IGGA5CC5SpLlVo0pXdctFjv+1q1fzmlgPkpv/SqNI4JK2WJSalqu43TAvAynUPKGPjYFAbC2hOmnE1xRdnZH24Uz6PN0JKuwSa+iD+x73XazNBE1aGpVhi7iLmgPAgMBAAECggEAAwvS6iAz8EL2N+oMIUJ1fbG8MGKehq1FwO3b/oueJ8FM0s9QSjWhOTDDHdXdGt0ybyGptN4Id+LHyDXgwFd/j+TbhEoUcCtk1kX7m0koSfHmlusOPj4zpw97qdDTFxeKR+1oZPLP+vO7Dm9sDZseV1LaUwCAu/ve7mVjeQeg5k3Bkm/qRBChxKjPh+voQG/Du9NWOAvI49JWN7KZarWWn6ZHN27oYfwdJ/xWjhsOrlcZGT0jTy8NPVsxWB8iDmlt+cDDqu745ghlcOW4acFlkElX0AVzEw3ieN7kx3aOO0i6l7aybcez3tSJLvSSk23ldwOZu8Ciq2lZsN10Ah0qvQKBgQDu8lie4kCPlSEz2fQrLF2m3Sd5RtMwtSR/uNm5Kk0vn33glA4F5cvM316lBB5k37JfuCOhZgTKEpffo5B26PiFrl7zIzMZTGoMcxGT2JGZMABNq5NINn77hv+9KM/b+27ZhrLrA8CsZ1mDLHID7ts5fmfnFFlmJWLLU+vhC4s4/QKBgQC7lsD2uJz9UbdanKXfCebEaOsmC0xJGrJVRWlovFLOZMNyMfvJf+MKxQS2XSBGjoG+CSPmZX/0ErKz45SD8+X05WJ7sGUxZNyiuByHR4+QPCxxkZ7WFT7D59UQsK7bf+yjTWLmSiAeljNLIpzlriYBNb3C3OxnzQU2zUeZ1L4o+wKBgQCa81dauTfKpJeia012jc+xfKqzb6VWabFgjfvKos7o+hGECB7L3kf59EQI2JHpMlMW1W9to52peMM6CHSPV+aJshjqrMHfPvlqV1hnusI4R7N6qq/Y3VYdQF8pSIT6j6NDtqDh3E4evuqCMNlDCarqLrmsVTrgDZBycFp/VqAS9QKBgH8oxOs536lUIE87CrFzW8veNzBVzkNr5mEpKTgHGLax1U7ulPhVSYl+XiBkZkGNzmMMfRpryV2g4yRP69e6mDH24FhqDV57OZjP5v7IwoeKUrI1fQ8v3Zkc6PBkZFOElttn1Ne4fadeN60B7ItBDqAZVuXlrhb7AkLQym17qd/LAoGAQr/pw9Z2V6gSes06c8j8cKAQDr6FkCtMjnKQnUO/JtQ2lfzQwycRNTwUTUByi6R/ynWMGel/JElcmBC4r98R2jefRMBCCBJIsDEaFmst+bgGcDd8A32wkaAAKLtRc5FKrHml7Itliv5BWpjOr82nqaD92zMWX/ddLtX3ZvYSAb4=
diff --git a/app/App/Shared/Providers/RouteServiceProvider.php b/app/App/Shared/Providers/RouteServiceProvider.php
@@ -17,7 +17,7 @@
     title: 'TalentPulse API',
 )]
 #[OA\Server(
-    url: 'https://api.talentpulse.localhost',
+    url: 'https://talentpulse-backend.localhost',
     description: 'Local Development',
 )]
 #[OA\Components(
@@ -100,7 +100,7 @@ public function boot(): void
 
         $this->routes(function () use ($configRepository) {
             Route::middleware('api')
-                ->domain($configRepository->get('app.domain'))
+//                ->domain($configRepository->get('app.domain'))
                 ->group(base_path('routes/api.php'));
 
             Route::middleware('web')
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik-gateway"
-      - "traefik.http.routers.talentpulse-backend-nginx.rule=Host(`api.talentpulse.localhost`)"
+      - "traefik.http.routers.talentpulse-backend-nginx.rule=Host(`talentpulse-backend.localhost`)"
       - "traefik.http.routers.talentpulse-backend-nginx.priority=1"
       - "traefik.http.routers.talentpulse-backend-nginx.entrypoints=https"
       - "traefik.http.routers.talentpulse-backend-nginx.tls=true"
@@ -56,8 +56,8 @@ services:
     image: kenchan0130/simplesamlphp
     environment:
       SIMPLESAMLPHP_SP_ENTITY_ID: https://talentpulse.localhost
-      SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE: https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs
-      SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE: https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/logout
+      SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE: https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs
+      SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE: https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/logout
     volumes:
       - ./docker/simplesaml/fontys-hogeschool/config/authsources.php:/var/www/simplesamlphp/config/authsources.php
       - ./docker/simplesaml/fontys-hogeschool/metadata/saml20-sp-remote.php:/var/www/simplesamlphp/metadata/saml20-sp-remote.php
diff --git a/docker/simplesaml/fontys-hogeschool/metadata/saml20-idp-remote.php b/docker/simplesaml/fontys-hogeschool/metadata/saml20-idp-remote.php
@@ -11,29 +11,29 @@
     'AssertionConsumerService' => [
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
             'index' => 0,
             'isDefault' => true,
         ],
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
             'index' => 1,
         ],
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
             'index' => 2,
         ],
     ],
     'SingleLogoutService' => [
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
         ],
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
         ],
     ],
     'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
diff --git a/docker/simplesaml/fontys-hogeschool/metadata/saml20-sp-remote.php b/docker/simplesaml/fontys-hogeschool/metadata/saml20-sp-remote.php
@@ -1,7 +1,7 @@
 <?php
 
-$metadata['https://api.talentpulse.localhost/auth/methods/saml2-sp/metadata'] = [
-    'entityid' => 'https://api.talentpulse.localhost/auth/methods/saml2-sp/metadata',
+$metadata['https://talentpulse-backend.localhost/auth/methods/saml2-sp/metadata'] = [
+    'entityid' => 'https://talentpulse-backend.localhost/auth/methods/saml2-sp/metadata',
     'contacts' => [
         [
             'contactType' => 'support',
@@ -11,29 +11,29 @@
     'AssertionConsumerService' => [
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
             'index' => 0,
             'isDefault' => true,
         ],
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
             'index' => 1,
         ],
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
             'index' => 2,
         ],
     ],
     'SingleLogoutService' => [
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/sls/',
         ],
         [
             'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-            'Location' => 'https://api.talentpulse.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
+            'Location' => 'https://talentpulse-backend.localhost/auth/methods/saml2/a5c5d904-ed29-4462-ab6b-e73cb3270967/acs/',
         ],
     ],
     'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
diff --git a/openapi.yaml b/openapi.yaml
@@ -4,7 +4,7 @@ info:
   version: '0.1'
 servers:
   -
-    url: 'https://api.talentpulse.localhost'
+    url: 'https://talentpulse-backend.localhost'
     description: 'Local Development'
 paths:
   /auth/current-user:

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ info:`
`4`	`4`	`version: '0.1'`
`5`	`5`	`servers:`
`6`	`6`	`-`
`7`		`- url: 'https://api.talentpulse.localhost'`
	`7`	`+ url: 'https://talentpulse-backend.localhost'`
`8`	`8`	`description: 'Local Development'`
`9`	`9`	`paths:`
`10`	`10`	`/auth/current-user:`