Browse Source

Only document deprecation for now

Kevin Sawicki 8 years ago
parent
commit
5245d42d15
2 changed files with 16 additions and 9 deletions
  1. 13 0
      docs/tutorial/planned-breaking-changes.md
  2. 3 9
      lib/browser/api/session.js

+ 13 - 0
docs/tutorial/planned-breaking-changes.md

@@ -91,6 +91,19 @@ process.versions.electron
   read-only properties for consistency with the other `process.versions`
   properties set by Node.
 
+## `session`
+
+```js
+// Deprecated
+ses.setCertificateVerifyProc(function (hostname, certificate, callback) {
+  callback(true)
+})
+// Replace with
+ses.setCertificateVerifyProc(function (hostname, certificate, error, callback) {
+  callback(0)
+})
+```
+
 ## `Tray`
 
 ```js

+ 3 - 9
lib/browser/api/session.js

@@ -1,5 +1,5 @@
 const {EventEmitter} = require('events')
-const {app, deprecate} = require('electron')
+const {app} = require('electron')
 const {fromPartition, Session, Cookies} = process.atomBinding('session')
 
 // Public API.
@@ -21,15 +21,9 @@ Session.prototype._init = function () {
   app.emit('session-created', this)
 }
 
-// Remove after 2.0
 Session.prototype.setCertificateVerifyProc = function (verifyProc) {
-  if (!verifyProc) {
-    this._setCertificateVerifyProc(null)
-    return
-  }
-  if (verifyProc.length <= 3) {
-    deprecate.warn('setCertificateVerifyproc(hostname, certificate, callback)',
-      'setCertificateVerifyproc(hostname, certificate, error, callback)')
+  if (verifyProc != null && verifyProc.length <= 3) {
+    // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
     this._setCertificateVerifyProc((hostname, certificate, error, cb) => {
       verifyProc(hostname, certificate, (result) => {
         cb(result ? 0 : -2)