asmer@controller 4 years ago
parent
commit
18c080811e
4 changed files with 15 additions and 2 deletions
  1. 3 0
      index.js
  2. 2 2
      models.js
  3. 9 0
      package-lock.json
  4. 1 0
      package.json

+ 3 - 0
index.js

@@ -137,7 +137,9 @@ const upload  = require('multer')({ dest: uploadPath })
             },
             async resolve(root, {login, password}, context, info){
                 const Savable =  context.models.Savable 
+                if (!login || !password) return null;
                 const user    =  await Savable.m.User.findOne({login, password})
+                console.log(user, {login, password})
                 if (!user)
                     return null;
 
@@ -149,6 +151,7 @@ const upload  = require('multer')({ dest: uploadPath })
     console.log(printSchema(schema))
 
     const app = express();
+    app.use(require('cors')())
     app.use(express.static('public'));
     app.use('/graphql', express_graphql(jwtGQLAnon({schema, createContext: getModels, graphiql: true, secret: jwtSecret})))
 

+ 2 - 2
models.js

@@ -16,7 +16,7 @@ module.exports = async (dbName='shop-roles') => {
 
             async save(...params){
                 console.log(this)
-                let otherUserWithThisLogin = this.login && await SlicedSavable.m.User.findOne({login: this.login})
+                let otherUserWithThisLogin = this.login && await Savable.m.User.findOne({login: this.login})
                 if (this._id){
                     if (otherUserWithThisLogin && otherUserWithThisLogin._id.toString() !== this._id.toString()){
                         throw new ReferenceError(`User ${this.login} already exists`)
@@ -97,7 +97,7 @@ module.exports = async (dbName='shop-roles') => {
 
             static get defaultPermissions(){
                 return {
-                    create: ['admin'],
+                    create: ['user', u bc'admin'],
                     read: ['anon', 'user', 'admin'],
                     write: ['admin'],
                     delete: ['admin']

+ 9 - 0
package-lock.json

@@ -137,6 +137,15 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",

+ 1 - 0
package.json

@@ -18,6 +18,7 @@
   "author": "Ivan Grynkin",
   "license": "MIT",
   "dependencies": {
+    "cors": "^2.8.5",
     "express": "^4.17.1",
     "express-graphql": "^0.9.0",
     "graphql": "^14.4.2",