Merge pull request #2524 from vector-im/riot_2518

Make sure there are no ugly edge cases running Riot without an integrations manager

Author: manuroe

Riot.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		32242F1721E8FBE500725742 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32242F0D21E8FBA900725742 /* Theme.swift */; };
 		32242F1821E8FBF800725742 /* DefaultTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32242F0F21E8FBA900725742 /* DefaultTheme.swift */; };
 		32242F1921E8FBFB00725742 /* DarkTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32242F1021E8FBA900725742 /* DarkTheme.swift */; };
+		322C110822BBC6F80043FEAC /* WidgetManagerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 322C110722BBC6F80043FEAC /* WidgetManagerConfig.swift */; };
 		3232AB1422564D9100AD6A5C /* swiftgen-config.yml in Resources */ = {isa = PBXBuildFile; fileRef = 3232AB0022564D9100AD6A5C /* swiftgen-config.yml */; };
 		3232AB1522564D9100AD6A5C /* flat-swift4-vector.stencil in Resources */ = {isa = PBXBuildFile; fileRef = 3232AB0322564D9100AD6A5C /* flat-swift4-vector.stencil */; };
 		3232AB2122564D9100AD6A5C /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 3232AB1322564D9100AD6A5C /* README.md */; };
@@ -548,6 +549,7 @@
 		32242F0F21E8FBA900725742 /* DefaultTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultTheme.swift; sourceTree = "<group>"; };
 		32242F1021E8FBA900725742 /* DarkTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DarkTheme.swift; sourceTree = "<group>"; };
 		32242F1121E8FBA900725742 /* ThemeService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeService.h; sourceTree = "<group>"; };
+		322C110722BBC6F80043FEAC /* WidgetManagerConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetManagerConfig.swift; sourceTree = "<group>"; };
 		3232AB0022564D9100AD6A5C /* swiftgen-config.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "swiftgen-config.yml"; sourceTree = "<group>"; };
 		3232AB0322564D9100AD6A5C /* flat-swift4-vector.stencil */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "flat-swift4-vector.stencil"; sourceTree = "<group>"; };
 		3232AB1322564D9100AD6A5C /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -3042,6 +3044,7 @@
 				B1B5598420EFC3DF00210D55 /* WidgetManager.m */,
 				B1B5598120EFC3DF00210D55 /* Widget.h */,
 				B1B5598320EFC3DF00210D55 /* Widget.m */,
+				322C110722BBC6F80043FEAC /* WidgetManagerConfig.swift */,
 			);
 			path = Widgets;
 			sourceTree = "<group>";
@@ -3987,6 +3990,7 @@
 				B1B5593C20EF7BAC00210D55 /* TableViewCellWithCheckBoxes.m in Sources */,
 				32891D6B2264CBA300C82226 /* SimpleScreenTemplateViewController.swift in Sources */,
 				B1CA3A2721EF6914000D1D89 /* UIViewController.swift in Sources */,
+				322C110822BBC6F80043FEAC /* WidgetManagerConfig.swift in Sources */,
 				F0D2ADA11F6AA5FD00A7097D /* MXRoomSummary+Riot.m in Sources */,
 				B1B5596F20EFA85D00210D55 /* EncryptionInfoView.m in Sources */,
 				B1B5573820EE6C4D00210D55 /* GroupParticipantsViewController.m in Sources */,

Riot/Assets/en.lproj/Vector.strings

@@ -634,6 +634,8 @@
 "bug_report_send" = "Send";
 
 // Widget
+"widget_no_integrations_server_configured" = "No integrations server configured";
+"widget_integrations_server_failed_to_connect" = "Failed to connect to integrations server";
 "widget_no_power_to_manage" = "You need permission to manage widgets in this room";
 "widget_creation_failure" = "Widget creation has failed";
 "widget_sticker_picker_no_stickerpacks_alert" = "You don't currently have any stickerpacks enabled.";

Riot/Generated/Strings.swift

@@ -2834,6 +2834,14 @@ internal enum VectorL10n {
   internal static var widgetIntegrationUnableToCreate: String { 
     return VectorL10n.tr("Vector", "widget_integration_unable_to_create") 
   }
+  /// Failed to connect to integrations server
+  internal static var widgetIntegrationsServerFailedToConnect: String { 
+    return VectorL10n.tr("Vector", "widget_integrations_server_failed_to_connect") 
+  }
+  /// No integrations server configured
+  internal static var widgetNoIntegrationsServerConfigured: String { 
+    return VectorL10n.tr("Vector", "widget_no_integrations_server_configured") 
+  }
   /// You need permission to manage widgets in this room
   internal static var widgetNoPowerToManage: String { 
     return VectorL10n.tr("Vector", "widget_no_power_to_manage") 

Riot/Managers/Widgets/Widget.m

@@ -1,5 +1,6 @@
 /*
  Copyright 2017 Vector Creations Ltd
+ Copyright 2019 New Vector Ltd
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -100,7 +101,7 @@ - (MXHTTPOperation *)widgetUrl:(void (^)(NSString * _Nonnull))success failure:(v
                                                     _widgetId]];
 
     // Check if their scalar token must added
-    if ([WidgetManager isScalarUrl:widgetUrl])
+    if ([[WidgetManager sharedManager] isScalarUrl:widgetUrl forUser:userId])
     {
         return [[WidgetManager sharedManager] getScalarTokenForMXSession:_mxSession validate:NO success:^(NSString *scalarToken) {
             // Add the user scalar token

Riot/Managers/Widgets/WidgetManager.h

@@ -1,5 +1,6 @@
 /*
  Copyright 2017 Vector Creations Ltd
+ Copyright 2019 New Vector Ltd
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@
 
 #import "Widget.h"
 
+@class WidgetManagerConfig;
+
 /**
  The type of matrix event used for matrix widgets.
  */
@@ -51,7 +54,9 @@ FOUNDATION_EXPORT NSString *const WidgetManagerErrorDomain;
 typedef enum : NSUInteger
 {
     WidgetManagerErrorCodeNotEnoughPower,
-    WidgetManagerErrorCodeCreationFailed
+    WidgetManagerErrorCodeCreationFailed,
+    WidgetManagerErrorCodeNoIntegrationsServerConfigured,
+    WidgetManagerErrorCodeFailedToConnectToIntegrationsServer
 }
 WidgetManagerErrorCode;
 
@@ -180,6 +185,30 @@ WidgetManagerErrorCode;
 
 #pragma mark - Modular interface
 
+/**
+ Get the integration manager configuration for a user.
+
+ @param userId the user id.
+ @return the integration manager configuration.
+ */
+- (WidgetManagerConfig*)configForUser:(NSString*)userId;
+
+/**
+ Store the integration manager configuration for a user.
+
+ @param the integration manager configuration.
+ @param userId the user id.
+ */
+- (void)setConfig:(WidgetManagerConfig*)config forUser:(NSString*)userId;
+
+/**
+ Check if the user has URLs for an integration manager configured.
+
+ @param userId the user id.
+ @return YES if they have URLs for an integration manager.
+ */
+- (BOOL)hasIntegrationManagerForUser:(NSString*)userId;
+
 /**
  Make sure there is a scalar token for the given Matrix session.
  
@@ -201,8 +230,9 @@ WidgetManagerErrorCode;
  Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
 
  @param urlString the URL to check.
+ @param userId the user id.
  @return YES if specified URL is a scalar URL.
  */
-+ (BOOL)isScalarUrl:(NSString*)urlString;
+- (BOOL)isScalarUrl:(NSString*)urlString forUser:(NSString*)userId;
 
 @end