Rewrite authentication logic with the API store

backend/module/eCampApi/config/documentation.config.php

@@ -3,7 +3,7 @@
     'eCampApi\\V1\\Rpc\\Index\\Controller' => array(
         'description' => 'Entrypoint',
     ),
-    'eCampApi\\V1\\Rpc\\Login\\Controller' => array(
+    'eCampApi\\V1\\Rpc\\Auth\\Controller' => array(
         'description' => '',
         'GET' => array(
             'description' => '/index  

backend/module/eCampApi/config/module.config.php

@@ -104,19 +104,19 @@
             'e-camp-api.rpc.index' => array(
                 'type' => 'Segment',
                 'options' => array(
-                    'route' => '/api[/]',
+                    'route' => '/api',
                     'defaults' => array(
                         'controller' => 'eCampApi\\V1\\Rpc\\Index\\Controller',
                         'action' => 'index',
                     ),
                 ),
             ),
-            'e-camp-api.rpc.login' => array(
+            'e-camp-api.rpc.auth' => array(
                 'type' => 'Segment',
                 'options' => array(
-                    'route' => '/api/login[/:action]',
+                    'route' => '/api/auth[/:action]',
                     'defaults' => array(
-                        'controller' => 'eCampApi\\V1\\Rpc\\Login\\Controller',
+                        'controller' => 'eCampApi\\V1\\Rpc\\Auth\\Controller',
                         'action' => 'index',
                     ),
                 ),
@@ -162,7 +162,7 @@
     ),
     'controllers' => array(
         'factories' => array(
-            'eCampApi\\V1\\Rpc\\Login\\Controller' => 'eCampApi\\V1\\Rpc\\Login\\LoginControllerFactory',
+            'eCampApi\\V1\\Rpc\\Auth\\Controller' => 'eCampApi\\V1\\Rpc\\Auth\\AuthControllerFactory',
             'eCampApi\\V1\\Rpc\\Index\\Controller' => 'eCampApi\\V1\\Rpc\\Index\\IndexControllerFactory',
             'eCampApi\\V1\\Rpc\\Register\\Controller' => 'eCampApi\\V1\\Rpc\\Register\\RegisterControllerFactory',
         ),
@@ -181,7 +181,7 @@
             9 => 'e-camp-api.rest.doctrine.user',
             10 => 'e-camp-api.rest.doctrine.camp-collaboration',
             12 => 'e-camp-api.rpc.index',
-            11 => 'e-camp-api.rpc.login',
+            11 => 'e-camp-api.rpc.auth',
             13 => 'e-camp-api.rpc.register',
             14 => 'e-camp-api.rest.doctrine.event-plugin',
             15 => 'e-camp-api.rest.doctrine.plugin',
@@ -554,7 +554,7 @@
             'eCampApi\\V1\\Rest\\User\\Controller' => 'HalJson',
             'eCampApi\\V1\\Rest\\CampCollaboration\\Controller' => 'HalJson',
             'eCampApi\\V1\\Rpc\\Index\\Controller' => 'HalJson',
-            'eCampApi\\V1\\Rpc\\Login\\Controller' => 'HalJson',
+            'eCampApi\\V1\\Rpc\\Auth\\Controller' => 'HalJson',
             'eCampApi\\V1\\Rpc\\Register\\Controller' => 'Json',
             'eCampApi\\V1\\Rest\\EventPlugin\\Controller' => 'HalJson',
             'eCampApi\\V1\\Rest\\Plugin\\Controller' => 'HalJson',
@@ -621,7 +621,7 @@
                 1 => 'application/json',
                 2 => 'application/*+json',
             ),
-            'eCampApi\\V1\\Rpc\\Login\\Controller' => array(
+            'eCampApi\\V1\\Rpc\\Auth\\Controller' => array(
                 0 => 'application/vnd.e-camp-api.v1+json',
                 1 => 'application/json',
                 2 => 'application/*+json',
@@ -696,7 +696,7 @@
                 0 => 'application/vnd.e-camp-api.v1+json',
                 1 => 'application/json',
             ),
-            'eCampApi\\V1\\Rpc\\Login\\Controller' => array(
+            'eCampApi\\V1\\Rpc\\Auth\\Controller' => array(
                 0 => 'application/vnd.e-camp-api.v1+json',
                 1 => 'application/json',
             ),
@@ -948,8 +948,8 @@
         'eCampApi\\V1\\Rest\\CampCollaboration\\Controller' => array(
             'input_filter' => 'eCampApi\\V1\\Rest\\CampCollaboration\\Validator',
         ),
-        'eCampApi\\V1\\Rpc\\Login\\Controller' => array(
-            'input_filter' => 'eCampApi\\V1\\Rpc\\Login\\Validator',
+        'eCampApi\\V1\\Rpc\\Auth\\Controller' => array(
+            'input_filter' => 'eCampApi\\V1\\Rpc\\Auth\\Validator',
         ),
         'eCampApi\\V1\\Rest\\EventPlugin\\Controller' => array(
             'input_filter' => 'eCampApi\\V1\\Rest\\EventPlugin\\Validator',
@@ -1446,7 +1446,7 @@
                 'validators' => array(),
             ),
         ),
-        'eCampApi\\V1\\Rpc\\Login\\Validator' => array(),
+        'eCampApi\\V1\\Rpc\\Auth\\Validator' => array(),
         'eCampApi\\V1\\Rest\\EventPlugin\\Validator' => array(
             0 => array(
                 'name' => 'instanceName',
@@ -1599,13 +1599,13 @@
         ),
     ),
     'zf-rpc' => array(
-        'eCampApi\\V1\\Rpc\\Login\\Controller' => array(
-            'service_name' => 'Login',
+        'eCampApi\\V1\\Rpc\\Auth\\Controller' => array(
+            'service_name' => 'Auth',
             'http_methods' => array(
                 0 => 'GET',
                 1 => 'POST',
             ),
-            'route_name' => 'e-camp-api.rpc.login',
+            'route_name' => 'e-camp-api.rpc.auth',
         ),
         'eCampApi\\V1\\Rpc\\Index\\Controller' => array(
             'service_name' => 'Index',

backend/module/eCampApi/src/eCampApi/V1/Rpc/Login/LoginController.php → backend/module/eCampApi/src/eCampApi/V1/Rpc/Auth/AuthController.php

@@ -1,5 +1,5 @@
 <?php
-namespace eCampApi\V1\Rpc\Login;
+namespace eCampApi\V1\Rpc\Auth;
 
 use eCamp\Core\Auth\Adapter\LoginPassword;
 use eCamp\Core\Entity\User;
@@ -13,7 +13,7 @@
 use ZF\Hal\Link\Link;
 use ZF\Hal\View\HalJsonModel;
 
-class LoginController extends AbstractActionController {
+class AuthController extends AbstractActionController {
     /** @var AuthenticationService */
     private $authenticationService;
 
@@ -68,27 +68,48 @@ public function indexAction() {
             'route' => [ 'name' => 'e-camp-api.rpc.index' ]
         ]);
 
+        $data['login'] = Link::factory([
+            'rel' => 'login',
+            'route' => [
+                'name' => 'e-camp-api.rpc.auth',
+                'params' => [ 'action' => 'login' ]
+            ]
+        ]);
+
+        $data['register'] = Link::factory([
+            'rel' => 'register',
+            'route' => [
+                'name' => 'e-camp-api.rpc.register',
+                'params' => [ 'action' => 'register' ]
+            ]
+        ]);
+
         $data['google'] = Link::factory([
-          'rel' => 'google',
-          'route' => [
-            'name' => 'e-camp-api.rpc.login',
-            'params' => [ 'action' => 'google' ]
-          ]
+            'rel' => 'google',
+            'route' => [
+                'name' => 'e-camp-api.rpc.auth',
+                'params' => [ 'action' => 'google' ]
+            ]
         ]);
 
         $data['pbsmidata'] = Link::factory([
           'rel' => 'pbsmidata',
           'route' => [
-            'name' => 'e-camp-api.rpc.login',
+            'name' => 'e-camp-api.rpc.auth',
             'params' => [ 'action' => 'pbsmidata' ]
           ]
         ]);
 
+        $data['self'] = Link::factory([
+            'rel' => 'self',
+            'route' => 'e-camp-api.rpc.auth'
+        ]);
+
         if ($userId != null) {
             $data['logout'] = Link::factory([
                 'rel' => 'logout',
                 'route' => [
-                    'name' => 'e-camp-api.rpc.login',
+                    'name' => 'e-camp-api.rpc.auth',
                     'params' => [ 'action' => 'logout' ]
                 ]
             ]);
@@ -115,7 +136,7 @@ public function loginAction() {
         $adapter = new LoginPassword($user, $password);
         $this->authenticationService->authenticate($adapter);
 
-        return $this->redirect()->toRoute('e-camp-api.rpc.login');
+        return $this->redirect()->toRoute('e-camp-api.rpc.auth');
     }
 
 
@@ -127,7 +148,7 @@ public function googleAction() {
         $request = $this->getRequest();
         $externalCallback = $request->getQuery('callback');
 
-        $redirect = $this->url()->fromRoute('e-camp-api.rpc.login', [], ['query'=>['callback'=>$externalCallback]]);
+        $redirect = $this->url()->fromRoute('e-camp-api.rpc.auth', [], ['query'=>['callback'=>$externalCallback]]);
 
         return $this->redirect()->toRoute(
           'ecamp.auth/google',
@@ -144,7 +165,7 @@ public function pbsMiDataAction() {
         $request = $this->getRequest();
         $externalCallback = $request->getQuery('callback');
 
-        $redirect = $this->url()->fromRoute('e-camp-api.rpc.login', [], [
+        $redirect = $this->url()->fromRoute('e-camp-api.rpc.auth', [], [
             'query'=>['callback'=>$externalCallback]
         ]);
 
@@ -162,6 +183,6 @@ public function pbsMiDataAction() {
     public function logoutAction() {
         $this->authenticationService->clearIdentity();
 
-        return $this->redirect()->toRoute('e-camp-api.rpc.login');
+        return $this->redirect()->toRoute('e-camp-api.rpc.auth');
     }
 }

backend/module/eCampApi/src/eCampApi/V1/Rpc/Login/LoginControllerFactory.php → backend/module/eCampApi/src/eCampApi/V1/Rpc/Auth/AuthControllerFactory.php

@@ -1,16 +1,16 @@
 <?php
-namespace eCampApi\V1\Rpc\Login;
+namespace eCampApi\V1\Rpc\Auth;
 
 use eCamp\Core\EntityService\UserService;
 use Zend\Authentication\AuthenticationService;
 
-class LoginControllerFactory {
+class AuthControllerFactory {
     public function __invoke($controllers) {
         $authenticationService = $controllers->get(AuthenticationService::class);
 
         /** @var UserService $userService */
         $userService = $controllers->get(UserService::class);
 
-        return new LoginController($authenticationService, $userService);
+        return new AuthController($authenticationService, $userService);
     }
 }

backend/module/eCampApi/src/eCampApi/V1/Rpc/Index/IndexController.php

@@ -41,9 +41,9 @@ public function indexAction() {
             $data['user'] = 'guest';
         }
 
-        $data['login'] = Link::factory([
-            'rel' => 'login',
-            'route' => 'e-camp-api.rpc.login'
+        $data['auth'] = Link::factory([
+            'rel' => 'auth',
+            'route' => 'e-camp-api.rpc.auth'
         ]);
 
         $data['self'] = Link::factory([

backend/module/eCampLib/config/module.config.php

@@ -27,7 +27,7 @@
                         \Interop\Container\ContainerInterface::class => Zend\ServiceManager\ServiceManager::class,
                     ],
                 ],
-            ],    
+            ],
         ],
     ],
 

frontend/src/auth.js

@@ -1,70 +1,62 @@
 import Vue from 'vue'
 import axios from 'axios'
-const storageLocation = 'loggedIn'
+import { get, reload, post, href } from '@/store'
+import router from '@/router'
 
-const subscribers = []
+axios.interceptors.response.use(null, error => {
+  if (error.status === 401) {
+    logout()
+  }
+  return Promise.reject(error)
+})
 
-const notifySubscribers = newLoginStatus => {
-  subscribers.forEach(subscriber => subscriber(newLoginStatus))
+function isLoggedIn () {
+  return get().auth().role === 'user'
 }
 
-export const auth = {
-  async isLoggedIn () {
-    const savedStatus = window.localStorage.getItem(storageLocation)
-    if (savedStatus !== null) {
-      return savedStatus === '1'
-    }
-    const response = await axios.get(process.env.VUE_APP_ROOT_API + '/login')
-    let loggedIn = '0'
-    if (response.data.user !== 'guest') {
-      loggedIn = '1'
-    }
-    window.localStorage.setItem(storageLocation, loggedIn)
-    return loggedIn === '1'
-  },
-  subscribe (onLoginStatusChange) {
-    subscribers.push(onLoginStatusChange)
-  },
-  login (username, password) {
-    return axios.post(process.env.VUE_APP_ROOT_API + '/login/login', { username: username, password: password })
-      .then(resp => {
-        if (resp.data.user !== 'guest') {
-          this.loginSuccess()
-          return true
-        } else {
-          return false
-        }
-      })
-  },
-  loginGoogle (returnUrl) {
-    window.open(process.env.VUE_APP_ROOT_API + '/login/google?callback=' + encodeURI(returnUrl), '', 'width=500px,height=600px')
-  },
-  loginPbsMiData (returnUrl) {
-    window.open(process.env.VUE_APP_ROOT_API + '/login/pbsmidata?callback=' + encodeURI(returnUrl), '', 'width=500px,height=600px')
-  },
-  loginSuccess () {
-    window.localStorage.setItem(storageLocation, '1')
-    notifySubscribers(true)
-  },
-  logout (callback) {
-    axios.get(process.env.VUE_APP_ROOT_API + '/login/logout').then(response => {
-      window.localStorage.setItem(storageLocation, '0')
-      notifySubscribers(false)
-      if (callback) {
-        callback(response)
-      }
+export async function refreshLoginStatus (forceReload = true) {
+  if (forceReload) reload(get().auth())
+  await get().auth()._meta.load
+  return isLoggedIn()
+}
+
+async function login (username, password) {
+  const url = await href(get().auth(), 'login')
+  return post(url, { username: username, password: password }).then(() => refreshLoginStatus())
+}
+
+async function register ({ username, email, password }) {
+  const url = await href(get().auth(), 'register')
+  return post(url, { username, email, password }).then(() => refreshLoginStatus())
+}
+
+async function oAuthLoginInSeparateWindow (provider) {
+  return new Promise(resolve => {
+    // Make the promise resolve function available on global level, so the separate window can call it
+    window.afterLogin = resolve
+
+    href(get().auth(), provider).then(url => {
+      const returnUrl = window.location.origin + router.resolve({ name: 'loginCallback' }).href
+      // TODO use templated relations once #369 is implemented
+      window.open(url + '?callback=' + encodeURI(returnUrl), '', 'width=500px,height=600px')
     })
-  }
+  })
 }
 
-axios.interceptors.response.use(null, error => {
-  if (error.status === 401) {
-    auth.logout()
-  }
-  return Promise.reject(error)
-})
+async function loginGoogle () {
+  return oAuthLoginInSeparateWindow('google').then(() => refreshLoginStatus())
+}
+
+async function loginPbsMiData () {
+  return oAuthLoginInSeparateWindow('pbsmidata').then(() => refreshLoginStatus())
+}
+
+async function logout () {
+  return reload(get().auth().logout())._meta.load.then(() => refreshLoginStatus())
+}
+
+export const auth = { isLoggedIn, refreshLoginStatus, login, register, loginGoogle, loginPbsMiData, logout }
 
-Vue.auth = auth
 Object.defineProperties(Vue.prototype, {
   $auth: {
     get () {