@semapps/auth 0.4.0-alpha.32 → 0.4.0-alpha.35

package/mixins/auth.js

@@ -38,7 +38,7 @@ const AuthMixin = {
       done(null, user);
     });
 
-    this.strategy = this.getStrategy();
+    this.strategy = await this.getStrategy();
 
     this.passport.use(this.passportId, this.strategy);
 

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@semapps/auth",
-  "version": "0.4.0-alpha.32",
+  "version": "0.4.0-alpha.35",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/mime-types": "0.4.0-alpha.32",
-    "@semapps/triplestore": "0.4.0-alpha.32",
+    "@semapps/mime-types": "0.4.0-alpha.35",
+    "@semapps/triplestore": "0.4.0-alpha.35",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
     "moleculer": "^0.14.17",
     "moleculer-db": "^0.8.16",
+    "moleculer-mail": "^1.2.5",
     "moleculer-web": "^0.10.0-beta1",
     "node-sass": "^7.0.1",
     "openid-client": "^4.7.4",
@@ -24,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "67a882b414a80501533025843d2982a7da0afac2"
+  "gitHead": "495acfcae77f77273e2ef4dc1cc1192fb82e3cd0"
 }

package/services/account.js

@@ -9,7 +9,7 @@ module.exports = {
   adapter: new TripleStoreAdapter({ type: 'AuthAccount', dataset: 'settings' }),
   settings: {
     idField: '@id',
-    reservedUsernames: []
+    reservedUsernames: ['relay']
   },
   dependencies: ['triplestore'],
   actions: {
@@ -19,14 +19,14 @@ module.exports = {
 
       email = email && email.toLowerCase();
 
-      const emailExists = await ctx.call('auth.account.emailExists', { email });
+      const emailExists = !email ? false : await ctx.call('auth.account.emailExists', { email });
       if (emailExists) {
         throw new Error('email.already.exists');
       }
 
       if (username) {
-        await this.isValidUsername(ctx, username);
-      } else {
+        if (!ctx.meta.isSystemCall) await this.isValidUsername(ctx, username);
+      } else if (email) {
         // If username is not provided, find an username based on the email
         const usernameFromEmail = email.split('@')[0].toLowerCase();
         let usernameValid = false,
@@ -40,7 +40,7 @@ module.exports = {
           }
           i++;
         } while (!usernameValid);
-      }
+      } else throw new Error('you must provide at least a username or an email address');
 
       return await this._create(ctx, {
         ...rest,
@@ -187,7 +187,7 @@ module.exports = {
         throw new Error('username.already.exists');
       }
 
-      // Ensure email or username doesn't already exist
+      // Ensure username doesn't already exist
       const usernameExists = await ctx.call('auth.account.usernameExists', { username });
       if (usernameExists) {
         throw new Error('username.already.exists');

package/services/auth.oidc.js

@@ -1,5 +1,8 @@
 const urlJoin = require('url-join');
-const { Issuer, Strategy } = require('openid-client');
+const { Issuer, Strategy, custom } = require('openid-client');
+custom.setHttpOptionsDefaults({
+  timeout: 10000
+});
 const AuthSSOMixin = require('../mixins/auth.sso');
 
 const AuthOIDCService = {
@@ -21,11 +24,12 @@ const AuthOIDCService = {
   },
   async created() {
     this.passportId = 'oidc';
-    this.issuer = await Issuer.discover(this.settings.issuer);
   },
   methods: {
-    getStrategy() {
-      const client = new this.issuer.Client({
+    async getStrategy() {
+      const issuer = await Issuer.discover(this.settings.issuer);
+
+      const client = new issuer.Client({
         client_id: this.settings.clientId,
         client_secret: this.settings.clientSecret,
         redirect_uri: urlJoin(this.settings.baseUrl, 'auth'),