Skip to content

Instantly share code, notes, and snippets.

@adamlwgriffiths

adamlwgriffiths/diff.patch

Created November 3, 2020 03:35
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save adamlwgriffiths/6f200d52004ff296545fba255669120d to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save adamlwgriffiths/6f200d52004ff296545fba255669120d to your computer and use it in GitHub Desktop.
Download ZIP
teletype-server merge conflict
Raw
diff.patch
diff --cc lib/github-identity-provider.js
index 86b3c4f,1ae21bc..0000000
--- a/lib/github-identity-provider.js
+++ b/lib/github-identity-provider.js
@@@ -1,12 -1,10 +1,15 @@@
const {StatusCodeError} = require('request-promise-core/lib/errors')
module.exports =
++<<<<<<< HEAD:lib/github-identity-provider.js
+class GithubIdentityProvider {
+ constructor ({request, apiUrl, clientId, clientSecret, oauthToken}) {
++=======
+ class IdentityProvider {
+ constructor ({request, apiUrl, oauthToken}) {
++>>>>>>> 0ef4cf0c263b7046c624bdcf88aa598c57c25bb1:lib/identity-provider.js
this.request = request
this.apiUrl = apiUrl
- this.clientId = clientId
- this.clientSecret = clientSecret
this.oauthToken = oauthToken
}
diff --cc lib/server.js
index 9d7eae1,a830eee..0000000
--- a/lib/server.js
+++ b/lib/server.js
@@@ -106,8 -48,10 +106,15 @@@ class Server
identityProvider,
boomtownSecret: this.boomtownSecret,
fetchICEServers: async () => {
++<<<<<<< HEAD
+ return iceServerProvider.fetchICEServers()
+ }
++=======
+ const response = JSON.parse(await request.post(twilioICEServerURL))
+ return {ttl: parseInt(response.ttl), servers: response.ice_servers}
+ },
+ enableExceptionReporter: true
++>>>>>>> 0ef4cf0c263b7046c624bdcf88aa598c57c25bb1
})
return new Promise((resolve) => {
diff --cc package-lock.json
index 0d763ea,eb27c3a..0000000
--- a/package-lock.json
+++ b/package-lock.json
@@@ -269,19 -337,9 +342,22 @@@
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
"requires": {
- "delayed-stream": "1.0.0"
+ "delayed-stream": "~1.0.0"
}
},
++<<<<<<< HEAD
+ "commander": {
+ "version": "2.11.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+ "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+ },
+ "component-emitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+ "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+ },
++=======
++>>>>>>> 0ef4cf0c263b7046c624bdcf88aa598c57c25bb1
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@@ -902,14 -1016,9 +1034,14 @@@
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
"requires": {
- "invert-kv": "1.0.0"
+ "invert-kv": "^1.0.0"
}
},
+ "linked-list": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/linked-list/-/linked-list-0.1.0.tgz",
+ "integrity": "sha1-eYsP+X0bkqT9CEgPVa6k6dSdN78="
+ },
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@@ -1636,47 -1697,34 +1720,54 @@@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
++<<<<<<< HEAD
+ "sc-channel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/sc-channel/-/sc-channel-1.2.0.tgz",
+ "integrity": "sha512-M3gdq8PlKg0zWJSisWqAsMmTVxYRTpVRqw4CWAdKBgAfVKumFcTjoCV0hYu7lgUXccCtCD8Wk9VkkE+IXCxmZA==",
+ "requires": {
+ "component-emitter": "1.2.1"
+ }
+ },
+ "sc-errors": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/sc-errors/-/sc-errors-1.4.0.tgz",
+ "integrity": "sha512-h+jRWx/xRJmkPFDd0IltoTl/QJ6hAr5Y+3ZVeBQRLuWZKe+dHdf2uVwFp2OYqlLQ7GHht4y9eXG2zOf2Ik6PTw=="
+ },
+ "sc-formatter": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/sc-formatter/-/sc-formatter-3.0.2.tgz",
+ "integrity": "sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A=="
++=======
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
++>>>>>>> 0ef4cf0c263b7046c624bdcf88aa598c57c25bb1
},
"semver": {
- "version": "5.4.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
- "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
},
"send": {
- "version": "0.15.4",
- "resolved": "https://registry.npmjs.org/send/-/send-0.15.4.tgz",
- "integrity": "sha1-mF+qPihLAnPHkzZKNcZze9k5Bbk=",
- "requires": {
- "debug": "2.6.8",
- "depd": "1.1.1",
- "destroy": "1.0.4",
- "encodeurl": "1.0.1",
- "escape-html": "1.0.3",
- "etag": "1.8.1",
- "fresh": "0.5.0",
- "http-errors": "1.6.2",
- "mime": "1.3.4",
+ "version": "0.16.2",
+ "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+ "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+ "requires": {
+ "debug": "2.6.9",
+ "depd": "~1.1.2",
+ "destroy": "~1.0.4",
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "etag": "~1.8.1",
+ "fresh": "0.5.2",
+ "http-errors": "~1.6.2",
+ "mime": "1.4.1",
"ms": "2.0.0",
- "on-finished": "2.3.0",
- "range-parser": "1.2.0",
- "statuses": "1.3.1"
+ "on-finished": "~2.3.0",
+ "range-parser": "~1.2.0",
+ "statuses": "~1.4.0"
},
"dependencies": {
"debug": {
@@@ -1734,37 -1792,13 +1835,37 @@@
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
"sntp": {
- "version": "1.0.9",
- "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
- "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+ "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
"requires": {
- "hoek": "2.16.3"
+ "hoek": "4.x.x"
}
},
+ "socketcluster-client": {
+ "version": "13.0.0",
+ "resolved": "https://registry.npmjs.org/socketcluster-client/-/socketcluster-client-13.0.0.tgz",
+ "integrity": "sha512-Fdgm6j0TgdXIkVrMI2oBzjW6WL22HmGaX6Uky5I/DmhfJGAu9hoG45VnBxUf+jE+ciZHx5NHorSp00A1YMLvCw==",
+ "requires": {
+ "base-64": "0.1.0",
+ "clone": "2.1.1",
+ "component-emitter": "1.2.1",
+ "linked-list": "0.1.0",
+ "querystring": "0.2.0",
+ "sc-channel": "^1.2.0",
+ "sc-errors": "^1.4.0",
+ "sc-formatter": "^3.0.1",
+ "uuid": "3.2.1",
+ "ws": "5.1.1"
+ },
+ "dependencies": {
+ "uuid": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+ "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+ }
+ }
+ },
"spex": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/spex/-/spex-2.0.2.tgz",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment