Add location default values

[airbundle] / Controller / UserController.php

diff --git a/Controller/UserController.php b/Controller/UserController.php
index 510ae33e66065abe36ddbdad8bd9dfea282a7a43..13c1bec76817323d0caccc0aeb0968fc14f89fa4 100644 (file)
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -160,7 +160,7 @@ class UserController extends BaseUserController {
                                        'application_name' => $request->server->get('GOOGLE_PROJECT'),
                                        'client_id' => $request->server->get('GOOGLE_CLIENT'),
                                        'client_secret' => $request->server->get('GOOGLE_SECRET'),
                                        'application_name' => $request->server->get('GOOGLE_PROJECT'),
                                        'client_id' => $request->server->get('GOOGLE_CLIENT'),
                                        'client_secret' => $request->server->get('GOOGLE_SECRET'),

-                                       'redirect_uri' => $this->generateUrl('rapsys_air_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
+                                       'redirect_uri' => $this->generateUrl('rapsysair_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),

                                        'scopes' => self::googleScopes,
                                        'access_type' => 'offline',
                                        'login_hint' => $user->getMail(),
                                        'scopes' => self::googleScopes,
                                        'access_type' => 'offline',
                                        'login_hint' => $user->getMail(),


@@ -546,7 +546,7 @@ class UserController extends BaseUserController {
                                'application_name' => $request->server->get('GOOGLE_PROJECT'),
                                'client_id' => $request->server->get('GOOGLE_CLIENT'),
                                'client_secret' => $request->server->get('GOOGLE_SECRET'),
                                'application_name' => $request->server->get('GOOGLE_PROJECT'),
                                'client_id' => $request->server->get('GOOGLE_CLIENT'),
                                'client_secret' => $request->server->get('GOOGLE_SECRET'),

-                               'redirect_uri' => $this->generateUrl('rapsys_air_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
+                               'redirect_uri' => $this->generateUrl('rapsysair_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),

                                'scopes' => self::googleScopes,
                                'access_type' => 'offline',
                                'login_hint' => $user->getMail(),
                                'scopes' => self::googleScopes,
                                'access_type' => 'offline',
                                'login_hint' => $user->getMail(),


@@ -640,6 +640,6 @@ class UserController extends BaseUserController {
                }
 
                //Redirect to user
                }
 
                //Redirect to user

-               return $this->redirectToRoute('rapsys_user_edit', ['mail' => $short = $this->slugger->short($user->getMail()), 'hash' => $this->slugger->hash($short)]);
+               return $this->redirectToRoute('rapsysuser_edit', ['mail' => $short = $this->slugger->short($user->getMail()), 'hash' => $this->slugger->hash($short)]);

        }
 }
        }
 }