Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-21 15:56:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): move from ~/.nylas-k2 to ~/.nylas-mail

Browse source 
Summary:
fix(config): move from ~/.nylas-k2 to ~/.nylas-mail

fix(auth): ignore onboarding urls that aren't Nylas

feat(sig): change default signature

bump(k2)

Test Plan: manual

Reviewers: halla, juan

Reviewed By: juan

Differential Revision: https://phab.nylas.com/D3664
This commit is contained in:
Evan Morikawa 2017-01-13 12:19:42 -08:00
parent fc43bc834a
commit 45848ce3a0
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal_packages/onboarding/lib/page-authenticate.jsx
View file

@ -104,6 +104,12 @@ export default class AuthenticatePage extends React.Component {
}
webviewDidGetResponseDetails = ({httpResponseCode, originalURL}) => {
if (!originalURL.includes(IdentityStore.URLRoot)) {
// This means that some other secondarily loaded resource (like
// analytics or Linkedin, etc) got a response. We don't care about
// that.
return
}
if (httpResponseCode >= 400) {
const error = `
Could not reach Nylas to sign in. Please try again or contact

2
src/browser/main.js
View file

@ -16,7 +16,7 @@ if (typeof process.setFdLimit === 'function') {
}
const setupConfigDir = (args) => {
const defaultDirName = (args.specMode) ? '.nylas-spec' : '.nylas-k2';
const defaultDirName = (args.specMode) ? '.nylas-spec' : '.nylas-mail';
let configDirPath = path.join(app.getPath('home'), defaultDirName);
if (args.configDirPath) {

2
src/flux/stores/signature-store.es6
View file

@ -2,7 +2,7 @@ import {Utils, Actions, AccountStore} from 'nylas-exports';
import NylasStore from 'nylas-store'
import _ from 'underscore'
const DefaultSignatureText = "Sent from <a href=\"https://nylas.com/n1?ref=n1\">Nylas Mail</a>, the extensible, open source mail client.";
const DefaultSignatureText = "Sent from <a href=\"https://nylas.com/n1?ref=n1\">Nylas Mail</a>, the best free email app for work";
class SignatureStore extends NylasStore {

5
src/key-manager.es6
View file

@ -11,6 +11,11 @@ import keytar from 'keytar'
*/
class KeyManager {
constructor() {
/**
* NOTE: Old N1 includes a migration system that manually looks for
* the names of these keys. If you change them be sure that old N1 is
* fully deprecated or updated as well.
*/
this.SERVICE_NAME = "Nylas Mail";
this.KEY_NAME = "Nylas Mail Keys"
this._alreadyMigrated = new Set()