diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..52e69f2
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,4 @@
+{
+ "extends": "fliplet",
+ "root": true
+}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..895873f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.history
diff --git a/backup/README.md b/backup/README.md
deleted file mode 100644
index b17a6ab..0000000
--- a/backup/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# App Submission Widget
-
-Component to capture App data for App Stores submission
diff --git a/backup/build.html b/backup/build.html
deleted file mode 100644
index 87c50ae..0000000
--- a/backup/build.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- {{#if username}}
-
Hi {{username}}!
-
It worked
- {{else}}
-
This is the output of your widget
-
Try saving your username on the left hand side and see what happens!
- {{/if}}
-
',
- ''
- ].join(''));
-});
-
-$('[data-create]').click(function (event) {
- event.preventDefault();
-
- hideForm();
-
- Fliplet.App.Submissions.create({
- platform: prompt('Platform', 'ios')
- }).then(function () {
- loadSubmissions();
- }).catch(function (err) {
- alert(err.responseJSON.message);
- });
-});
-
-$('[data-submissions]').change(function () {
- var id = $(this).val();
-
- hideForm();
-
- if (!id) {
- return; // you didn't select a submission
- }
-
- Fliplet.App.Submissions.getById(id).then(function (submission) {
- currentSubmission = submission;
- fillForm();
- });
-});
-
-$('input[type="file"]').change(function () {
- var formData = new FormData();
- var files = this.files;
- var $field = $(this);
- var fieldName = $field.attr('name');
- var $message = $field.parent().find('.message');
- var currentFilesCount = $field.parent().find('.files li').length;
- var max = parseInt($field.data('max') || 99);
-
- $message.removeClass('hidden');
-
- if (currentFilesCount >= max) {
- event.preventDefault();
- $message.text('You can only upload ' + max + ' files for this field.');
- return;
- }
-
- for (var i = 0; i < files.length; i++) {
- formData.append(fieldName, files.item(i));
- }
-
- $field.val('');
- $message.text('Uploading ' + (files.length+1) + ' files...');
-
- Fliplet.Media.Files.upload({
- data: formData
- }).then(function (files) {
- $message.addClass('hidden');
- $message.text('');
-
- files.forEach(function (file) {
- addFile($field, file);
- });
- }).catch(function (err) {
- $message.html(err.message || err.description || err);
- });
-});
-
-function addFile($field, file) {
- var $ul = $field.parent().find('.files');
- var $li = $([
- '',
- 'Delete ',
- ' '
- ].join(''));
-
- uploadedFiles[file.id] = file;
- $ul.append($li);
-}
-
-$('.files').on('click', '[data-delete]', function (event) {
- event.preventDefault();
- var $li = $(this).parent();
- $li.remove();
-
- Fliplet.Media.Files.delete($li.data('id'));
-});
-
-$('input[name=submissionType]').change(function(){
- //submissionType = this.value;
- showForm();
-});
-
-function hideForm() {
- currentSubmission = undefined;
- $form.addClass('hidden');
- $form[0].reset();
- $form.find('.files').html('');
-}
-
-function showForm() {
- $form.removeClass('hidden');
- $form.find('.ios-only, .android-only, .windows-only, .appstore, .enterprise').addClass('hidden');
-
- submissionType = $('input:radio[name=submissionType]:checked').val()
- //alert($('input:radio[name=submissionType]').filter(":checked").val());
-
- $(".appName-help-block").html("There is a limit of 50 characters, however we recommend keeping this to 23");
- $('input[name="appName"]').attr('maxlength', 50);
-
- if (currentSubmission.platform === "android"){
- $(".appName-help-block").html("There is a limit of 30 characters");
- $('input[name="appName"]').attr('maxlength', 30);
- }
-
- $form.find('.' + currentSubmission.platform + '-only').removeClass('hidden');
- $form.find('.' + submissionType).removeClass('hidden');
-}
-
-function fillForm() {
- _.forIn(currentSubmission.data, function (value, key) {
- var $element = $form.find('[name="' + key + '"]');
-
- if (key === 'submissionType' && value !== '') {
- submissionType = value;
- }
-
- if ($element.attr('type') === 'file') {
- if (Array.isArray(value)) {
- value.forEach(function (file) {
- addFile($element, file);
- });
- } else {
- console.warn('Files for field ' + key + ' are expected to be an array.')
- }
-
- return;
- }
-
- if ($element.attr('type') === 'radio') {
- $form.find('[name="' + key + '"][value="' + value + '"]').prop("checked", true);
- return;
- }
-
- $element.val(value);
- });
-
- $form.find('[data-save]').toggleClass('hidden', ['started', 'failed'].indexOf(currentSubmission.status) === -1);
- $form.find('[data-build]').toggleClass('hidden', ['started', 'failed'].indexOf(currentSubmission.status) === -1);
-
- showForm();
-}
-
-function loadSubmissions() {
- Fliplet.App.Submissions.get().then(function (submissions) {
- $submissions.html('');
-
- if (!submissions.length) {
- return $submissions.append('No submissions found ');
- }
-
- $submissions.append('-- Select a submission ');
-
- submissions.forEach(function (s) {
- $submissions.append('#' + s.id + ' ' + s.platform + ' (' + s.status + ') ');
- });
- }).catch(function (err) {
- alert(err.responseJSON.message);
- });
-}
-
-loadSubmissions();
-
-$form.find('[data-build]').click(function (event) {
- event.preventDefault();
-
- if (validateForm(currentSubmission.platform, submissionType)){
- $('.has-errors:eq(0) input:eq(0)').focus()
- return;
- }
-
- saveForm().then(function () {
- return Fliplet.App.Submissions.build(currentSubmission.id);
- }).then(function () {
- hideForm();
- loadSubmissions();
- }).catch(function (err) {
- alert(err.responseJSON.message);
- });
-});
-
-function saveForm() {
- var data = $form.serializeArray().reduce(function(obj, item) {
- obj[item.name] = item.value;
- return obj;
- }, {});
-
- $('input[type="file"]').each(function () {
- var $el = $(this);
- var $files = $el.parent().find('.files li');
- var filesList = [];
-
- $files.each(function () {
- filesList.push(uploadedFiles[$(this).data('id')]);
- });
-
- data[$el.attr('name')] = filesList;
- });
-
- return Fliplet.App.Submissions.update(currentSubmission.id, data).catch(function (err) {
- alert(err.responseJSON.message);
- });
-}
-
-$form.submit(function (event) {
- event.preventDefault();
-
- if (validateForm(currentSubmission.platform, submissionType)){
- $('.has-errors:eq(0) input:eq(0)').focus();
- return;
- }
-
- saveForm().then(function () {
- hideForm();
- loadSubmissions();
- });
-});
-
-// Fired from Fliplet Studio when the external save button is clicked
-Fliplet.Widget.onSaveRequest(function () {
- $form.submit();
-});
\ No newline at end of file
diff --git a/backup/tests/index.js b/backup/tests/index.js
deleted file mode 100644
index edcfc87..0000000
--- a/backup/tests/index.js
+++ /dev/null
@@ -1,69 +0,0 @@
-describe('WHEN start component', function() {
- this.timeout(10000);
- describe('Interface', function() {
- it('should have empty username', function(done) {
- interfaceBrowser
- .evaluate(function (selector) {
- return document.querySelector(selector).value;
- }, '#username')
- .then(function(username) {
- expect(username).to.equal('');
- done();
- })
- });
- });
-
- describe('Build', function() {
- it('should have message to configure widget', function(done) {
- const selector = `${buildSelector} h3`;
- buildBrowser
- .evaluate(function (selector) {
- return document.querySelector(selector).textContent;
- }, selector)
- .then(function(message) {
- expect(message).to.equal('This is the output of your widget');
- done();
- });
- });
- });
-});
-
-describe('WHEN changing the username', function () {
- this.timeout(10000);
- const username = casual.username;
-
- before(function (done) {
- interfaceBrowser
- .type('#username')
- .type('#username', username)
- .save() // Use this method to save your widget instance
- .then(done)
- });
-
- describe('Interface', function() {
- it('should have new username on the input', function(done) {
- interfaceBrowser
- .evaluate(function (selector) {
- return document.querySelector(selector).value;
- }, '#username')
- .then(function(inputUsername) {
- expect(inputUsername).to.equal(username);
- done();
- })
- });
- });
-
- describe('Build', function() {
- it('should have message with name', function(done) {
- const selector = `${buildSelector} h2`;
- buildBrowser
- .evaluate(function (selector) {
- return document.querySelector(selector).textContent;
- }, selector)
- .then(function(message) {
- expect(message).to.equal(`Hi ${username}!`);
- done();
- });
- });
- });
-});
diff --git a/backup/widget.json b/backup/widget.json
deleted file mode 100644
index 17fe264..0000000
--- a/backup/widget.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "name": "App Submissions",
- "package": "com.fliplet.app-submissions",
- "version": "1.0.0",
- "icon": "img/icon.png",
- "tags": [],
- "provider_only": true,
- "references": [],
- "html_tag": "div",
- "interface": {
- "dependencies": [
- "lodash",
- "fliplet-app-submissions",
- "fliplet-media",
- "fliplet-studio-ui",
- "bootstrap"
- ],
- "assets": [
- "css/interface.css",
- "js/formValidation.js",
- "js/interface.js"
- ]
- },
- "build": {
- "dependencies": [],
- "assets": []
- }
-}
\ No newline at end of file
diff --git a/css/interface.css b/css/interface.css
index ea36cba..2d2ab12 100644
--- a/css/interface.css
+++ b/css/interface.css
@@ -6,6 +6,10 @@
opacity: 0.3;
}
+.appStore-login-2fa-devices,
+.appStore-login-2fa-waiting,
+.appStore-login-2fa-code,
+.appStore-2fa-sms,
.appStore-logged-in,
.appStore-teams,
.appStore-more-options,
@@ -14,6 +18,10 @@
.appStore-generate-file,
.appStore-generate-file-success,
.appStore-upload-file,
+.enterprise-login-2fa-devices,
+.enterprise-login-2fa-waiting,
+.enterprise-login-2fa-code,
+.enterprise-2fa-sms,
.enterprise-manual-details,
.enterprise-logged-in,
.enterprise-teams,
@@ -22,7 +30,9 @@
.enterprise-previous-file-success,
.enterprise-generate-file,
.enterprise-generate-file-success,
-.enterprise-upload-file {
+.enterprise-upload-file,
+.select-proxy-display[for="fl-store-teams"],
+.select-proxy-display[for="fl-ent-teams"] {
display: none;
}
@@ -60,6 +70,10 @@
padding-top: 4px;
}
+.bs-actionsbox .btn-group button {
+ margin-top: 0;
+}
+
/*@media (min-width: 640px) {
.form-horizontal .control-label {
padding-top: 12px;
@@ -92,6 +106,11 @@
border-color: #a94442;
}
+.setting-app-icon.default.has-error,
+.setting-splash-screen.default.has-error {
+ border-color: #a94442;
+}
+
.panel.required-fill {
-webkit-box-shadow: 0 1px 1px rgba(169, 68, 66, 0.30);
box-shadow: 0 1px 1px rgba(169, 68, 66, 0.30);
@@ -105,6 +124,10 @@
border-color: #a94442;
}
+.panel-default.required-fill + .panel-default:not(.required-fill) {
+ margin-top: 0;
+}
+
.app-details-error,
.app-details-warning {
display: none;
@@ -130,15 +153,31 @@
margin: 0;
}
-.nav-tabs>li>a span {
+.nav-tabs > li > a span {
display: block;
text-align: center;
}
-.nav-tabs>li>a span:first-child {
+.nav-tabs > li > a span:first-child {
font-weight: bold;
}
+.btn-group-vertical .btn input[type="radio"] {
+ display: block;
+ position: absolute;
+ top: 0;
+ left: 0;
+ -webkit-appearance: none;
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ cursor: pointer;
+}
+
+.btn-group-vertical .btn {
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
/* End Override */
@@ -149,7 +188,7 @@ h3 {
color: #14505E;
}
-body>h3,
+body > h3,
.app-status h3 {
margin-top: 0;
}
@@ -195,6 +234,21 @@ h3 small {
margin-top: -5px;
}
+.bundleId-ast-text,
+.bundleId-ent-text,
+.bundleId-uns-text {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.bundleId-ast-text:before,
+.bundleId-ent-text:before,
+.bundleId-uns-text:before {
+ content: '';
+ display: block;
+}
+
.fl-bundleId-holder,
.fl-price-holder {
height: 44px;
@@ -232,9 +286,9 @@ h3 small {
.bootstrap-select .btn-default:active:focus,
.bootstrap-select .btn-default:active,
.bootstrap-select .btn-default:focus,
-.open>.dropdown-toggle.btn-default,
-.open>.dropdown-toggle.btn-default:focus,
-.open>.dropdown-toggle.btn-default:hover {
+.open > .dropdown-toggle.btn-default,
+.open > .dropdown-toggle.btn-default:focus,
+.open > .dropdown-toggle.btn-default:hover {
background-color: transparent;
outline: none !important;
border-color: #00abd1;
@@ -258,9 +312,6 @@ h3 small {
.save-appStore-progress,
.save-enterprise-progress,
.save-unsigned-progress,
-.save-appStore-request,
-.save-enterprise-request,
-.save-unsigned-request,
.save-push-progress {
opacity: 0;
-webkit-transition: opacity 0.25s ease;
@@ -270,9 +321,6 @@ h3 small {
.save-appStore-progress.saved,
.save-enterprise-progress.saved,
.save-unsigned-progress.saved,
-.save-appStore-request.saved,
-.save-enterprise-request.saved,
-.save-unsigned-request.saved,
.save-push-progress.saved {
opacity: 1;
}
@@ -348,6 +396,7 @@ h3 small {
.app-build-status table tbody td {
height: 60px;
+ border: none;
}
.app-build-status .app-build-holder {
@@ -441,24 +490,22 @@ h3 small {
.indented-area {
background-color: #f2f6f7;
border-radius: 6px;
- padding: 15px 15px 1px 15px;
+ padding: 15px 15px 5px;
margin-top: 10px;
}
-.hidden-area {
- display: none;
- background-color: #f2f6f7;
- border-radius: 6px;
- padding: 15px 15px 1px 15px;
+.alert-inset {
margin-top: 10px;
margin-bottom: 20px;
margin-left: 25px;
}
-.hidden-area.warning {
- color: #8a6d3b;
- background-color: #fcf8e3;
- border: 1px solid #faebcc;
+.alert > p, .alert > ul {
+ margin-bottom: 10px;
+}
+
+.alert > p:fist-child:last-child, .alert > ul:fist-child:last-child {
+ margin-bottom: 0;
}
.radio.radio-icon ~ .radio.radio-icon,
@@ -483,4 +530,27 @@ h3 small {
.screenshot-previews img {
border: 1px solid #F0F0F0;
+}
+
+.screenshot-previews .alert {
+ margin-bottom: 0;
+}
+
+.analytics-success {
+ color: rgb(106, 168, 79);
+}
+
+.tooltip-inner {
+ max-width: 320px;
+ word-wrap: break-word;
+}
+
+.centered-vertically {
+ align-items: center;
+ display: flex;
+}
+
+#fl-push-testResultMessage {
+ padding: 10px 0;
+ display: none;
}
\ No newline at end of file
diff --git a/img/app-icon.png b/img/app-icon.png
index 768e0e6..68ddea2 100644
Binary files a/img/app-icon.png and b/img/app-icon.png differ
diff --git a/interface.html b/interface.html
index a3580bf..d1b3673 100644
--- a/interface.html
+++ b/interface.html
@@ -1,9 +1,5 @@
-iOS distribution settings
-Before your app can be distributed, we need some additional information. Select the tab(s) that match how you want to distribute your app and add the data required. Once you submit your information and assets, we will process your request and distribute
- your app in your prefered ways within 2 business days. Apple may take up to 5 days to review apps.Apple's official recommendations .
-
-
-
3 - App technical details (Required)
-
-
-
We will need some technical information now, such as your developer account login details. Don't worry, these details will be safe with us. We need them in order to publish your app for you.
-
Apple developer account details and distribution certificates
-
-
-
-
If you do not know what the developer account login details are please contact your organization's IT team.
-
-
-
Note Two-Factor Authentication is not currently supported.
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
This value needs to be unique and the structure must be com.organizationName .appName .
-
-
-
4 - App submission details (Required) 3 - App submission details (Required)
@@ -784,7 +582,7 @@
Last Name
@@ -793,7 +591,7 @@ Address line 1
@@ -819,7 +617,7 @@ Post Code
@@ -988,7 +786,6 @@ Zimbabwe
-- Select a country
@@ -998,9 +795,9 @@ Phone Number
-
+
-
The phone number needs to include the area code. (Eg.: +44)
+
The phone number needs to include the area code. (e.g. +44)
@@ -1008,7 +805,26 @@
Email Address
+
+ Release Configuration How will the app be submitted to review.
+
@@ -1019,7 +835,7 @@ Reviewer Notes First Name
@@ -1028,7 +844,7 @@ Reviewer Notes Last Name
@@ -1037,7 +853,7 @@ Reviewer Notes Email Address
@@ -1046,8 +862,8 @@ Reviewer Notes Phone Number
-
-
The phone number needs to include the area code. (Eg.: +44)
+
+
The phone number needs to include the area code. (e.g. +44)
Reviewer Notes Optional
-
+
+ Important warning: If the reviewer notes are incomplete or insufficient, Apple may reject the app which will cause a delay in the app launch. We have automatically loaded a suggested template in the reviewer notes. Please make sure to customize this template, or contact the Customer Success team for help.
+
+
+
+
+
+
+
4 - App analytics (Optional)
+
+
+
+
Fliplet analytics
+
Status: Disabled
+
Fliplet’s analytics records usage data, including the user’s login if the app has a login, and displays the data within Fliplet Studio. Learn more about Fliplet Analytics.
+
To enable in Fliplet Studio visit App Settings > Add-ons tab > Fliplet Analytics
+
+
+
+
Firebase analytics
+
Status: Disabled
+
Google Firebase offers analytics via Google Analytics and other features. Learn more about Firebase.
+
To enable:
+
+ Login to a Firebase account (any existing Google Account can be used).
+ Create a new app.
+ Select Apple.
+ Download your Firebase plist file.
+ Upload it by clicking the button below:
+
+
+
+
+
+
+
+
+
+
5 - App technical details (Required)
+
+
+
We will need some technical information now, such as your developer account login details. Don't worry, these details will be safe with us. We need them in order to publish your app for you.
+
Apple developer account details and distribution certificates
+
+
+
+
If you do not know what the developer account login details are please contact your organization's IT team.
+
+
+
If you have ad blockers enabled for your browser, please make sure they are disabled before continuing with login and team selection.
+
+
+
+
+
+
+
+
Your Apple ID is protected with two-step verification.
+
+
+
+
+
+
+
Apple has sent a verification code to your device(s) from one of Fliplet's server locations . Please enter the code to continue.
+
Note: If you don't receive the code, please check your Apple account settings.
+
+
+
+
+
+
+
+
+
App-specific password
+
+
+
App version and bundle ID
+
+
+
Reviewer Notes Your progress was saved successfully!
+ {{#if appFeatures.appStores.apple.public }}
Submit your information when you are ready!
Request App
-
Your request was sent successfully!
+ {{else}}
+
Upgrade to an app plan to request your app to be published.
+
Upgrade to publish
+ {{/if}}
Reviewer Notes Complete this section to receive an app signed with your Apple Developer Enterprise account to distribute in-house apps to your employees.
-
@@ -1412,7 +1603,7 @@ App version and bundle ID Unsigned apps will need to be signed before they can be distributed. If you would like Fliplet to sign the app for you, please request an app via the "App Store" or "Enterprise" tabs above. If you request an unsigned app file, you will need a Mac
or software that can resign this app for you. For more information about signing apps, please see this Apple Developer article .
-
-
After saving, send notifications from the "Send push notifications" tab on the left.
+
After saving, send notifications from the "Send notifications" button on the Publish screen.
Save
Your data saved successfully!
App submission status
\{{#if fileUrl}}
\{{/if}}
+ \{{#if isAdmin}}
\{{#if debugFileUrl}}
- \{{/if}}
+
+ \{{else}}
+ Admin Debug app not available
+ \{{/if}}
+ \{{/if}}
\{{#if updatedAt}}App submission status
-
+
\{{#if fileUrl}}
\{{/if}}
+ \{{#if isAdmin}}
\{{#if debugFileUrl}}
- \{{/if}}
+
+ \{{else}}
+ Admin Debug app not available
+ \{{/if}}
+ \{{/if}}
\{{#if updatedAt}}App ready for testing
+ \{{testingMessage}}
\{{/if}}
\{{#if tested}}
@@ -1644,13 +1915,26 @@ App submission status
-
\{{#if updatedAt}}There was an error building your app
+ \{{#if message}}
+ \{{{message}}}
+ \{{else}}
+ There was an error building your app
+ \{{/if}}
+
+ \{{/if}}
+ \{{#if gracefullyFailed }}
+
+
+
+
+ \{{#if updatedAt}}\{{{message}}}
- \{{/if}} \{{#if cancelled}}
+ \{{/if}}
+ \{{#if cancelled}}
@@ -1660,11 +1944,11 @@ App submission status
-
+ \{{versionNumber}}
\{{/each}}
-
\ No newline at end of file
+
diff --git a/js/apnValidation.js b/js/apnValidation.js
new file mode 100644
index 0000000..f8cf3d6
--- /dev/null
+++ b/js/apnValidation.js
@@ -0,0 +1,123 @@
+
+const authKeyInput = document.getElementById('fl-push-authKey');
+const keyIdInput = document.getElementById('fl-push-keyId');
+const teamIdInput = document.getElementById('fl-store-teams');
+const bundleIdInput = document.getElementById('fl-store-bundleId');
+
+const testConfigButton = document.getElementById('fl-push-testConfigButton');
+const testResultMessage = document.getElementById('fl-push-testResultMessage');
+
+const MESSAGE = {
+ SUCCESS: 'Success! Push notifications have been configured successfully.',
+ ERROR_INPUT: 'Error - notifications have not beeen configured, please check the details you have entered and try again',
+ ERROR_SERVER: 'Error - notifications have not been configured correctly. Please review https://help.fliplet.com or contact support.',
+ ERROR_NO_KEY: 'Authentication key is missing, please check provided information and try again',
+ ERROR_NO_KEYID: 'Key ID is missing, please check provided information and try again',
+ ERROR_NO_TEAMID: 'Developer team is missing, please check selected team in section: App Store > 5 - App technical details , and try again',
+ ERROR_NO_BUNDLEID: 'Bundle ID is missing, please check Bundle ID: App Store > 5 - App technical details , and try again',
+ ERROR_SERVICE: 'Error - There is currently an issue relating to APNs services. Please try again later.'
+};
+
+const mappedMessages = {
+ BadDeviceToken: MESSAGE.SUCCESS,
+ ExpiredProviderToken: MESSAGE.ERROR_INPUT,
+ InvalidProviderToken: MESSAGE.ERROR_INPUT,
+ TooManyRequests: MESSAGE.ERROR_SERVICE,
+ InternalServerError: MESSAGE.ERROR_SERVICE,
+ ServiceUnavailable: MESSAGE.ERROR_SERVICE,
+ Shutdown: MESSAGE.ERROR_SERVICE
+};
+
+const renderResultMessage = (resultMessage) => {
+ if (!resultMessage) {
+ testResultMessage.style.display = 'none';
+ testResultMessage.innerHTML = '';
+
+ return;
+ }
+
+ testResultMessage.style.display = 'block';
+ testResultMessage.innerHTML = resultMessage;
+
+ const success = resultMessage === MESSAGE.SUCCESS;
+
+ testResultMessage.classList.toggle('text-success', success);
+ testResultMessage.classList.toggle('text-danger', !success);
+};
+
+const validateApnKey = async({ apnAuthKey, apnKeyId, apnTeamId, apnTopic }) => {
+ const currentAppId = Fliplet.Env.get('appId');
+
+ try {
+ const response = await fetch(`/v1/apps/${currentAppId}/notifications/validate-apns-config`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({ apnAuthKey, apnKeyId, apnTeamId, apnTopic })
+ });
+
+ if (response.status === 200) {
+ const { 0: { message: { 0: { errorMsg } } } } = await (response.json());
+
+ const message = mappedMessages[errorMsg];
+
+ if (message) {
+ return message;
+ }
+ }
+
+ return MESSAGE.ERROR_SERVER;
+ } catch (error) {
+ // eslint-disable-next-line no-console
+ console.error('Failed to send message:', error);
+
+ return MESSAGE.ERROR;
+ }
+};
+
+testConfigButton.addEventListener('click', async() => {
+ renderResultMessage(null);
+
+ let resultMessage = null;
+
+ const apnAuthKey = authKeyInput.value;
+ const apnKeyId = keyIdInput.value;
+ const apnTeamId = teamIdInput.value;
+ const apnTopic = bundleIdInput.value;
+
+
+ if (!apnAuthKey) {
+ resultMessage = MESSAGE.ERROR_NO_KEY;
+ } else if (!apnKeyId) {
+ resultMessage = MESSAGE.ERROR_NO_KEYID;
+ } else if (!apnTeamId) {
+ resultMessage = MESSAGE.ERROR_NO_TEAMID;
+ } else if (!apnTopic) {
+ resultMessage = MESSAGE.ERROR_NO_BUNDLEID;
+ } else {
+ resultMessage = await validateApnKey({ apnAuthKey, apnKeyId, apnTeamId, apnTopic });
+ }
+
+ renderResultMessage(resultMessage);
+});
+
+const clearMessage = () => {
+ renderResultMessage(null);
+};
+
+authKeyInput.addEventListener('input', clearMessage);
+keyIdInput.addEventListener('input', clearMessage);
+teamIdInput.addEventListener('input', clearMessage);
+
+function goToTechDetails() {
+ const appStoreTab = document.querySelector('[href="#appstore-tab"]');
+ const techDetailsDropdownAnchor = document.querySelector('[href="#appStoreTech"]');
+ const techDetailsDropdown = document.getElementById('appStoreTech');
+
+ appStoreTab.click();
+
+ if (techDetailsDropdown.getAttribute('aria-expanded') !== 'true') {
+ techDetailsDropdownAnchor.click();
+ }
+}
diff --git a/js/interface.js b/js/interface.js
index 512528e..46db910 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -1,5 +1,8 @@
var widgetId = Fliplet.Widget.getDefaultId();
var widgetData = Fliplet.Widget.getData(widgetId) || {};
+var organizationIsPaying = widgetData.organizationIsPaying;
+var mustReviewTos = widgetData.mustReviewTos;
+var storeFeatures = _.get(widgetData, 'appFeatures.appStores.apple', {});
var appName = '';
var organizationName = '';
var appIcon = '';
@@ -11,50 +14,176 @@ var appStoreCertificateCreated = false;
var appStoreCertificateReplaced = false;
var enterpriseCertificateCreated = false;
var enterpriseCertificateReplaced = false;
-var appStorePreviousCredential = undefined;
-var appStoreFileField = undefined;
-var appStoreTeamId = undefined;
-var enterprisePreviousCredential = undefined;
-var enterpriseFileField = undefined;
-var enterpriseFileFieldManual = undefined;
-var enterpriseFileProvisionFieldManual = undefined;
-var enterpriseTeamId = undefined;
+var previousAppStoreSubmission = {};
+var previousEnterpriseStoreSubmission = {};
+var appStorePreviousCredential;
+var appStoreFileField;
+var defaultReleaseNotes;
+var defaultReviewNotes;
+var appStoreFirebaseFileField;
+var enterpriseFirebaseFileField;
+var unsignedFirebaseFileField;
+var enterprisePreviousCredential;
+var enterpriseFileField;
+var enterpriseFileFieldManual;
+var enterpriseFileProvisionFieldManual;
+var enterpriseTeamId;
var enterpriseManual = false;
+var appStoreSubmissionInStore = false;
var appStoreSubmission = {};
var enterpriseSubmission = {};
var unsignedSubmission = {};
var notificationSettings = {};
var appInfo;
+var demoUser;
+var userInput = false;
+var autoFill = 0;
var statusTableTemplate = $('#status-table-template').html();
var $statusAppStoreTableElement = $('.app-build-appstore-status-holder');
var $statusEnterpriseTableElement = $('.app-build-enterprise-status-holder');
var $statusUnsignedTableElement = $('.app-build-unsigned-status-holder');
+var $pushConfigurationSaveButton = $('#pushConfiguration .btn-primary');
var initLoad;
-var organizationID = Fliplet.Env.get('organizationId');
+var organizationId = Fliplet.Env.get('organizationId');
var userInfo;
var hasFolders = false;
-var screenShotsMobile = [];
-var screenShotsTablet = [];
-var haveScreenshots = false;
+// Each collection requirement will need to match at least one of the width/height sizes
+var screenshotRequirements = [
+ {
+ type: 'mobile',
+ name: 'iPhone 5.5-inch',
+ sizes: [[1242, 2208]],
+ screenshots: []
+ },
+ {
+ type: 'mobilex',
+ name: 'iPhone 6.5-inch',
+ sizes: [[1242, 2688]],
+ screenshots: []
+ },
+ {
+ type: 'tablet',
+ name: 'iPad Pro 12.9-inch',
+ sizes: [[2048, 2732], [2732, 2048]],
+ screenshots: []
+ }
+];
+var hasAllScreenshots = false;
var screenshotValidationNotRequired = false;
+var spinner = '-- Select a team '];
+
+ appStoreTeams.forEach(function(team) {
+ options.push('' + team.name + ' - ' + team.teamId + ' ');
+ });
+ $('#fl-load-store-teams').hide();
+ $('#fl-store-teams').html(options.join('')).parent().show();
+
+ appStoreLoggedIn = true;
+
+ var teamId = $('#fl-store-teams').val();
+ var teamName = teamId ? $('#fl-store-teams').find(':selected').data('team-name') : '';
+
+ if (teamId) {
+ $('.appStore-more-options').addClass('show');
+ } else {
+ $('.appStore-more-options').removeClass('show');
+ }
+
+ return refreshAppStoreOptions(devEmail, teamId, teamName);
+ });
+}
+
+function appStoreTeamSetup(email, loadTeams) {
+ var load = Promise.resolve();
+
+ if (loadTeams) {
+ load = loadAppStoreTeams(email);
+ }
+ return load.then(function() {
+ toggleLoginForm('app-store', 'logged-in', { email: email });
+ });
+}
+
+function loadEnterpriseData() {
$('#enterpriseConfiguration [name]').each(function(i, el) {
- var name = $(el).attr("name");
+ var name = $(el).attr('name');
/* ADD BUNDLE ID */
- if (name === "fl-ent-bundleId" && typeof enterpriseSubmission.data[name] === "undefined") {
- createBundleID(organizationName.toCamelCase(), appName.toCamelCase()).then(function(response) {
+ if (name === 'fl-ent-bundleId' && typeof enterpriseSubmission.data[name] === 'undefined') {
+ var bundleId = 'com.' + _.camelCase(organizationName) + '.' + _.camelCase(appName);
+
+ createBundleId(bundleId).then(function(response) {
if (response.resultCount === 0) {
- $('.bundleId-ent-text').html('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase());
- $('[name="' + name + '"]').val('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase());
+ $('.bundleId-ent-text').html(bundleId);
+ $('[name="' + name + '"]').val(bundleId);
} else {
- $('.bundleId-ent-text').html('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase() + (response.resultCount + 1));
- $('[name="' + name + '"]').val('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase() + (response.resultCount + 1));
+ $('.bundleId-ent-text').html(bundleId + (response.resultCount + 1));
+ $('[name="' + name + '"]').val(bundleId + (response.resultCount + 1));
}
});
+
return;
}
- if (name === "fl-ent-bundleId" && typeof enterpriseSubmission.data[name] !== "undefined") {
+
+ if (name === 'fl-ent-bundleId' && typeof enterpriseSubmission.data[name] !== 'undefined') {
$('.bundleId-ent-text').html(enterpriseSubmission.data[name]);
$('[name="' + name + '"]').val(enterpriseSubmission.data[name]);
+
return;
}
- if (name === "fl-ent-versionNumber") {
+
+ if (name === 'fl-ent-versionNumber') {
if (typeof enterpriseSubmission.data[name] !== 'undefined' && enterpriseSubmission.data[name] !== '') {
$('[name="' + name + '"]').val(enterpriseSubmission.data[name]);
} else if (typeof enterpriseSubmission.previousResults !== 'undefined' && typeof enterpriseSubmission.previousResults.versionNumber !== 'undefined' && enterpriseSubmission.previousResults.versionNumber !== '') {
$('[name="' + name + '"]').val(enterpriseSubmission.previousResults.versionNumber);
+ $('[name="fl-ent-versionNumber"]').data('validation-version-number', enterpriseSubmission.previousResults.versionNumber);
} else {
$('[name="' + name + '"]').val('1.0.0');
}
+
return;
}
- if (name === "fl-ent-distribution") {
+ if (name === 'fl-ent-distribution') {
if (enterpriseSubmission.data[name]) {
$('[name="' + name + '"][value="' + enterpriseSubmission.data[name] + '"]').prop('checked', true).trigger('change');
} else {
$('[name="' + name + '"][value="generate-file"]').prop('checked', true).trigger('change');
}
+
return;
}
- if (name === "fl-ent-certificate-manual-details" || name === "fl-ent-mobileprovision-manual-details") {
+ if (name === 'fl-ent-certificate-manual-details' || name === 'fl-ent-mobileprovision-manual-details') {
return;
}
- $('[name="' + name + '"]').val((typeof enterpriseSubmission.data[name] !== "undefined") ? enterpriseSubmission.data[name] : '');
+ // Firebase
+ if (name === 'fl-ent-firebase') {
+ return;
+ }
+
+ $('[name="' + name + '"]').val((typeof enterpriseSubmission.data[name] !== 'undefined') ? enterpriseSubmission.data[name] : '');
});
if (appIcon) {
if (appSettings.splashScreen && appSettings.splashScreen.size && (appSettings.splashScreen.size[0] && appSettings.splashScreen.size[1]) < 2732) {
$('.app-details-ent .app-splash-screen').addClass('has-warning');
}
+
if (appSettings.iconData && appSettings.iconData.size && (appSettings.iconData.size[0] && appSettings.iconData.size[1]) < 1024) {
$('.app-details-ent .app-icon-name').addClass('has-error');
}
+
allAppData.push('enterprise');
} else {
$('.app-details-ent').addClass('required-fill');
@@ -255,56 +601,143 @@ function loadEnterpriseData() {
if (!appIcon) {
$('.app-details-ent .app-icon-name').addClass('has-error');
}
+
if (appSettings.splashScreen && appSettings.splashScreen.size && (appSettings.splashScreen.size[0] && appSettings.splashScreen.size[1]) < 2732) {
$('.app-details-ent .app-splash-screen').addClass('has-warning');
}
}
+
+ // Try to automatically login
+ if (enterpriseSubmission.data && enterpriseSubmission.data['fl-credentials']) {
+ // Submission data contains credential key
+ toggleLoginForm('enterprise', 'logging-in');
+
+ getCredential(enterpriseSubmission.data['fl-credentials']).then(function(credential) {
+ if (!credential || !credential.email) {
+ toggleLoginForm('enterprise', 'login');
+
+ return;
+ }
+
+ return enterpriseTeamSetup(credential.email);
+ }).catch(function() {
+ // Allow users to manually log in if an error is encountered
+ toggleLoginForm('enterprise', 'login');
+ });
+ }
}
-function loadUnsignedData() {
+function clearEnterpriseCredentials() {
+ return setCredentials(enterpriseSubmission.id, {
+ email: null,
+ password: null,
+ teamId: null
+ }, false)
+ .then(function() {
+ enterpriseLoggedIn = false;
+ toggleLoginForm('enterprise', 'login');
+ });
+}
+
+function loadEnterpriseTeams(devEmail) {
+ return getTeams(enterpriseSubmission.id, false)
+ .then(function(teams) {
+ var enterpriseTeams = _.filter(teams, function(team) {
+ return team.type === 'In-House';
+ });
+ var options = ['-- Select a team '];
+
+ enterpriseTeams.forEach(function(team) {
+ options.push('' + team.name + ' - ' + team.teamId + ' ');
+ });
+ $('#fl-load-ent-teams').hide();
+ $('#fl-ent-teams').html(options.join('')).parent().show();
+
+ enterpriseLoggedIn = true;
+ var teamId = $('#fl-ent-teams').val();
+ var teamName = teamId ? $('#fl-ent-teams').find(':selected').data('team-name') : '';
+
+ if (teamId) {
+ $('.enterprise-more-options').addClass('show');
+ } else {
+ $('.enterprise-more-options').removeClass('show');
+ }
+
+ return refreshAppEnterpriseOptions(devEmail, teamId, teamName);
+ });
+}
+
+function enterpriseTeamSetup(email, loadTeams) {
+ var load = Promise.resolve();
+
+ if (loadTeams) {
+ load = loadEnterpriseTeams(email);
+ }
+
+ return load.then(function() {
+ toggleLoginForm('enterprise', 'logged-in', { email: email });
+ });
+}
+
+function loadUnsignedData() {
$('#unsignedConfiguration [name]').each(function(i, el) {
- var name = $(el).attr("name");
+ var name = $(el).attr('name');
/* ADD BUNDLE ID */
- if (name === "fl-uns-bundleId" && typeof unsignedSubmission.data[name] === "undefined") {
- createBundleID(organizationName.toCamelCase(), appName.toCamelCase()).then(function(response) {
+ if (name === 'fl-uns-bundleId' && typeof unsignedSubmission.data[name] === 'undefined') {
+ var bundleId = 'com.' + _.camelCase(organizationName) + '.' + _.camelCase(appName);
+
+ createBundleId(bundleId).then(function(response) {
if (response.resultCount === 0) {
- $('.bundleId-uns-text').html('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase());
- $('[name="' + name + '"]').val('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase());
+ $('.bundleId-uns-text').html(bundleId);
+ $('[name="' + name + '"]').val(bundleId);
} else {
- $('.bundleId-uns-text').html('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase() + (response.resultCount + 1));
- $('[name="' + name + '"]').val('com.' + organizationName.toCamelCase() + '.' + appName.toCamelCase() + (response.resultCount + 1));
+ $('.bundleId-uns-text').html(bundleId + (response.resultCount + 1));
+ $('[name="' + name + '"]').val(bundleId + (response.resultCount + 1));
}
});
+
return;
}
- if (name === "fl-uns-bundleId" && typeof unsignedSubmission.data[name] !== "undefined") {
+
+ if (name === 'fl-uns-bundleId' && typeof unsignedSubmission.data[name] !== 'undefined') {
$('.bundleId-uns-text').html(unsignedSubmission.data[name]);
$('[name="' + name + '"]').val(unsignedSubmission.data[name]);
+
return;
}
- if (name === "fl-uns-versionNumber") {
+
+ if (name === 'fl-uns-versionNumber') {
if (typeof unsignedSubmission.data[name] !== 'undefined' && unsignedSubmission.data[name] !== '') {
$('[name="' + name + '"]').val(unsignedSubmission.data[name]);
} else if (typeof unsignedSubmission.previousResults !== 'undefined' && typeof unsignedSubmission.previousResults.versionNumber !== 'undefined' && unsignedSubmission.previousResults.versionNumber !== '') {
$('[name="' + name + '"]').val(unsignedSubmission.previousResults.versionNumber);
+ $('[name="fl-uns-versionNumber"]').data('validation-version-number', unsignedSubmission.previousResults.versionNumber);
} else {
$('[name="' + name + '"]').val('1.0.0');
}
+
return;
}
- $('[name="' + name + '"]').val((typeof unsignedSubmission.data[name] !== "undefined") ? unsignedSubmission.data[name] : '');
+ // Firebase
+ if (name === 'fl-uns-firebase') {
+ return;
+ }
+
+ $('[name="' + name + '"]').val((typeof unsignedSubmission.data[name] !== 'undefined') ? unsignedSubmission.data[name] : '');
});
if (appIcon) {
if (appSettings.splashScreen && appSettings.splashScreen.size && (appSettings.splashScreen.size[0] && appSettings.splashScreen.size[1]) < 2732) {
$('.app-details-uns .app-splash-screen').addClass('has-warning');
}
+
if (appSettings.iconData && appSettings.iconData.size && (appSettings.iconData.size[0] && appSettings.iconData.size[1]) < 1024) {
$('.app-details-uns .app-icon-name').addClass('has-error');
}
+
allAppData.push('unsigned');
} else {
$('.app-details-uns').addClass('required-fill');
@@ -312,219 +745,294 @@ function loadUnsignedData() {
if (!appIcon) {
$('.app-details-uns .app-icon-name').addClass('has-error');
}
+
if (appSettings.splashScreen && appSettings.splashScreen.size && (appSettings.splashScreen.size[0] && appSettings.splashScreen.size[1]) < 2732) {
$('.app-details-uns .app-splash-screen').addClass('has-warning');
}
}
}
-
function loadPushNotesData() {
$('#pushConfiguration [name]').each(function(i, el) {
- var name = $(el).attr("name");
+ var name = $(el).attr('name');
// ADDING NOTIFICATIONS SETTINGS
if (name === 'fl-push-authKey') {
$('[name="' + name + '"]').val(notificationSettings.apnAuthKey || '');
+
return;
}
+
if (name === 'fl-push-keyId') {
$('[name="' + name + '"]').val(notificationSettings.apnKeyId || '');
+
return;
}
});
}
function submissionBuild(appSubmission, origin) {
- Fliplet.App.Submissions.build(appSubmission.id).then(function(builtSubmission) {
+ var newVersionNumber;
- if (origin === "appStore") {
+ saveFirebaseSettings(origin).then(function() {
+ return Fliplet.App.Submissions.build(appSubmission.id);
+ }).then(function(builtSubmission) {
+ if (origin === 'appStore') {
appStoreSubmission = builtSubmission.submission;
+
// Auto increments the version number and saves the submission
- var newVersionNumber = incrementVersionNumber(appStoreSubmission.data['fl-store-versionNumber']);
- $('[name="fl-store-versionNumber"]').val(newVersionNumber);
+ newVersionNumber = incrementVersionNumber(appStoreSubmission.data['fl-store-versionNumber']);
- $('.appStore-login-details').removeClass('hidden');
- $('.appStore-logged-in, .appStore-more-options, .appStore-teams').removeClass('show');
- appStoreLoggedIn = false;
+ $('[name="fl-store-versionNumber"]').val(newVersionNumber);
saveAppStoreData();
+ $('#fl-store-teams').val('');
+ $('.appStore-more-options').removeClass('show');
}
- if (origin === "enterprise") {
+
+ if (origin === 'enterprise') {
enterpriseSubmission = builtSubmission.submission;
+
// Auto increments the version number and saves the submission
- var newVersionNumber = incrementVersionNumber(enterpriseSubmission.data['fl-ent-versionNumber']);
- $('[name="fl-ent-versionNumber"]').val(newVersionNumber);
+ newVersionNumber = incrementVersionNumber(enterpriseSubmission.data['fl-ent-versionNumber']);
- $('.enterprise-login-details').removeClass('hidden');
- $('.enterprise-logged-in, .enterprise-more-options, .enterprise-teams').removeClass('show');
- enterpriseLoggedIn = false;
+ $('[name="fl-ent-versionNumber"]').val(newVersionNumber);
saveEnterpriseData();
+ $('#fl-ent-teams').val('');
+ $('.enterprise-more-options').removeClass('show');
}
- if (origin === "unsigned") {
+
+ if (origin === 'unsigned') {
unsignedSubmission = builtSubmission.submission;
+
// Auto increments the version number and saves the submission
- var newVersionNumber = incrementVersionNumber(unsignedSubmission.data['fl-uns-versionNumber']);
+ newVersionNumber = incrementVersionNumber(unsignedSubmission.data['fl-uns-versionNumber']);
+
$('[name="fl-uns-versionNumber"]').val(newVersionNumber);
saveUnsignedData();
}
Fliplet.Studio.emit('refresh-app-submissions');
+ Fliplet.Studio.emit('app-launch', {
+ platform: 'ios',
+ submissionType: origin
+ });
+
+ Fliplet.Modal.alert({
+ title: 'Your request was sent successfully!',
+ message: 'Your app is building!'
+ }).then(function() {
+ document.getElementById('nav-tabs').scrollIntoView({ behavior: 'smooth', block: 'start' });
+ });
$('.button-' + origin + '-request').html('Request App help.fliplet.com/common-apple-issues .';
}
- } else {
- alert('Please configure your App Settings to contain the required information.');
- }
+
+ if (userInfo && userInfo.user && (userInfo.user.isAdmin || userInfo.user.isImpersonating)) {
+ build.isAdmin = userInfo.user.isAdmin || userInfo.user.isImpersonating;
+ build.debugFileUrl = debugHtmlPage ? removeAuthTokenFromFileUrl(debugHtmlPage.url) : '';
+ }
+
+ buildsData.push(build);
+ });
+
+ compileStatusTable(true, origin, buildsData);
} else {
- alert('You need to publish this app first.\nGo to "Step 1. Prepare your app" to publish your app.');
+ compileStatusTable(false, origin);
}
+}
- // Gives time to Validator to apply classes
- setTimeout(checkGroupErrors, 0);
-});
+function submissionChecker(submissions) {
+ // ---------------------
+ // App Store submissions
+ // ---------------------
-$('#unsignedConfiguration').validator().on('submit', function(event) {
- if (event.isDefaultPrevented()) {
- // Gives time to Validator to apply classes
- setTimeout(checkGroupErrors, 0);
- alert('Please fill in all the required information.');
- return;
- }
+ var asub = _.filter(submissions, function(submission) {
+ return submission.data.submissionType === 'appStore' && submission.platform === 'ios';
+ });
+ var prevSubCred;
+ var previousSubWithCredentials;
- event.preventDefault();
+ var completedAsub = _.filter(asub, function(submission) {
+ return submission.status === 'completed';
+ });
- if (appInfo && appInfo.productionAppId) {
- if (allAppData.indexOf('unsigned') > -1) {
- var requestAppConfirm;
+ // Get the Submission data from the latest completed submission,
+ // it has the certification values that are in use on the app store.
+ previousAppStoreSubmission = _.maxBy(completedAsub, function(el) {
+ return el.id;
+ });
- if (unsignedSubmission.status === "started") {
- requestAppConfirm = confirm("Are you sure you wish to request your app to be published?");
- } else {
- requestAppConfirm = confirm("Are you sure you wish to update your published app?");
- }
+ appStoreSubmissionInStore = (completedAsub.length > 0);
- if (requestAppConfirm) {
- saveUnsignedData(true);
- }
- } else {
- alert('Please configure your App Settings to contain the required information.');
- }
- } else {
- alert('You need to publish this app first.\nGo to "Step 1. Prepare your app" to publish your app.');
+ asub = _.orderBy(asub, function(submission) {
+ return new Date(submission.createdAt).getTime();
+ }, ['desc']);
+ checkSubmissionStatus('appStore', asub);
+
+ appStoreSubmission = _.maxBy(asub, function(el) {
+ return new Date(el.createdAt).getTime();
+ });
+
+ if (!appStoreSubmission) {
+ appStoreSubmission = {};
}
- // Gives time to Validator to apply classes
- setTimeout(checkGroupErrors, 0);
-});
+ var cloneAppStoreCredentialsPromise = Promise.resolve();
-/* SAVE PROGRESS CLICK */
-$('[data-app-store-save]').on('click', function() {
- saveAppStoreData();
-});
-$('[data-enterprise-save]').on('click', function() {
- saveEnterpriseData();
-});
-$('[data-unsigned-save]').on('click', function() {
- saveUnsignedData();
-});
-$('[data-push-save]').on('click', function() {
- savePushData();
-});
+ if (appStoreSubmission.data && !appStoreSubmission.data['fl-credentials']) {
+ prevSubCred = _.filter(asub, function(submission) {
+ return submission.data && submission.data['fl-credentials'];
+ });
-/* Credentials and Certificates App Store */
-$('.login-appStore-button').on('click', function() {
- var $this = $(this);
- $(this).html('Logging in...');
- $(this).addClass('disabled');
- var devEmail = $('#fl-store-appDevLogin').val();
- var devPass = $('#fl-store-appDevPass').val();
- var emailError = $('#fl-store-appDevLogin').data('error');
- var passError = $('#fl-store-appDevPass').data('error');
+ previousSubWithCredentials = _.maxBy(prevSubCred, function(el) {
+ return new Date(el.createdAt).getTime();
+ });
- // Remove errors
- $('#fl-store-appDevLogin').parents('.form-group').removeClass('has-error has-danger');
- $('#fl-store-appDevLogin').next('.with-errors').html('');
- $('#fl-store-appDevPass').parents('.form-group').removeClass('has-error has-danger');
- $('#fl-store-appDevPass').next('.with-errors').html('');
- $this.nextAll('login-error').html('');
+ appStoreSubmission.data['fl-credentials'] = 'submission-' + appStoreSubmission.id;
- if (devEmail === '') {
- $('#fl-store-appDevLogin').parents('.form-group').addClass('has-error has-danger');
- $('#fl-store-appDevLogin').next('.with-errors').html(emailError);
- $(this).html('Log in');
- $(this).removeClass('disabled');
- Fliplet.Widget.autosize();
+ if (previousSubWithCredentials) {
+ cloneAppStoreCredentialsPromise = cloneCredentials(previousSubWithCredentials.data['fl-credentials'], appStoreSubmission, true);
+ }
}
- if (devPass === '') {
- $('#fl-store-appDevPass').parents('.form-group').addClass('has-error has-danger');
- $('#fl-store-appDevPass').next('.with-errors').html(passError);
- $(this).html('Log in');
- $(this).removeClass('disabled');
- Fliplet.Widget.autosize();
- }
+ // ----------------------
+ // Enterprise submissions
+ // ----------------------
- if (devEmail !== '' && devPass !== '') {
- setCredentials(organizationID, appStoreSubmission.id, {
- type: 'apple',
- status: 'created',
- email: devEmail,
- password: devPass
- })
- .then(function() {
- return getTeams(organizationID, appStoreSubmission.id)
- .then(function(teams) {
- var appStoreTeams = _.filter(teams, function(team) {
- return team.type === "Company/Organization";
- })
- appStoreTeams.forEach(function(team, i) {
- $('.appStore-team').append(''+ team.name +' - ' + team.teamId + ' ');
- });
+ var esub = _.filter(submissions, function(submission) {
+ return submission.data.submissionType === 'enterprise' && submission.platform === 'ios';
+ });
- $this.html('Log in');
- $this.removeClass('disabled');
- $('.appStore-logged-emai').html(devEmail);
- $('.appStore-login-details').addClass('hidden');
- $('.appStore-logged-in, .appStore-teams').addClass('show');
- appStoreLoggedIn = true;
- var teamId = $('#fl-store-teams').val();
- var teamName = teamId ? $('#fl-store-teams').find(":selected").data('team-name') : '';
-
- if(teamId) {
- $('.appStore-more-options').addClass('show');
- } else {
- $('.appStore-more-options').removeClass('show');
- }
+ var completedEsub = _.filter(esub, function(submission) {
+ return submission.status === 'completed';
+ });
- return refreshAppStoreOptions(devEmail, devPass, teamId, teamName);
- });
+ // Get the Submission data from the latest completed submission,
+ // it has certification values that are in use on the developer portal.
+ previousEnterpriseStoreSubmission = _.maxBy(completedEsub, function(el) {
+ return el.id;
+ });
- })
- .catch(function(error) {
- console.log(error);
- if (error.responseJSON) {
- $this.nextAll('.login-error').html(error.responseJSON.message);
- }
- $this.html('Log in');
- $this.removeClass('disabled');
- Fliplet.Widget.autosize();
- });
+ esub = _.orderBy(esub, function(submission) {
+ return new Date(submission.createdAt).getTime();
+ }, ['desc']);
+ checkSubmissionStatus('enterprise', esub);
+
+ enterpriseSubmission = _.maxBy(esub, function(el) {
+ return new Date(el.createdAt).getTime();
+ });
+
+ if (!enterpriseSubmission) {
+ enterpriseSubmission = {};
}
-});
-$('.log-out-appStore').on('click', function() {
- appStoreLoggedIn = false;
- $('.appStore-logged-emai').html('');
- $('.appStore-login-details').removeClass('hidden');
- $('.appStore-logged-in, .appStore-more-options, .appStore-teams').removeClass('show');
-});
+ var cloneEnterpriseCredentialsPromise = Promise.resolve();
-$('[name="fl-store-distribution"]').on('change', function() {
- var value = $(this).val();
+ if (enterpriseSubmission.data && !enterpriseSubmission.data['fl-credentials']) {
+ prevSubCred = _.filter(esub, function(submission) {
+ return submission.data && submission.data['fl-credentials'];
+ });
- $('#fl-store-teams').prop('required',true);
+ previousSubWithCredentials = _.maxBy(prevSubCred, function(el) {
+ return new Date(el.createdAt).getTime();
+ });
- if (value === 'previous-file') {
- if (appStoreCertificateReplaced) {
- $('.appStore-previous-file-success').addClass('show');
- }
+ enterpriseSubmission.data['fl-credentials'] = 'submission-' + enterpriseSubmission.id;
- $('.appStore-generate-file, .appStore-generate-file-success, .appStore-upload-file').removeClass('show');
- $('#fl-store-certificate').prop('required',false);
- }
- if (value === 'generate-file') {
- if (appStoreCertificateCreated) {
- $('.appStore-generate-file-success').addClass('show');
- } else {
- $('.appStore-generate-file').addClass('show');
+ if (previousSubWithCredentials) {
+ cloneEnterpriseCredentialsPromise = cloneCredentials(previousSubWithCredentials.data['fl-credentials'], enterpriseSubmission, true);
}
-
- $('.appStore-previous-file-success, .appStore-upload-file').removeClass('show');
- $('#fl-store-certificate').prop('required',false);
}
- if (value === 'upload-file') {
- $('.appStore-upload-file').addClass('show');
- $('.appStore-previous-file-success, .appStore-generate-file, .appStore-generate-file-success').removeClass('show');
- $('#fl-store-certificate').prop('required',true);
- }
+ // --------------------
+ // Unsigned submissions
+ // --------------------
+
+ var usub = _.filter(submissions, function(submission) {
+ return submission.data.submissionType === 'unsigned' && submission.platform === 'ios';
+ });
+
+ usub = _.orderBy(usub, function(submission) {
+ return new Date(submission.createdAt).getTime();
+ }, ['desc']);
+
+ checkSubmissionStatus('unsigned', usub);
+
+ unsignedSubmission = _.maxBy(usub, function(el) {
+ return new Date(el.createdAt).getTime();
+ });
+
+ if (!unsignedSubmission) {
+ unsignedSubmission = {};
+ }
+
+ var cloneUnsignedCredentialsPromise = Promise.resolve();
+
+ if (unsignedSubmission.data && !unsignedSubmission.data['fl-credentials']) {
+ prevSubCred = _.filter(usub, function(submission) {
+ return submission.data && submission.data['fl-credentials'];
+ });
+
+ previousSubWithCredentials = _.maxBy(prevSubCred, function(el) {
+ return new Date(el.createdAt).getTime();
+ });
+
+ unsignedSubmission.data['fl-credentials'] = 'submission-' + unsignedSubmission.id;
+
+ if (previousSubWithCredentials) {
+ cloneUnsignedCredentialsPromise = cloneCredentials(previousSubWithCredentials.data['fl-credentials'], unsignedSubmission, true);
+ }
+ }
+
+ return cloneAppStoreCredentialsPromise.then(function() {
+ return cloneEnterpriseCredentialsPromise;
+ }).then(function() {
+ return cloneUnsignedCredentialsPromise;
+ }).then(function() {
+ if (_.isEmpty(appStoreSubmission)) {
+ return Fliplet.App.Submissions.create({
+ platform: 'ios',
+ data: {
+ submissionType: 'appStore'
+ }
+ })
+ .then(function(submission) {
+ appStoreSubmission = submission;
+
+ return Promise.resolve();
+ });
+ }
+
+ return Promise.resolve();
+ }).then(function() {
+ if (_.isEmpty(enterpriseSubmission)) {
+ return Fliplet.App.Submissions.create({
+ platform: 'ios',
+ data: {
+ submissionType: 'enterprise'
+ }
+ })
+ .then(function(submission) {
+ enterpriseSubmission = submission;
+
+ return Promise.resolve();
+ });
+ }
+
+ return Promise.resolve();
+ }).then(function() {
+ if (_.isEmpty(unsignedSubmission)) {
+ return Fliplet.App.Submissions.create({
+ platform: 'ios',
+ data: {
+ submissionType: 'unsigned'
+ }
+ })
+ .then(function(submission) {
+ unsignedSubmission = submission;
+
+ return Promise.resolve();
+ });
+ }
+
+ return Promise.resolve();
+ });
+}
+
+function iosSubmissionChecker(submissions) {
+ var asub = _.filter(submissions, function(submission) {
+ return submission.data.submissionType === 'appStore' && submission.platform === 'ios';
+ });
+
+ var esub = _.filter(submissions, function(submission) {
+ return submission.data.submissionType === 'enterprise' && submission.platform === 'ios';
+ });
+
+ var usub = _.filter(submissions, function(submission) {
+ return submission.data.submissionType === 'unsigned' && submission.platform === 'ios';
+ });
+
+ // Ordering
+ asub = _.orderBy(asub, function(submission) {
+ return new Date(submission.createdAt).getTime();
+ }, ['desc']);
+ esub = _.orderBy(esub, function(submission) {
+ return new Date(submission.createdAt).getTime();
+ }, ['desc']);
+ usub = _.orderBy(usub, function(submission) {
+ return new Date(submission.createdAt).getTime();
+ }, ['desc']);
+
+ checkSubmissionStatus('appStore', asub);
+ checkSubmissionStatus('enterprise', esub);
+ checkSubmissionStatus('unsigned', usub);
+}
+
+function getSubmissions() {
+ return Fliplet.App.Submissions.get();
+}
+
+function setFirebaseStatus(credentialKey, origin) {
+ if (!credentialKey) {
+ return;
+ }
+
+ var environment;
+
+ switch (origin) {
+ case 'appStore':
+ environment = 'store';
+ break;
+ case 'enterprise':
+ environment = 'ent';
+ break;
+ case 'unsigned':
+ environment = 'uns';
+ break;
+ default:
+ environment = false;
+ break;
+ }
+
+ if (!environment) {
+ console.error('Invalid environment');
+
+ return;
+ }
+
+ getCredential(credentialKey).then(function(credentials) {
+ if (_.get(credentials, 'firebase.url')) {
+ $('#fl-' + environment + '-firebase-status').html('Enabled').addClass('analytics-success');
+ }
+ }).catch(function(error) {
+ console.error(error);
+ });
+}
+
+function initialLoad(initial, timeout) {
+ if (!initial) {
+ initLoad = setTimeout(function() {
+ getSubmissions()
+ .then(function(submissions) {
+ iosSubmissionChecker(submissions);
+ initialLoad(false, 15000);
+ });
+ }, timeout);
+ } else {
+ getSubmissions()
+ .then(function(submissions) {
+ if (submissions.length) {
+ submissions.forEach(function(submission) {
+ if (submission.data['fl-credentials'] && submission.platform === 'ios') {
+ setFirebaseStatus(submission.data['fl-credentials'], submission.data.submissionType);
+ }
+ });
+ } else {
+ return Promise.all([
+ Fliplet.App.Submissions.create({
+ platform: 'ios',
+ data: {
+ submissionType: 'appStore'
+ }
+ })
+ .then(function(submission) {
+ appStoreSubmission = submission;
+ }),
+ Fliplet.App.Submissions.create({
+ platform: 'ios',
+ data: {
+ submissionType: 'unsigned'
+ }
+ })
+ .then(function(submission) {
+ unsignedSubmission = submission;
+ }),
+ Fliplet.App.Submissions.create({
+ platform: 'ios',
+ data: {
+ submissionType: 'enterprise'
+ }
+ })
+ .then(function(submission) {
+ enterpriseSubmission = submission;
+ })
+ ]);
+ }
+
+ return Fliplet.API.request({
+ cache: true,
+ url: 'v1/user'
+ })
+ .then(function(user) {
+ userInfo = user;
+
+ return submissionChecker(submissions);
+ });
+ })
+ .then(function() {
+ // Fliplet.Env.get('appId')
+ // Fliplet.Env.get('appName')
+ // Fliplet.Env.get('appSettings')
+
+ return Promise.all([
+ Fliplet.API.request({
+ method: 'GET',
+ url: 'v1/apps/' + Fliplet.Env.get('appId')
+ })
+ .then(function(result) {
+ appName = result.app.name;
+ appIcon = result.app.icon;
+ appSettings = result.app.settings;
+ }),
+ Fliplet.API.request({
+ method: 'GET',
+ url: 'v1/organizations/' + organizationId
+ })
+ .then(function(org) {
+ organizationName = org.name;
+ }),
+ Fliplet.API.request({
+ cache: true,
+ url: 'v1/widgets?include_instances=true&tags=type:appComponent&appId=' + Fliplet.Env.get('appId') + '&package=com.fliplet.analytics'
+ })
+ .then(function(res) {
+ var isEnabled = !_.isEmpty(res.widgets[0].instances);
+
+ if (isEnabled) {
+ $('[data-fl-analytics-status]').html('Enabled').addClass('analytics-success');
+ }
+ })
+ ]);
+ })
+ .then(function() {
+ if (appSettings.folderStructure) {
+ var structure = [];
+
+ hasFolders = true;
+
+ var appleOnly = _.filter(appSettings.folderStructure, function(obj) {
+ return obj.platform === 'apple';
+ });
+
+ return Promise.all(appleOnly.map(function(obj) {
+ return Fliplet.Media.Folders.get({ folderId: obj.folderId })
+ .then(function(result) {
+ var tempObject = {
+ type: obj.type,
+ folderContent: result
+ };
+
+ structure.push(tempObject);
+
+ return Promise.resolve(structure);
+ });
+ }))
+ .then(function() {
+ structure.forEach(function(el) {
+ var idx = _.findIndex(screenshotRequirements, {
+ type: el.type
+ });
+
+ if (idx > -1) {
+ screenshotRequirements[idx].screenshots = el.folderContent.files;
+ }
+ });
+ });
+ }
+
+ hasFolders = false;
+
+ return;
+ })
+ .then(function() {
+ return Fliplet.API.request({
+ method: 'GET',
+ url: 'v1/widget-instances/com.fliplet.push-notifications?appId=' + Fliplet.Env.get('appId')
+ });
+ })
+ .then(function(response) {
+ if (response.widgetInstance.settings && response.widgetInstance.settings) {
+ notificationSettings = response.widgetInstance.settings;
+ } else {
+ notificationSettings = {};
+ }
+
+ init();
+ initialLoad(false, 5000);
+ });
+ }
+}
+
+function updateServerLocation() {
+ var region = Fliplet.User.getAuthToken().substr(0, 2);
+ var serverLocations = {
+ eu: 'Dublin, Ireland',
+ us: 'San Francisco, US'
+ };
+
+ if (serverLocations[region]) {
+ $('.region-server-location').html(serverLocations[region]);
+ }
+}
+
+function getCurrentLoginForm() {
+ var id = $('.nav-tabs > li.active').prop('id');
+
+ if (!id) {
+ return;
+ }
+
+ var ids = {
+ 'appstore-control': 'app-store',
+ 'enterprise-control': 'enterprise'
+ };
+
+ return ids[id];
+}
+
+function mapSelectors(selectors, keys) {
+ selectors = selectors || {};
+
+ if (typeof keys === 'string') {
+ keys = [keys];
+ }
+
+ keys = keys || [];
+
+ return _.values(_.pick(selectors, keys)).join(',');
+}
+
+function toggleLoginForm(form, state, data) {
+ // form @param (String) app-store | enterprise
+ // state @param (String) login | logging-in | 2fa-device | 2fa-waiting | 2fa-code | 2fa-verifying | logged-in
+ // data @param (Object) Data for configuring forms (Optional)
+
+ var selectors = {
+ 'app-store': {
+ emailField: '#fl-store-appDevLogin',
+ passwordField: '#fl-store-appDevPass',
+ loginButton: '.login-appStore-button',
+ mfaDevices: '.appStore-login-2fa-devices',
+ mfaDeviceField: '#fl-store-2fa-select',
+ mfaDeviceName: 'fl-store-device',
+ mfaCodeWaiting: '.appStore-login-2fa-waiting',
+ mfaCode: '.appStore-login-2fa-code',
+ mfaSms: '.appStore-2fa-sms',
+ mfaCodeField: '#fl-store-2fa-code',
+ mfaCodeButton: '.2fa-code-store-button',
+ loginDetails: '.appStore-login-details',
+ loggedInEmail: '.appStore-logged-email',
+ loggedIn: '.appStore-logged-in',
+ moreOptions: '.appStore-more-options',
+ teams: '.appStore-teams'
+ },
+ enterprise: {
+ emailField: '#fl-ent-appDevLogin',
+ passwordField: '#fl-ent-appDevPass',
+ loginButton: '.login-enterprise-button',
+ mfaDevices: '.enterprise-login-2fa-devices',
+ mfaDeviceField: '#fl-ent-2fa-select',
+ mfaDeviceName: 'fl-ent-device',
+ mfaCodeWaiting: '.enterprise-login-2fa-waiting',
+ mfaCode: '.enterprise-login-2fa-code',
+ mfaSms: '.enterprise-2fa-sms',
+ mfaCodeField: '#fl-ent-2fa-code',
+ mfaCodeButton: '.2fa-code-ent-button',
+ loginDetails: '.enterprise-login-details',
+ loggedInEmail: '.enterprise-logged-email',
+ loggedIn: '.enterprise-logged-in',
+ moreOptions: '.enterprise-more-options',
+ teams: '.enterprise-teams'
+ }
+ };
+
+ if (!Object.keys(selectors).indexOf(form) === -1) {
+ // Invalid form
+ return;
+ }
+
+ var sel = selectors[form];
+
+ data = data || {};
+
+ switch (state) {
+ case 'login':
+ $(mapSelectors(sel, ['emailField', 'passwordField'])).prop({
+ readonly: false,
+ required: true
+ });
+ $(mapSelectors(sel, ['mfaDeviceField', 'mfaCodeField'])).prop('required', false);
+ $(sel.loginButton).html('Log in').removeClass('disabled');
+ $(sel.loginDetails).removeClass('hidden');
+ $(mapSelectors(sel, ['mfaDevices', 'mfaCode', 'loggedIn', 'moreOptions', 'teams'])).removeClass('show');
+ break;
+ case 'logging-in':
+ $(mapSelectors(['emailField', 'passwordField'])).prop({
+ readonly: true
+ });
+ $(sel.loginButton).html('Logging in ' + spinner).addClass('disabled');
+ $(sel.loginDetails).removeClass('hidden');
+ $(mapSelectors(sel, ['mfaDevices', 'mfaCode', 'loggedIn', 'moreOptions', 'teams'])).removeClass('show');
+ break;
+ case '2fa-device':
+ var options = _.map(_.get(data, 'devices', []), function eachDevice(device, i) {
+ return [
+ '',
+ ' '
+ ].join('');
+ }).join('');
+
+ $(mapSelectors(sel, ['emailField', 'passwordField', 'mfaCodeField'])).prop({
+ required: false
+ });
+ $(sel.mfaDeviceField).html(options).find('input').prop('required', true);
+ $(mapSelectors(sel, ['emailField', 'passwordField', 'mfaCodeField'])).prop('required', false);
+ $(sel.mfaDevices).addClass('show');
+ $(sel.loginDetails).addClass('hidden');
+ $(mapSelectors(sel, ['mfaCodeWaiting', 'mfaCode', 'loggedIn', 'moreOptions', 'teams'])).removeClass('show');
+ break;
+ case '2fa-waiting':
+ $(sel.mfaCodeWaiting).addClass('show');
+ $(mapSelectors(sel, ['mfaDeviceField', 'mfaCodeField'])).prop('required', false);
+ $(mapSelectors(sel, ['mfaCode', 'mfaDevices', 'mfaSms'])).removeClass('show');
+ break;
+ case '2fa-code':
+ $(sel.mfaCode).addClass('show');
+ $(sel.mfaCodeField).val('').prop({
+ required: true,
+ readonly: false
+ }).focus();
+ // Show SMS option if allowed
+ $(sel.mfaSms)[data.smsAllowed ? 'addClass' : 'removeClass']('show');
+ $(sel.mfaCodeButton).html('Verify').prop('disabled', false);
+ $(mapSelectors(sel, 'emailField, passwordField, mfaDeviceField')).prop('required', false);
+ $(sel.loginDetails).addClass('hidden');
+ $(mapSelectors(sel, ['mfaDevices', 'mfaCodeWaiting', 'loggedIn', 'moreOptions', 'teams'])).removeClass('show');
+ break;
+ case '2fa-verifying':
+ $(sel.mfaCodeField).prop('readonly', true);
+ $(sel.mfaCodeButton).html('Verifying ' + spinner).prop('disabled', true);
+ break;
+ case 'logged-in':
+ $(mapSelectors(sel, ['emailField', 'passwordField', 'mfaDeviceField', 'mfaCodeField'])).prop({
+ required: false
+ });
+ $(sel.emailField).val(data.email);
+ $(sel.loggedInEmail).html(data.email);
+ $(sel.loginDetails).addClass('hidden');
+ $(mapSelectors(sel, ['loggedIn', 'teams'])).addClass('show');
+ $(mapSelectors(sel, ['mfaDevices', 'mfaCode'])).removeClass('show');
+ break;
+ default:
+ break;
+ }
+
+ Fliplet.Widget.autosize();
+}
+
+function removeAuthTokenFromFileUrl(url) {
+ var tokenFound = url.match(/auth_token=([A-z0-9-]+)/);
+
+ if (tokenFound) {
+ return url.replace(tokenFound[0], '');
+ }
+
+ return url;
+}
+
+$('form').validator({
+ custom: {
+ 'validation-url-contains': function($el) {
+ return urlRegex.test($el.val());
+ },
+ 'validation-copyright-text': function($el) {
+ var value = $el.val().trim();
+
+ return !(value && value.length > 4 && yearRegex.test(value));
+ },
+ 'validation-version-number': function($el) {
+ var oldVersion = $el.data('validation-version-number');
+ var newVersion = $el.val();
+ var versionRegExp = /^\d+\.\d+\.\d+$/;
+
+ if (!oldVersion || !$el.val() || !versionRegExp.test(newVersion)) {
+ return false;
+ }
+
+ var segmentedOldVersion = oldVersion.split('.');
+ var segmentedNewVersion = newVersion.split('.');
+
+ for (var i = 0; i < segmentedNewVersion.length; i++) {
+ var a = parseInt(segmentedNewVersion[i], 10) || 0;
+ var b = parseInt(segmentedOldVersion[i], 10) || 0;
+
+ if (a > b) {
+ return false;
+ }
+
+ if (a < b) {
+ $el.attr('data-validation-version-number-error', 'Please make sure the version number is higher than ' + oldVersion);
+
+ return true;
+ }
+ }
+
+ $el.attr('data-validation-version-number-error', 'Please make sure the version number is higher than ' + oldVersion);
+
+ return true;
+ },
+ 'validation-version-number-type': function($el) {
+ var newVersion = $el.val();
+ var versionRegExp = /^\d+\.\d+\.\d+$/;
+
+ if (!versionRegExp.test(newVersion)) {
+ $el.attr('data-validation-version-number-type-error', 'Please make sure the app version is a number');
+
+ return true;
+ }
+
+ return false;
+ },
+ 'validation-authentication-key': function($el) {
+ var invalidCharacterRegExp = /\\n/;
+ var authKeyRegExp = /^(-----BEGIN\sPRIVATE\sKEY-----\n)(.|\n)+(\n-----END\sPRIVATE\sKEY-----)$/;
+
+ if (!authKeyRegExp.test($el.val()) || invalidCharacterRegExp.test($el.val())) {
+ $el.attr('data-validation-authentication-key-error', 'Authentication Key invalid. Please make sure the format is correct.');
+
+
+ $pushConfigurationSaveButton.addClass('disabled');
+
+ return true;
+ }
+
+ $pushConfigurationSaveButton.removeClass('disabled');
+
+ return false;
+ }
+ }
+});
+
+/* ATTACH LISTENERS */
+
+$('[name="fl-push-authKey"]').on('input', function(event) {
+ if (!$(event.target).val()) {
+ $pushConfigurationSaveButton.removeClass('disabled');
+ }
+});
+
+$('[data-toggle="tooltip"]').tooltip({
+ title: function() {
+ var tooltipText = $(this).text();
+
+ if (tooltipText.length < 41) {
+ return;
+ }
+
+ return tooltipText;
+ },
+ delay: { 'show': 500, 'hide': 300 }
+});
+
+$('[data-template="fl-store-releaseNotes"]').on('click', function(e) {
+ e.preventDefault();
+
+ $('[name=fl-store-releaseNotes]').val(defaultReleaseNotes);
+});
+
+$('[data-template="fl-store-revNotes"]').on('click', function(e) {
+ e.preventDefault();
+
+ $('[name=fl-store-revNotes]').focus().val(defaultReviewNotes);
+ $('[name=fl-store-revNotes]').parents('.form-group').removeClass('has-error');
+ $('[name=fl-store-revNotes]').next('.with-errors').html('');
+});
+
+$('.appStore-2fa-sms, .enterprise-2fa-sms').find('a').on('click', function(e) {
+ e.preventDefault();
+ // Send SMS request via socket
+ toggleLoginForm(getCurrentLoginForm(), '2fa-waiting');
+
+ if (!socketClientId) {
+ toggleLoginForm(getCurrentLoginForm(), 'login');
+
+ return;
+ }
+
+ socket.to(socketClientId).emit('aab.apple.login.2fa.sms');
+});
+
+$('#fl-store-2fa-select, #fl-ent-2fa-select').on('change', function(e) {
+ // Send device selection via socket
+ toggleLoginForm(getCurrentLoginForm(), '2fa-waiting');
+
+ if (!socketClientId) {
+ toggleLoginForm(getCurrentLoginForm(), 'login');
+
+ return;
+ }
+
+ socket.to(socketClientId).emit('aab.apple.login.2fa.device', e.target.value);
+});
+
+Fliplet().then(function() {
+ checkDemoUser();
+});
+
+// After user blur from 'demo user' field we check again to make sure that the field is empty.
+// If field is empty we remove required attribute.
+$('#fl-store-revDemoUser').on('input', function(event) {
+ userInput = event.originalEvent.inputType || false;
+
+ checkDemoUser();
+});
+
+$('.2fa-code-store-button, .2fa-code-ent-button').on('click', function() {
+ var code = $(this).parents('.form-group').prev().find('.form-control').val();
+
+ if (!code) {
+ Fliplet.Modal.alert({
+ message: 'You must enter the verification code to continue'
+ });
+
+ return;
+ }
+
+ if (!socketClientId) {
+ toggleLoginForm(getCurrentLoginForm(), 'login');
+
+ return;
+ }
+
+ toggleLoginForm(getCurrentLoginForm(), '2fa-verifying');
+ socket.to(socketClientId).emit('aab.apple.login.2fa.code', code);
+});
+
+$('[name="fl-store-screenshots"]').on('change', function() {
+ switch ($(this).val()) {
+ case 'new':
+ _.forEach(screenshotRequirements, function(req) {
+ var $thumbContainer = $('.thumbs[data-type="' + req.type + '"]');
+
+ $thumbContainer.html('');
+
+ if (!req.screenshots.length) {
+ $thumbContainer.append(addNoScreenshotWarning(req));
+
+ return;
+ }
+
+ _.forEach(_.take(req.screenshots, 4), function(thumb) {
+ $thumbContainer.append(addThumb(thumb));
+ });
+ });
+
+ $('[data-item="fl-store-screenshots-new"]').removeClass('hidden');
+ $('[data-item="fl-store-screenshots-existing"]').addClass('hidden');
+ break;
+ case 'existing':
+ $('.app-details-appStore .app-screenshots').removeClass('has-error');
+ $('[data-item="fl-store-screenshots-existing"]').removeClass('hidden');
+ $('[data-item="fl-store-screenshots-new-warning"]').addClass('hidden');
+ $('[data-item="fl-store-screenshots-new"]').addClass('hidden');
+ $('.screenshots-details-error').addClass('hidden');
+ break;
+ default:
+ break;
+ }
+});
+
+$('[name="submissionType"]').on('change', function() {
+ var selectedOptionId = $(this).attr('id');
+
+ $('.fl-sb-panel').removeClass('show');
+ $('.' + selectedOptionId).addClass('show');
+
+ Fliplet.Widget.autosize();
+});
+
+$('[name="fl-store-credentials"]').on('change', function() {
+ var value = $(this).val();
+
+ if (value === 'useOwn') {
+ $('.fl-store-credential.indented-area').removeClass('hidden');
+ } else {
+ $('.fl-store-credential.indented-area').addClass('hidden');
+ }
+
+ Fliplet.Widget.autosize();
+});
+
+$('.fl-sb-appStore [change-bundleid], .fl-sb-enterprise [change-bundleid], .fl-sb-unsigned [change-bundleid]').on('click', function() {
+ Fliplet.Modal.confirm({
+ message: 'Are you sure you want to change the unique Bundle ID?'
+ }).then(function(confirmed) {
+ if (!confirmed) {
+ return;
+ }
+
+ $('.fl-bundleId-holder').addClass('hidden');
+ $('.fl-bundleId-field').addClass('show');
+
+ Fliplet.Widget.autosize();
+ });
+});
+
+$('.panel-group')
+ .on('shown.bs.collapse', '.panel-collapse', function() {
+ Fliplet.Widget.autosize();
+
+ var $panel = $(this).closest('.panel');
+
+ if (!$panel || !$panel.offset()) {
+ return;
+ }
+
+ Fliplet.Studio.emit('scrollOverlayTo', $panel.offset().top);
+ })
+ .on('hidden.bs.collapse', '.panel-collapse', function() {
+ Fliplet.Widget.autosize();
+ });
+
+$('a[data-toggle="tab"]')
+ .on('shown.bs.tab', function() {
+ Fliplet.Widget.autosize();
+
+ if (socketClientId) {
+ socket.to(socketClientId).emit('aab.apple.login.2fa.cancel');
+ }
+ })
+ .on('hidden.bs.tab', function() {
+ Fliplet.Widget.autosize();
+ });
+
+$('[name="fl-store-keywords"]').on('tokenfield:createtoken', function(e) {
+ var currentValue = e.currentTarget.value.replace(/,\s+/g, ',');
+ var newValue = e.attrs.value;
+ var oldAndNew = currentValue + ',' + newValue;
+
+ if (oldAndNew.length > 100) {
+ e.preventDefault();
+ }
+});
+
+$('.redirectToSettings, [data-change-settings]').on('click', function(event) {
+ event.preventDefault();
+
+ saveProgressOnClose().then(function() {
+ Fliplet.Studio.emit('close-overlay', {
+ name: 'publish-apple'
+ });
+
+ Fliplet.Studio.emit('overlay', {
+ name: 'app-settings',
+ options: {
+ size: 'large',
+ title: 'App Settings',
+ section: 'appSettingsGeneral',
+ appId: Fliplet.Env.get('appId')
+ }
+ });
+ }).catch(function(err) {
+ Fliplet.Modal.alert({
+ message: Fliplet.parseError(err)
+ });
+ });
+});
+
+$(document).on('click', '[data-change-assets]', function(event) {
+ event.preventDefault();
+
+ saveProgressOnClose().then(function() {
+ Fliplet.Studio.emit('close-overlay', {
+ name: 'publish-apple'
+ });
+
+ Fliplet.Studio.emit('overlay', {
+ name: 'app-settings',
+ options: {
+ size: 'large',
+ title: 'App Settings',
+ section: 'launchAssets',
+ appId: Fliplet.Env.get('appId')
+ }
+ });
+ }).catch(function(err) {
+ Fliplet.Modal.alert({
+ message: Fliplet.parseError(err)
+ });
+ });
+});
+
+$('#appStoreConfiguration, #enterpriseConfiguration, #unsignedConfiguration').on('validated.bs.validator', function() {
+ checkGroupErrors();
+ Fliplet.Widget.autosize();
+});
+
+$('#appStoreConfiguration').validator().on('submit', function(event) {
+ if (!storeFeatures.public) {
+ Fliplet.Studio.emit('overlay', {
+ name: 'app-settings',
+ options: {
+ size: 'large',
+ title: 'App Settings',
+ appId: Fliplet.Env.get('appId'),
+ section: 'appBilling',
+ helpLink: 'https://help.fliplet.com/app-settings/'
+ }
+ });
+
+ Fliplet.Studio.emit('track-event', {
+ category: 'app_billing',
+ action: 'open',
+ context: 'apple_launch'
+ });
+
+ return;
+ }
+
+ validateImageUrl(appIcon, $('.fl-sb-appStore .setting-app-icon.default'), $('.fl-sb-appStore .image-details-error'));
+
+ var defaultSplashScreenData = {
+ 'url': $('[data-' + appStoreSubmission.data.submissionType.toLowerCase() + '-default-splash-url]').data(appStoreSubmission.data.submissionType.toLowerCase() + '-default-splash-url')
+ };
+
+ if (appSettings.splashScreen) {
+ validateImageUrl(appSettings.splashScreen.url, $('.fl-sb-unsigned .app-splash-screen'), $('.fl-sb-unsigned .splash-details-error'));
+ }
+
+ if (defaultSplashScreenData.url) {
+ validateImageUrl(defaultSplashScreenData.url, $('.fl-sb-unsigned .app-splash-screen'), $('.fl-sb-unsigned .splash-details-error'));
+ }
+
+ if ($('[name="fl-store-screenshots"]:checked').val() === 'new'
+ && (!hasFolders || _.some(screenshotRequirements, function(req) {
+ return !req.screenshots.length;
+ }))) {
+ showError($('.app-screenshots'), $('.screenshots-details-error'));
+
+ return;
+ }
+
+ if (_.includes(['fl-store-appDevLogin', 'fl-store-appDevPass'], document.activeElement.id)) {
+ // User submitted app store login form
+ $('.login-appStore-button').trigger('click');
+
+ return;
+ }
+
+ if (document.activeElement.id === 'fl-store-2fa-code') {
+ // User submitted app store login form
+ $('.2fa-code-store-button').trigger('click');
+
+ return;
+ }
+
+ if (event.isDefaultPrevented()) {
+ // Gives time to Validator to apply classes
+ setTimeout(checkGroupErrors, 0);
+ Fliplet.Modal.alert({
+ message: 'Please fill in all the required information.'
+ });
+
+ return;
+ }
+
+ event.preventDefault();
+
+ if (!isValidVersion($('[name="fl-store-versionNumber"]').val())) {
+ Fliplet.Modal.alert({
+ message: ERRORS.INVALID_VERSION
+ });
+
+ return;
+ }
+
+ if ($('[name="fl-store-screenshots"]:checked').val() === 'new' && !hasAllScreenshots) {
+ Fliplet.Modal.alert({
+ message: 'You need to add screenshots before submitting'
+ });
+
+ return;
+ }
+
+ if (!validateScreenshots()) {
+ return;
+ }
+
+ if (mustReviewTos) {
+ Fliplet.Studio.emit('onMustReviewTos');
+
+ return;
+ }
+
+ if (appInfo && appInfo.productionAppId) {
+ if (allAppData.indexOf('appStore') > -1) {
+ if (appStoreLoggedIn) {
+ var certificateKind = $('[name="fl-store-distribution"]:checked').val();
+
+ if (certificateKind === 'generate-file' && !appStoreCertificateCreated) {
+ Fliplet.Modal.alert({
+ message: 'You need to generate a certificate before requesting a submission'
+ });
+
+ return;
+ }
+
+ if (certificateKind === 'upload-file' && (!appStoreFileField.files || !appStoreFileField.files[0])) {
+ Fliplet.Modal.alert({
+ message: 'You need to upload a certificate before requesting a submission'
+ });
+
+ return;
+ }
+
+ var message = 'Are you sure you wish to update your published app?';
+
+ if (appStoreSubmission.status === 'started') {
+ message = 'Are you sure you wish to request your app to be published?';
+ }
+
+ Fliplet.Modal.confirm({
+ message: message
+ }).then(function(confirmed) {
+ if (!confirmed) {
+ return;
+ }
+
+ saveAppStoreData(true);
+ });
+ } else {
+ Fliplet.Modal.alert({
+ message: 'You need to login with your Apple developer account details.' + Fliplet.parseError(error) + '
';
+ }
+
+ Fliplet.Modal.hideAll();
+ Fliplet.Modal.alert({
+ message: message,
+ size: 'small'
+ });
+
+ toggleLoginForm('app-store', 'login');
+ });
+ }
+});
+
+$('.log-out-appStore').on('click', function() {
+ clearAppStoreCredentials();
+});
+
+$('#fl-ent-certificate-manual-details').on('change', function() {
+ checkFileExtension(this.files[0].name, $('#fl-ent-certificate-manual-details-label'), '.p12');
+});
+
+$('#fl-ent-mobileprovision-manual-details').on('change', function() {
+ checkFileExtension(this.files[0].name, $('#fl-ent-mobileprovision-manual-details-label'), '.mobileprovision');
+});
+
+$('[name="fl-store-distribution"]').on('change', function() {
+ var value = $(this).val();
+
+ $('#fl-store-teams').prop('required', true);
+
+ if (value === 'previous-file') {
+ if (appStoreCertificateReplaced) {
+ $('.appStore-previous-file-success').addClass('show');
+ }
+
+ $('.appStore-generate-file, .appStore-generate-file-success, .appStore-upload-file').removeClass('show');
+ $('#fl-store-certificate').prop('required', false);
+ }
+
+ if (value === 'generate-file') {
+ if (appStoreCertificateCreated) {
+ $('.appStore-generate-file-success').addClass('show');
+ } else {
+ $('.appStore-generate-file').addClass('show');
+ }
+
+ $('.appStore-previous-file-success, .appStore-upload-file').removeClass('show');
+ $('#fl-store-certificate').prop('required', false);
+ }
+
+ if (value === 'upload-file') {
+ $('.appStore-upload-file').addClass('show');
+ $('.appStore-previous-file-success, .appStore-generate-file, .appStore-generate-file-success').removeClass('show');
+
+ $('#fl-store-certificate').prop('required', true);
+ }
+
Fliplet.Widget.autosize();
});
+$('#fl-load-store-teams').on('click', function(e) {
+ e.preventDefault();
+
+ var $button = $(this);
+ var initialLabel = $button.html();
+ var email = $('.appStore-logged-email').text();
+
+ $button.html('Loading ' + spinner).addClass('disabled');
+ loadAppStoreTeams(email)
+ .then(function() {
+ $button.html(initialLabel).removeClass('disabled');
+ toggleLoginForm('app-store', 'logged-in', { email: email });
+ })
+ .catch(function(error) {
+ $button.html(initialLabel).removeClass('disabled');
+
+ var message = 'Unable to load teams';
+
+ if (Fliplet.parseError(error)) {
+ message += '' + Fliplet.parseError(error) + '
';
+ }
+
+ Fliplet.Modal.hideAll();
+ Fliplet.Modal.alert({
+ message: message,
+ size: 'small'
+ });
+
+ if (error && Fliplet.parseError(error).match(/^The email or password you entered .+ are wrong/)) {
+ clearAppStoreCredentials();
+ }
+ });
+});
+
$('#fl-store-teams').on('change', function() {
var value = $(this).val();
- var teamName = value ? $('#fl-store-teams').find(":selected").data('team-name') : '';
+ var teamName = value ? $('#fl-store-teams').find(':selected').data('team-name') : '';
if (value !== '') {
$('.appStore-more-options').addClass('show');
@@ -1577,30 +3680,38 @@ $('#fl-store-teams').on('change', function() {
}
var devEmail = $('#fl-store-appDevLogin').val();
- var devPass = $('#fl-store-appDevPass').val();
- return refreshAppStoreOptions(devEmail, devPass, value, teamName);
+ return refreshAppStoreOptions(devEmail, value, teamName);
});
$('.appStore-generate-cert').on('click', function() {
var $this = $(this);
- $(this).html('Generating...');
+
+ $(this).html('Generating ' + spinner);
$(this).addClass('disabled');
$('.generate-error').html(''); // Cleans errors
+
var teamId = $('#fl-store-teams').val();
- appStoreTeamId = teamId;
- var teamName = $('#fl-store-teams').find(":selected").data('team-name');
+ var teamName = $('#fl-store-teams').find(':selected').data('team-name');
- return setCredentials(organizationID, appStoreSubmission.id, {
- teamId: teamId,
- teamName: teamName
- })
+ return setCredentials(appStoreSubmission.id, {
+ teamId: teamId,
+ teamName: teamName
+ })
.then(function() {
- return createCertificates(organizationID, appStoreSubmission.id)
+ return createCertificates({
+ organizationId: organizationId,
+ submissionId: appStoreSubmission.id
+ })
.then(function(response) {
+ var p12Url = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + appStoreSubmission.id + '/download/p12';
+ var certUrl = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + appStoreSubmission.id + '/download/certificate';
+
appStoreCertificateCreated = true;
$('.appStore-generate-file-success').find('.appStore-file-name-success').html(response.certificate.name);
$('.appStore-generate-file-success').find('.appStore-file-expire-success').html(moment(response.certificate.expiresAt).format('MMMM Do YYYY'));
+ $('.appStore-generate-file-success').find('.appStore-file-download-key').attr('href', p12Url);
+ $('.appStore-generate-file-success').find('.appStore-file-download-cert').attr('href', certUrl);
$('.appStore-generate-file').removeClass('show');
$('.appStore-generate-file-success').addClass('show');
$this.html('Generate certificate');
@@ -1610,43 +3721,108 @@ $('.appStore-generate-cert').on('click', function() {
.catch(function(error) {
$this.html('Generate certificate');
$this.removeClass('disabled');
- if (error.responseJSON.message) {
- $('.generate-error').html(error.responseJSON.message);
- }
+ console.log(error);
+ $('.generate-error').html(Fliplet.parseError(error));
});
});
-$('#fl-store-certificate').on('change', function() {
- appStoreFileField = this;
- var fileName = appStoreFileField.value.replace(/\\/g, '/').replace(/.*\//, '');
+$('#fl-store-certificate').on('change', function() {
+ appStoreFileField = this;
+
+ var fileName = appStoreFileField.value.replace(/\\/g, '/').replace(/.*\//, '');
+
+ if (appStoreFileField.files && appStoreFileField.files[0]) {
+ $('#fl-store-certificate-label').val(fileName);
+ }
+});
+
+// Firebase
+
+$('#fl-store-firebase').on('change', function() {
+ var fileName = this.value.replace(/\\/g, '/').replace(/.*\//, '');
+ var fileExtension = checkFileExtension(fileName, this, '.plist');
+
+ if (!fileExtension) {
+ $('#fl-store-firebase-uploaded').html('').addClass('hidden');
+
+ return;
+ }
+
+ appStoreFirebaseFileField = this;
+
+ if (this.files && this.files[0]) {
+ $('#fl-store-firebase-status').html('Enabled').addClass('analytics-success');
+ $('#fl-store-firebase-uploaded').html('File uploaded: ' + fileName + ' ').removeClass('hidden');
+ }
+});
+
+$('#fl-ent-firebase').on('change', function() {
+ var fileName = this.value.replace(/\\/g, '/').replace(/.*\//, '');
+ var fileExtension = checkFileExtension(fileName, this, '.plist');
+
+ if (!fileExtension) {
+ $('#fl-ent-firebase-uploaded').html('').addClass('hidden');
+
+ return;
+ }
+
+ enterpriseFirebaseFileField = this;
+
+ if (this.files && this.files[0]) {
+ $('#fl-ent-firebase-status').html('Enabled').addClass('analytics-success');
+ $('#fl-ent-firebase-uploaded').html('File uploaded: ' + fileName + ' ').removeClass('hidden');
+ }
+});
+
+$('#fl-uns-firebase').on('change', function() {
+ var fileName = this.value.replace(/\\/g, '/').replace(/.*\//, '');
+ var fileExtension = checkFileExtension(fileName, this, '.plist');
- if (appStoreFileField.files && appStoreFileField.files[0]) {
- $('#fl-store-certificate-label').val(fileName);
+ if (!fileExtension) {
+ $('#fl-uns-firebase-uploaded').html('').addClass('hidden');
+
+ return;
+ }
+
+ unsignedFirebaseFileField = this;
+
+ if (this.files && this.files[0]) {
+ $('#fl-uns-firebase-status').html('Enabled').addClass('analytics-success');
+ $('#fl-uns-firebase-uploaded').html('File uploaded: ' + fileName + ' ').removeClass('hidden');
}
});
$('.appStore-replace-cert').on('click', function() {
var $this = $(this);
- $(this).html('Replacing...');
+
+ $(this).html('Replacing ' + spinner);
$(this).addClass('disabled');
$('.replace-error').html(''); // Cleans errors
+
var teamId = appStorePreviousCredential ? appStorePreviousCredential.teamId : '';
- appStoreTeamId = teamId;
var teamName = appStorePreviousCredential ? appStorePreviousCredential.teamName : '';
if (appStorePreviousCredential.certificate && appStorePreviousCredential.certificate.id) {
- return revokeCertificate(organizationID, appStoreSubmission.id, appStorePreviousCredential.certificate.id)
+ return revokeCertificate(appStoreSubmission.id, appStorePreviousCredential.certificate.id)
.then(function() {
- return setCredentials(organizationID, appStoreSubmission.id, {
- teamId: teamId,
- teamName: teamName
- })
+ return setCredentials(appStoreSubmission.id, {
+ teamId: teamId,
+ teamName: teamName
+ })
.then(function() {
- return createCertificates(organizationID, appStoreSubmission.id)
+ return createCertificates({
+ organizationId: organizationId,
+ submissionId: appStoreSubmission.id
+ })
.then(function(response) {
+ var p12Url = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + appStoreSubmission.id + '/download/p12';
+ var certUrl = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + appStoreSubmission.id + '/download/certificate';
+
appStoreCertificateReplaced = true;
$('.appStore-previous-file-success').find('.appStore-file-name-success').html(response.certificate.name);
$('.appStore-previous-file-success').find('.appStore-file-expire-success').html(moment(response.certificate.expiresAt).format('MMMM Do YYYY'));
+ $('.appStore-previous-file-success').find('.appStore-file-download-key').attr('href', p12Url);
+ $('.appStore-previous-file-success').find('.appStore-file-download-cert').attr('href', certUrl);
$('.appStore-previous-file-success').addClass('show');
$this.html('Replace certificate');
$this.removeClass('disabled');
@@ -1656,27 +3832,23 @@ $('.appStore-replace-cert').on('click', function() {
.catch(function(error) {
$this.html('Replace certificate');
$this.removeClass('disabled');
- if (error.responseJSON.message) {
- $('.replace-error').html(error.responseJSON.message);
- }
+ console.log(error);
+ $('.replace-error').html(Fliplet.parseError(error));
});
- } else {
- $this.html('Replace certificate');
- $this.removeClass('disabled');
- $('.replace-error').html("We could not replace the certificate.\nPlease log into your https://developer.apple.com/account/ and revoke the certificate and create a new one using Fliplet.");
- }
+ }
+ $this.html('Replace certificate');
+ $this.removeClass('disabled');
+ $('.replace-error').html('We could not replace the certificate.\nPlease log into your https://developer.apple.com/account/ and revoke the certificate and create a new one using Fliplet.');
});
/**/
/* Credentials and Certificates Enterprise */
$('.login-enterprise-button').on('click', function() {
var $this = $(this);
- $(this).html('Logging in...');
- $(this).addClass('disabled');
var devEmail = $('#fl-ent-appDevLogin').val();
var devPass = $('#fl-ent-appDevPass').val();
- var emailError = $('#fl-ent-distributionnt-appDevLogin').data('error');
+ var emailError = $('#fl-ent-appDevLogin').data('error');
var passError = $('#fl-ent-appDevPass').data('error');
// Remove errors
@@ -1686,81 +3858,59 @@ $('.login-enterprise-button').on('click', function() {
$('#fl-ent-appDevPass').next('.with-errors').html('');
$this.nextAll('login-error').html('');
+ toggleLoginForm('enterprise', 'logging-in');
+
if (devEmail === '') {
$('#fl-ent-appDevLogin').parents('.form-group').addClass('has-error has-danger');
$('#fl-ent-appDevLogin').next('.with-errors').html(emailError);
- $(this).html('Log in');
- $(this).removeClass('disabled');
- Fliplet.Widget.autosize();
+ toggleLoginForm('enterprise', 'login');
}
if (devPass === '') {
$('#fl-ent-appDevPass').parents('.form-group').addClass('has-error has-danger');
$('#fl-ent-appDevPass').next('.with-errors').html(passError);
- $(this).html('Log in');
- $(this).removeClass('disabled');
- Fliplet.Widget.autosize();
+ toggleLoginForm('enterprise', 'login');
}
if (devEmail !== '' && devPass !== '') {
- setCredentials(organizationID, enterpriseSubmission.id, {
+ setCredentials(enterpriseSubmission.id, {
type: 'apple-enterprise',
status: 'created',
email: devEmail,
password: devPass
})
- .then(function() {
- $('[name="fl-ent-distribution"][value="generate-file"]').prop('checked', true).trigger('change');
-
- return getTeams(organizationID, enterpriseSubmission.id)
- .then(function(teams) {
- var enterpriseTeams = _.filter(teams, function(team) {
- return team.type === "In-House";
- })
- enterpriseTeams.forEach(function(team, i) {
- $('.enterprise-team').append(''+ team.name +' - ' + team.teamId + ' ');
- });
+ .then(function() {
+ return enterpriseTeamSetup(devEmail, true);
+ })
+ .then(function() {
+ $('[name="fl-ent-distribution"][value="generate-file"]').prop('checked', true).trigger('change');
+ })
+ .catch(function(error) {
+ var message = 'Unable to log in';
- $this.html('Log in');
- $this.removeClass('disabled');
- $('.enterprise-logged-emai').html(devEmail);
- $('.enterprise-login-details').addClass('hidden');
- $('.enterprise-logged-in, .enterprise-more-options, .enterprise-teams').addClass('show');
- enterpriseLoggedIn = true;
- var teamId = $('#fl-ent-teams').val();
- var teamName = teamId ? $('#fl-ent-teams').find(":selected").data('team-name') : '';
-
- if(teamId) {
- $('.enterprise-more-options').addClass('show');
- } else {
- $('.enterprise-more-options').removeClass('show');
- }
+ if (Fliplet.parseError(error)) {
+ message += '' + Fliplet.parseError(error) + '
';
+ }
- return refreshAppEnterpriseOptions(devEmail, devPass, teamId, teamName);
+ Fliplet.Modal.hideAll();
+ Fliplet.Modal.alert({
+ message: message,
+ size: 'small'
});
- })
- .catch(function(error) {
- if (error.responseJSON) {
- $this.nextAll('.login-error').html(error.responseJSON.message);
- }
- $this.html('Log in');
- $this.removeClass('disabled');
- Fliplet.Widget.autosize();
- });
+
+ toggleLoginForm('enterprise', 'login');
+ });
}
});
$('.log-out-enterprise').on('click', function() {
- enterpriseLoggedIn = false;
- $('.enterprise-logged-emai').html('');
- $('.enterprise-login-details').removeClass('hidden');
- $('.enterprise-logged-in, .enterprise-more-options, .enterprise-teams').removeClass('show');
+ clearEnterpriseCredentials();
});
$('[name="fl-ent-distribution"]').on('change', function() {
var value = $(this).val();
- $('#fl-ent-teams').prop('required',true);
+ $('#fl-ent-teams').prop('required', true);
if (value === 'previous-file') {
if (enterpriseCertificateReplaced) {
@@ -1769,26 +3919,62 @@ $('[name="fl-ent-distribution"]').on('change', function() {
$('.enterprise-generate-file, .enterprise-generate-file-success, .enterprise-upload-file').removeClass('show');
}
+
if (value === 'generate-file') {
if (enterpriseCertificateCreated) {
$('.enterprise-generate-file-success').addClass('show');
} else {
$('.enterprise-generate-file').addClass('show');
}
+
$('.enterprise-previous-file-success, .enterprise-upload-file').removeClass('show');
- $('#fl-ent-certificate').prop('required',false);
+ $('#fl-ent-certificate').prop('required', false);
}
+
if (value === 'upload-file') {
$('.enterprise-upload-file').addClass('show');
$('.enterprise-previous-file-success, .enterprise-generate-file, .enterprise-generate-file-success').removeClass('show');
- $('#fl-ent-certificate').prop('required',true);
+ $('#fl-ent-certificate').prop('required', true);
}
+
Fliplet.Widget.autosize();
});
+$('#fl-load-ent-teams').on('click', function(e) {
+ e.preventDefault();
+
+ var $button = $(this);
+ var initialLabel = $button.html();
+
+ $button.html('Loading ' + spinner).addClass('disabled');
+ loadEnterpriseTeams($('.enterprise-logged-email').text())
+ .then(function() {
+ $button.html(initialLabel).removeClass('disabled');
+ })
+ .catch(function(error) {
+ $button.html(initialLabel).removeClass('disabled');
+
+ var message = 'Unable to load teams';
+
+ if (Fliplet.parseError(error)) {
+ message += '' + Fliplet.parseError(error) + '
';
+ }
+
+ Fliplet.Modal.hideAll();
+ Fliplet.Modal.alert({
+ message: message,
+ size: 'small'
+ });
+
+ if (error && Fliplet.parseError(error).match(/^The email or password you entered .+ are wrong/)) {
+ clearEnterpriseCredentials();
+ }
+ });
+});
+
$('#fl-ent-teams').on('change', function() {
var value = $(this).val();
- var teamName = value ? $('#fl-ent-teams').find(":selected").data('team-name') : '';
+ var teamName = value ? $('#fl-ent-teams').find(':selected').data('team-name') : '';
if (value !== '') {
$('.enterprise-more-options').addClass('show');
@@ -1801,524 +3987,222 @@ $('#fl-ent-teams').on('change', function() {
}
var devEmail = $('#fl-ent-appDevLogin').val();
- var devPass = $('#fl-ent-appDevPass').val();
-
- return refreshAppEnterpriseOptions(devEmail, devPass, value, teamName);
+ return refreshAppEnterpriseOptions(devEmail, value, teamName);
});
$('.enterprise-generate-cert').on('click', function() {
var $this = $(this);
- $(this).html('Generating...');
+
+ $(this).html('Generating ' + spinner);
$(this).addClass('disabled');
$('.generate-error').html(''); // Cleans errors
- var teamId = $('#fl-ent-teams').val();
- enterpriseTeamId = teamId;
- var teamName = $('#fl-ent-teams').find(":selected").data('team-name');
-
- return setCredentials(organizationID, enterpriseSubmission.id, {
- teamId: teamId,
- teamName: teamName
- })
- .then(function() {
- return createCertificates(organizationID, enterpriseSubmission.id)
- .then(function(response) {
- enterpriseCertificateCreated = true;
- $('.enterprise-generate-file-success').find('.enterprise-file-name-success').html(response.certificate.name);
- $('.enterprise-generate-file-success').find('.enterprise-file-expire-success').html(moment(response.certificate.expiresAt).format('MMMM Do YYYY'));
- $('.enterprise-generate-file').removeClass('show');
- $('.enterprise-generate-file-success').addClass('show');
- $this.html('Generate certificate');
- $this.removeClass('disabled');
- });
- })
- .catch(function(error) {
- $this.html('Generate certificate');
- $this.removeClass('disabled');
- if (error.responseJSON.message) {
- $('.generate-error').html(error.responseJSON.message);
- }
- });
-});
-
-$('#fl-ent-certificate').on('change', function() {
- enterpriseFileField = this;
- var fileName = enterpriseFileField.value.replace(/\\/g, '/').replace(/.*\//, '');
-
- if (enterpriseFileField.files && enterpriseFileField.files[0]) {
- $('#fl-ent-certificate-label').val(fileName);
- }
-});
-
-$('#fl-ent-certificate-manual-details').on('change', function() {
- enterpriseFileFieldManual = this;
- var fileName = enterpriseFileFieldManual.value.replace(/\\/g, '/').replace(/.*\//, '');
-
- if (enterpriseFileFieldManual.files && enterpriseFileFieldManual.files[0]) {
- $('#fl-ent-certificate-manual-details-label').val(fileName);
- }
-});
-
-$('#fl-ent-mobileprovision-manual-details').on('change', function() {
- enterpriseFileProvisionFieldManual = this;
- var fileName = enterpriseFileProvisionFieldManual.value.replace(/\\/g, '/').replace(/.*\//, '');
- if (enterpriseFileProvisionFieldManual.files && enterpriseFileProvisionFieldManual.files[0]) {
- $('#fl-ent-mobileprovision-manual-details-label').val(fileName);
- }
-});
+ var teamId = $('#fl-ent-teams').val();
-$('.enterprise-replace-cert').on('click', function() {
- var $this = $(this);
- $(this).html('Replacing...');
- $(this).addClass('disabled');
- $('.replace-error').html(''); // Cleans errors
- var teamId = enterprisePreviousCredential ? enterprisePreviousCredential.teamId : '';
enterpriseTeamId = teamId;
- var teamName = enterprisePreviousCredential ? enterprisePreviousCredential.teamName : '';
-
- if (enterprisePreviousCredential.certificate && enterprisePreviousCredential.certificate.id) {
- return revokeCertificate(organizationID, enterpriseSubmission.id, enterprisePreviousCredential.certificate.id)
- .then(function() {
- return setCredentials(organizationID, enterpriseSubmission.id, {
- teamId: teamId,
- teamName: teamName
- })
- .then(function() {
- return createCertificates(organizationID, enterpriseSubmission.id)
- .then(function(response) {
- enterpriseCertificateReplaced = true;
- $('.enterprise-previous-file-success').find('.enterprise-file-name-success').html(response.certificate.name);
- $('.enterprise-previous-file-success').find('.enterprise-file-expire-success').html(moment(response.certificate.expiresAt).format('MMMM Do YYYY'));
- $('.enterprise-previous-file-success').addClass('show');
- $this.html('Replace certificate');
- $this.removeClass('disabled');
- });
- });
- })
- .catch(function(error) {
- $this.html('Replace certificate');
- $this.removeClass('disabled');
- if (error.responseJSON.message) {
- $('.replace-error').html(error.responseJSON.message);
- }
- });
- } else {
- $this.html('Replace certificate');
- $this.removeClass('disabled');
- $('.replace-error').html("We could not replace the certificate.\nPlease log into your https://developer.apple.com/account/ and revoke the certificate and create a new one using Fliplet.");
- }
-});
-
-$('.ent-enter-manually').on('click', function() {
- $('.enterprise-login-details').addClass('hidden');
- $('.enterprise-manual-details').addClass('show');
- enterpriseManual = true;
-
- $('#fl-ent-appDevLogin').prop('required', false);
- $('#fl-ent-appDevPass').prop('required', false);
- $('#fl-ent-teams').prop('required',false);
-
- $('#fl-ent-teamName').prop('required', true);
- $('#fl-ent-teamId').prop('required', true);
- $('#fl-ent-certificate-manual-details').prop('required', true);
- $('#fl-ent-mobileprovision-manual-details').prop('required', true);
-});
-$('.enterprise-back-login').on('click', function() {
- $('.enterprise-login-details').removeClass('hidden');
- $('.enterprise-manual-details').removeClass('show');
- enterpriseManual = false;
-
- $('#fl-ent-appDevLogin').prop('required', true);
- $('#fl-ent-appDevPass').prop('required', true);
- $('#fl-ent-teams').prop('required',true);
-
- $('#fl-ent-teamName').prop('required', false);
- $('#fl-ent-teamId').prop('required', false);
- $('#fl-ent-certificate-manual-details').prop('required', false);
- $('#fl-ent-mobileprovision-manual-details').prop('required', false);
-});
-/**/
-
-$(document).on('click', '[data-cancel-build-id]', function() {
- var buildId = $(this).data('cancel-build-id');
+ var teamName = $('#fl-ent-teams').find(':selected').data('team-name');
- Fliplet.API.request({
- method: 'DELETE',
- url: 'v1/apps/' + Fliplet.Env.get('appId') + '/submissions/' + buildId
+ return setCredentials(enterpriseSubmission.id, {
+ teamId: teamId,
+ teamName: teamName
})
- .then(function() {
- clearTimeout(initLoad);
- initialLoad(false, 0);
- })
-});
-
-/* INIT */
-$('#appStoreConfiguration, #enterpriseConfiguration, #unsignedConfiguration').validator().off('change.bs.validator focusout.bs.validator');
-$('[name="submissionType"][value="appStore"]').prop('checked', true).trigger('change');
-
-function compileStatusTable(withData, origin, buildsData) {
- if (withData) {
- var template = Handlebars.compile(statusTableTemplate);
- var html = template(buildsData);
-
- if (origin === "appStore") {
- $statusAppStoreTableElement.html(html);
- }
- if (origin === "enterprise") {
- $statusEnterpriseTableElement.html(html);
- }
- if (origin === "unsigned") {
- $statusUnsignedTableElement.html(html);
- }
- } else {
- if (origin === "appStore") {
- $statusAppStoreTableElement.html('');
- }
- if (origin === "enterprise") {
- $statusEnterpriseTableElement.html('');
- }
- if (origin === "unsigned") {
- $statusUnsignedTableElement.html('');
- }
- }
-
- Fliplet.Widget.autosize();
-}
-
-function checkSubmissionStatus(origin, iosSubmissions) {
- var submissionsToShow = _.filter(iosSubmissions, function(submission) {
- return submission.status === "queued" || submission.status === "submitted" || submission.status === "processing" || submission.status === "completed" || submission.status === "failed" || submission.status === "cancelled" || submission.status === "ready-for-testing" || submission.status === "tested";
- });
-
- var buildsData = [];
- if (submissionsToShow.length) {
- submissionsToShow.forEach(function(submission) {
- var build = {};
- var appBuild;
- var debugHtmlPage;
-
- if (submission.result.appBuild && submission.result.appBuild.files) {
- appBuild = _.find(submission.result.appBuild.files, function(file) {
- var dotIndex = file.url.lastIndexOf('.');
- var ext = file.url.substring(dotIndex);
- if (ext === '.ipa') {
- return true;
- }
- });
- } else if (submission.data.previousResults && submission.data.previousResults.appBuild && submission.data.previousResults.appBuild.files) {
- appBuild = _.find(submission.data.previousResults.appBuild.files, function(file) {
- var dotIndex = file.url.lastIndexOf('.');
- var ext = file.url.substring(dotIndex);
- if (ext === '.ipa') {
- return true;
- }
- });
- }
-
- if (submission.result.debugHtmlPage && submission.result.debugHtmlPage.files) {
- debugHtmlPage = _.find(submission.result.debugHtmlPage.files, function(file) {
- var dotIndex = file.url.lastIndexOf('.');
- var ext = file.url.substring(dotIndex);
- if (ext === '.html') {
- return true;
- }
- });
- } else if (submission.data.previousResults && submission.data.previousResults.debugHtmlPage && submission.data.previousResults.debugHtmlPage.files) {
- debugHtmlPage = _.find(submission.data.previousResults.debugHtmlPage.files, function(file) {
- var dotIndex = file.url.lastIndexOf('.');
- var ext = file.url.substring(dotIndex);
- if (ext === '.html') {
- return true;
- }
- });
- }
-
- build.id = submission.id;
- build.updatedAt = ((submission.status === 'completed' || submission.status === 'failed' || submission.status === 'cancelled' || submission.status === 'ready-for-testing' || submission.status === 'tested') && submission.updatedAt) ?
- moment(submission.updatedAt).format('MMM Do YYYY, h:mm:ss a') :
- '';
- build.submittedAt = ((submission.status === 'queued' || submission.status === 'submitted') && submission.submittedAt) ?
- moment(submission.submittedAt).format('MMM Do YYYY, h:mm:ss a') :
- '';
- build[submission.status] = true;
- build.fileUrl = appBuild ? appBuild.url : '';
-
- if (userInfo.user && (userInfo.user.isAdmin || userInfo.user.isImpersonating)) {
- build.debugFileUrl = debugHtmlPage ? debugHtmlPage.url : '';
- }
-
- buildsData.push(build);
- });
-
- compileStatusTable(true, origin, buildsData);
- } else {
- compileStatusTable(false, origin);
- }
-}
+ .then(function() {
+ return createCertificates({
+ organizationId: organizationId,
+ submissionId: enterpriseSubmission.id,
+ inHouse: true
+ })
+ .then(function(response) {
+ var p12Url = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + enterpriseSubmission.id + '/download/p12';
+ var certUrl = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + enterpriseSubmission.id + '/download/certificate';
-function submissionChecker(submissions) {
- var asub = _.filter(submissions, function(submission) {
- return submission.data.submissionType === "appStore" && submission.platform === "ios";
- });
+ enterpriseCertificateCreated = true;
+ $('.enterprise-generate-file-success').find('.enterprise-file-name-success').html(response.certificate.name);
+ $('.enterprise-generate-file-success').find('.enterprise-file-expire-success').html(moment(response.certificate.expiresAt).format('MMMM Do YYYY'));
+ $('.enterprise-generate-file-success').find('.enterprise-file-download-key').attr('href', p12Url);
+ $('.enterprise-generate-file-success').find('.enterprise-file-download-cert').attr('href', certUrl);
+ $('.enterprise-generate-file').removeClass('show');
+ $('.enterprise-generate-file-success').addClass('show');
+ $this.html('Generate certificate');
+ $this.removeClass('disabled');
+ });
+ })
+ .catch(function(error) {
+ $this.html('Generate certificate');
+ $this.removeClass('disabled');
+ console.log(error);
+ $('.generate-error').html(Fliplet.parseError(error));
+ });
+});
- checkSubmissionStatus("appStore", asub);
+$('#fl-ent-certificate').on('change', function() {
+ enterpriseFileField = this;
- asub = _.maxBy(asub, function(el) {
- return new Date(el.createdAt).getTime();
- });
- appStoreSubmission = asub;
+ var fileName = enterpriseFileField.value.replace(/\\/g, '/').replace(/.*\//, '');
- if (appStoreSubmission.data && !appStoreSubmission.data['fl-credentials']) {
+ if (enterpriseFileField.files && enterpriseFileField.files[0]) {
+ $('#fl-ent-certificate-label').val(fileName);
+ }
+});
- var prevSubCred = _.filter(submissions, function(submission) {
- return submission.data && submission.data['fl-credentials'];
- });
+$('#fl-ent-certificate-manual-details').on('change', function() {
+ enterpriseFileFieldManual = this;
- var previousSubWithCredentials = _.maxBy(prevSubCred, function(el) {
- return new Date(el.createdAt).getTime();
- });
+ var fileName = enterpriseFileFieldManual.value.replace(/\\/g, '/').replace(/.*\//, '');
- if(previousSubWithCredentials) {
- appStoreSubmission.data['fl-credentials'] = previousSubWithCredentials.data['fl-credentials'];
- }
- else {
- appStoreSubmission.data['fl-credentials'] = '';
- }
+ if (enterpriseFileFieldManual.files && enterpriseFileFieldManual.files[0]) {
+ $('#fl-ent-certificate-manual-details-label').val(fileName);
}
+});
- var esub = _.filter(submissions, function(submission) {
- return submission.data.submissionType === "enterprise" && submission.platform === "ios";
- });
+$('#fl-ent-mobileprovision-manual-details').on('change', function() {
+ enterpriseFileProvisionFieldManual = this;
- checkSubmissionStatus("enterprise", esub);
+ var fileName = enterpriseFileProvisionFieldManual.value.replace(/\\/g, '/').replace(/.*\//, '');
- esub = _.maxBy(esub, function(el) {
- return new Date(el.createdAt).getTime();
- });
- enterpriseSubmission = esub;
+ if (enterpriseFileProvisionFieldManual.files && enterpriseFileProvisionFieldManual.files[0]) {
+ $('#fl-ent-mobileprovision-manual-details-label').val(fileName);
+ }
+});
- if (enterpriseSubmission.data && !enterpriseSubmission.data['fl-credentials']) {
+$('.enterprise-replace-cert').on('click', function() {
+ var $this = $(this);
- var prevSubCred = _.filter(submissions, function(submission) {
- return submission.data && submission.data['fl-credentials'];
- });
+ $(this).html('Replacing ' + spinner);
+ $(this).addClass('disabled');
+ $('.replace-error').html(''); // Cleans errors
- var previousSubWithCredentials = _.maxBy(prevSubCred, function(el) {
- return new Date(el.createdAt).getTime();
- });
+ var teamId = enterprisePreviousCredential ? enterprisePreviousCredential.teamId : '';
- if(previousSubWithCredentials) {
- enterpriseSubmission.data['fl-credentials'] = previousSubWithCredentials.data['fl-credentials'];
- }
- else {
- enterpriseSubmission.data['fl-credentials'] = '';
- }
- }
+ enterpriseTeamId = teamId;
- var usub = _.filter(submissions, function(submission) {
- return submission.data.submissionType === "unsigned" && submission.platform === "ios";
- });
+ var teamName = enterprisePreviousCredential ? enterprisePreviousCredential.teamName : '';
- checkSubmissionStatus("unsigned", usub);
+ if (enterprisePreviousCredential.certificate && enterprisePreviousCredential.certificate.id) {
+ return revokeCertificate(enterpriseSubmission.id, enterprisePreviousCredential.certificate.id)
+ .then(function() {
+ return setCredentials(enterpriseSubmission.id, {
+ teamId: teamId,
+ teamName: teamName
+ })
+ .then(function() {
+ return createCertificates({
+ organizationId: organizationId,
+ submissionId: enterpriseSubmission.id,
+ inHouse: true
+ })
+ .then(function(response) {
+ var p12Url = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + enterpriseSubmission.id + '/download/p12';
+ var certUrl = Fliplet.Env.get('apiUrl') + 'v1/organizations/' + organizationId + '/credentials/submission-' + enterpriseSubmission.id + '/download/certificate';
- usub = _.maxBy(usub, function(el) {
- return new Date(el.createdAt).getTime();
- });
- unsignedSubmission = usub;
+ enterpriseCertificateReplaced = true;
- if (_.isEmpty(appStoreSubmission)) {
- Fliplet.App.Submissions.create({
- platform: 'ios',
- data: {
- submissionType: "appStore"
- }
+ $('.enterprise-previous-file-success').find('.enterprise-file-name-success').html(response.certificate.name);
+ $('.enterprise-previous-file-success').find('.enterprise-file-expire-success').html(moment(response.certificate.expiresAt).format('MMMM Do YYYY'));
+ $('.enterprise-previous-file-success').find('.enterprise-file-download-key').attr('href', p12Url);
+ $('.enterprise-previous-file-success').find('.enterprise-file-download-cert').attr('href', certUrl);
+ $('.enterprise-previous-file-success').addClass('show');
+ $this.html('Replace certificate');
+ $this.removeClass('disabled');
+ });
+ });
})
- .then(function(submission) {
- appStoreSubmission = submission;
+ .catch(function(error) {
+ $this.html('Replace certificate');
+ $this.removeClass('disabled');
+ console.log(error);
+ $('.replace-error').html(Fliplet.parseError(error));
});
}
- if (_.isEmpty(enterpriseSubmission)) {
- Fliplet.App.Submissions.create({
- platform: 'ios',
- data: {
- submissionType: "enterprise"
- }
- })
- .then(function(submission) {
- enterpriseSubmission = submission;
- });
- }
+ $this.html('Replace certificate');
+ $this.removeClass('disabled');
+ $('.replace-error').html('We could not replace the certificate.\nPlease log into your https://developer.apple.com/account/ and revoke the certificate and create a new one using Fliplet.');
+});
- if (_.isEmpty(unsignedSubmission)) {
- Fliplet.App.Submissions.create({
- platform: 'ios',
- data: {
- submissionType: "unsigned"
- }
- })
- .then(function(submission) {
- unsignedSubmission = submission;
- });
- }
-}
+$('.ent-enter-manually').on('click', function() {
+ $('.enterprise-login-details').addClass('hidden');
+ $('.enterprise-manual-details').addClass('show');
+ enterpriseManual = true;
-function iosSubmissionChecker(submissions) {
- var asub = _.filter(submissions, function(submission) {
- return submission.data.submissionType === "appStore" && submission.platform === "ios";
- });
+ $('#fl-ent-appDevLogin').prop('required', false);
+ $('#fl-ent-appDevPass').prop('required', false);
+ $('#fl-ent-teams').prop('required', false);
- var esub = _.filter(submissions, function(submission) {
- return submission.data.submissionType === "enterprise" && submission.platform === "ios";
- });
+ $('#fl-ent-teamName').prop('required', true);
+ $('#fl-ent-teamId').prop('required', true);
+ $('#fl-ent-certificate-manual-details').prop('required', true);
+ $('#fl-ent-mobileprovision-manual-details').prop('required', true);
+});
- var usub = _.filter(submissions, function(submission) {
- return submission.data.submissionType === "unsigned" && submission.platform === "ios";
- });
+$('.enterprise-back-login').on('click', function() {
+ $('.enterprise-login-details').removeClass('hidden');
+ $('.enterprise-manual-details').removeClass('show');
+ enterpriseManual = false;
- checkSubmissionStatus("appStore", asub);
- checkSubmissionStatus("enterprise", esub);
- checkSubmissionStatus("unsigned", usub);
-}
+ $('#fl-ent-appDevLogin').prop('required', true);
+ $('#fl-ent-appDevPass').prop('required', true);
+ $('#fl-ent-teams').prop('required', true);
-function getSubmissions() {
- return Fliplet.App.Submissions.get();
-}
+ $('#fl-ent-teamName').prop('required', false);
+ $('#fl-ent-teamId').prop('required', false);
+ $('#fl-ent-certificate-manual-details').prop('required', false);
+ $('#fl-ent-mobileprovision-manual-details').prop('required', false);
+});
+/**/
-function initialLoad(initial, timeout) {
- if (!initial) {
- initLoad = setTimeout(function() {
- getSubmissions()
- .then(function(submissions) {
- iosSubmissionChecker(submissions);
- initialLoad(false, 15000);
- });
- }, timeout);
- } else {
- getSubmissions()
- .then(function(submissions) {
+$(document).on('click', '[data-cancel-build-id]', function() {
+ var buildId = $(this).data('cancel-build-id');
- if (!submissions.length) {
- return Promise.all([
- Fliplet.App.Submissions.create({
- platform: 'ios',
- data: {
- submissionType: "appStore"
- }
- })
- .then(function(submission) {
- appStoreSubmission = submission;
- }),
- Fliplet.App.Submissions.create({
- platform: 'ios',
- data: {
- submissionType: "unsigned"
- }
- })
- .then(function(submission) {
- unsignedSubmission = submission;
- }),
- Fliplet.App.Submissions.create({
- platform: 'ios',
- data: {
- submissionType: "enterprise"
- }
- })
- .then(function(submission) {
- enterpriseSubmission = submission;
- })
- ]);
- }
+ Fliplet.API.request({
+ method: 'DELETE',
+ url: 'v1/apps/' + Fliplet.Env.get('appId') + '/submissions/' + buildId
+ })
+ .then(function() {
+ clearTimeout(initLoad);
+ initialLoad(false, 0);
+ });
+});
- return Fliplet.API.request({
- cache: true,
- url: 'v1/user'
- })
- .then(function(user) {
- userInfo = user;
- submissionChecker(submissions);
- return Promise.resolve();
- });
- })
- .then(function() {
- // Fliplet.Env.get('appId')
- // Fliplet.Env.get('appName')
- // Fliplet.Env.get('appSettings')
+$('.browse-files').on('click', function(e) {
+ e.preventDefault();
+
+ Fliplet.Studio.emit('overlay', {
+ name: 'widget',
+ options: {
+ size: 'large',
+ package: 'com.fliplet.file-manager',
+ title: 'File Manager',
+ classes: 'data-source-overlay',
+ data: {
+ context: 'overlay',
+ appId: Fliplet.Env.get('appId')
+ }
+ }
+ });
+});
- return Promise.all([
- Fliplet.API.request({
- method: 'GET',
- url: 'v1/apps/' + Fliplet.Env.get('appId')
- })
- .then(function(result) {
- appName = result.app.name;
- appIcon = result.app.icon;
- appSettings = result.app.settings;
- }),
- Fliplet.API.request({
- method: 'GET',
- url: 'v1/organizations/' + Fliplet.Env.get('organizationId')
- })
- .then(function(org) {
- organizationName = org.name;
- })
- ]);
- })
- .then(function() {
- if (appSettings.folderStructure) {
- var structure = [];
- hasFolders = true;
- var appleOnly = _.filter(appSettings.folderStructure, function(obj) {
- return obj.platform === 'apple';
- });
+// Listen for 2FA code when requested
+socket.on('aab.apple.login.2fa', function(data) {
+ socketClientId = data.clientId || socketClientId;
+ // Ask user for code
+ toggleLoginForm(getCurrentLoginForm(), '2fa-code', data);
+});
- return Promise.all(appleOnly.map((obj) => {
- return Fliplet.Media.Folders.get({folderId: obj.folderId})
- .then(function(result) {
- var tempObject = {
- type: obj.type,
- folderContent: result
- }
+socket.on('aab.apple.login.2fa.devices', function(data) {
+ socketClientId = data.clientId || socketClientId;
+ // Ask user for device
+ toggleLoginForm(getCurrentLoginForm(), '2fa-device', data);
+});
- structure.push(tempObject);
- return Promise.resolve(structure);
- });
- }))
- .then(function() {
- structure.forEach(function(el, idx) {
- if (el.type === 'mobile') {
- screenShotsMobile = el.folderContent.files
- }
- if (el.type === 'tablet') {
- screenShotsTablet = el.folderContent.files
- }
- });
- });
- } else {
- hasFolders = false;
- return;
- }
- })
- .then(function() {
- return Fliplet.API.request({
- method: 'GET',
- url: 'v1/widget-instances/com.fliplet.push-notifications?appId=' + Fliplet.Env.get('appId')
- });
- })
- .then(function(response) {
- if (response.widgetInstance.settings && response.widgetInstance.settings) {
- notificationSettings = response.widgetInstance.settings;
- } else {
- notificationSettings = {};
- }
+/* INIT */
+$('#appStoreConfiguration, #enterpriseConfiguration, #unsignedConfiguration').validator().off('change.bs.validator focusout.bs.validator');
+$('[name="submissionType"][value="appStore"]').prop('checked', true).trigger('change');
+$('.copyright-helper').html('e.g. ' + new Date().getFullYear() + ' Acme Inc. ');
- init();
- initialLoad(false, 5000);
- });
- }
-}
+updateServerLocation();
// Start
-initLoad = initialLoad(true, 0);
\ No newline at end of file
+initLoad = initialLoad(true, 0);
diff --git a/js/interface.templates.js b/js/interface.templates.js
index 8167d6d..7a516e6 100644
--- a/js/interface.templates.js
+++ b/js/interface.templates.js
@@ -1,11 +1,44 @@
this["Fliplet"] = this["Fliplet"] || {};
this["Fliplet"]["Widget"] = this["Fliplet"]["Widget"] || {};
-this["Fliplet"]["Widget"]["Templates"] = this["Fliplet"]["Widget"]["Templates"] || {};
+this["Fliplet"]["Widget"]["Templates"] = this["Fliplet"]["Widget"]["Templates"] || {};
+
+this["Fliplet"]["Widget"]["Templates"]["templates.no-thumb"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+ var helper;
+
+ return "\r\n
Apple requires you to upload up to 4 screenshots of your app for
"
+ + container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"name","hash":{},"data":data}) : helper)))
+ + " . To generate your screenshots, go to
App Settings .
\r\n
\r\n
"
+ + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+ + "
\r\n
\r\n
\r\n
\r\n
+
Apple requires you to upload up to 4 screenshots of your app for
{{ name }} . To generate your screenshots, go to
App Settings .
+
+
{{ name }}
+
+
-
+