Update to v2 (#31)

Author: ondrejtomcik

ios/Runner.xcodeproj/project.pbxproj

@@ -174,7 +174,7 @@
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 52H6FSSL8K;
 						LastSwiftMigration = 1100;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 					};
 				};
 			};
@@ -375,10 +375,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
-				DEVELOPMENT_TEAM = "";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 52H6FSSL8K;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -395,12 +395,14 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.plgd;
 				PRODUCT_NAME = plgd;
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dev.plgd;
 				STRIP_BITCODE_FROM_COPIED_FILES = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				VALID_ARCHS = "arm64 arm64e";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -517,10 +519,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
-				DEVELOPMENT_TEAM = "";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 52H6FSSL8K;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -537,13 +539,15 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.plgd;
 				PRODUCT_NAME = plgd;
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dev.plgd;
 				STRIP_BITCODE_FROM_COPIED_FILES = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				VALID_ARCHS = "arm64 arm64e";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -554,10 +558,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
-				DEVELOPMENT_TEAM = "";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 52H6FSSL8K;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -574,12 +578,14 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.plgd;
 				PRODUCT_NAME = plgd;
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dev.plgd;
 				STRIP_BITCODE_FROM_COPIED_FILES = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				VALID_ARCHS = "arm64 arm64e";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

ios/Runner/AppDelegate.swift

@@ -1,6 +1,6 @@
 import UIKit
 import Flutter
-import Ocfclient
+import OCFClient
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {

ios/Runner/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

lib/models/cloudConfiguration.dart

@@ -25,28 +25,28 @@ class CloudConfiguration {
     rawJson = jsonString;
     Map<String, dynamic> json = jsonDecode(jsonString);
 
-    accessTokenUrl = json['access_token_url'];
-    authCodeUrl = json['auth_code_url'];
-    authorizationProvider = json['cloud_authorization_provider'];
-    certificateAutorities = json['cloud_certificate_authorities'];
-    cloudID = json['cloud_id'];
-    cloudUrl = json['cloud_url'];
-    jwtClaimOwnerId = json['jwt_claim_owner_id'];
-    signingServerAddress = json['signing_server_address'];
+    accessTokenUrl = json['accessTokenUrl'];
+    authCodeUrl = json['authCodeUrl'];
+    authorizationProvider = json['cloudAuthorizationProvider'];
+    certificateAutorities = json['cloudCertificateAuthorities'];
+    cloudID = json['cloudId'];
+    cloudUrl = json['cloudUrl'];
+    jwtClaimOwnerId = json['jwtClaimOwnerId'];
+    signingServerAddress = json['signingServerAddress'];
   }
 
   static bool isValid(String jsonString) {
     try {
       Map<String, dynamic> configuration = jsonDecode(jsonString);
       return 
-        configuration.containsKey('access_token_url') && Uri.parse(configuration['access_token_url']).isAbsolute &&
-        configuration.containsKey('auth_code_url') && Uri.parse(configuration['auth_code_url']).isAbsolute &&
-        configuration.containsKey('cloud_authorization_provider') &&
-        configuration.containsKey('cloud_certificate_authorities') &&
-        configuration.containsKey('cloud_id') &&
-        configuration.containsKey('cloud_url') &&
-        configuration.containsKey('jwt_claim_owner_id') &&
-        configuration.containsKey('signing_server_address');
+        configuration.containsKey('accessTokenUrl') && Uri.parse(configuration['accessTokenUrl']).isAbsolute &&
+        configuration.containsKey('authCodeUrl') && Uri.parse(configuration['authCodeUrl']).isAbsolute &&
+        configuration.containsKey('cloudAuthorizationProvider') &&
+        configuration.containsKey('cloudCertificateAuthorities') &&
+        configuration.containsKey('cloudId') &&
+        configuration.containsKey('cloudUrl') &&
+        configuration.containsKey('jwtClaimOwnerId') &&
+        configuration.containsKey('signingServerAddress');
     } on Exception catch (_) {
       return false;
     }

lib/models/device.dart

@@ -10,7 +10,6 @@ class Device {
   String ownershipStatus;
   CloudResourceConfiguration cloudConfiguration;
   List<Resources> resources;
-  List<Endpoints> endpoints;
 
   Device(
       {this.id,
@@ -23,8 +22,7 @@ class Device {
       this.ownership,
       this.ownershipStatus,
       this.cloudConfiguration,
-      this.resources,
-      this.endpoints});
+      this.resources});
 
   bool isOwnedBy(String ownerId) {
     if (!this.isSecured || !this.ownership.owned) {
@@ -38,18 +36,12 @@ class Device {
 
   Device.fromJson(Map<String, dynamic> json) {
     id = json['ID'];
-    if (json['Device'] != null) {
-      resourceTypes = json['Device']['rt'] != null ? json['Device']['rt'].cast<String>() : '';
-      interfaces = json['Device']['if'] != null ? json['Device']['if'] .cast<String>() : '';
-      name = json['Device']['n'];
-      manufacturerName = json['Device']['dmn'];
-      modelNumber = json['Device']['dmno'];
-    } else {
-      resourceTypes = json['Device']['rt'].cast<String>();
-      interfaces = json['Device']['if'].cast<String>();
-      name = json['Device']['n'];
-      manufacturerName = json['Device']['dmn'];
-      modelNumber = json['Device']['dmno'];
+    if (json['Details'] != null) {
+      resourceTypes = json['Details']['rt'] != null ? json['Details']['rt'].cast<String>() : '';
+      interfaces = json['Details']['if'] != null ? json['Details']['if'].cast<String>() : '';
+      name = json['Details']['n'];
+      manufacturerName = json['Details']['dmn'];
+      modelNumber = json['Details']['dmno'];
     }
     isSecured = json['IsSecured'];
     ownership = json['Ownership'] != null ? new Ownership.fromJson(json['Ownership']) : null;
@@ -61,12 +53,6 @@ class Device {
         resources.add(new Resources.fromJson(v));
       });
     }
-    if (json['Endpoints'] != null) {
-      endpoints = new List<Endpoints>();
-      json['Endpoints'].forEach((v) {
-        endpoints.add(new Endpoints.fromJson(v));
-      });
-    }
   }
 }
 
@@ -130,63 +116,18 @@ class CloudResourceConfiguration {
 }
 
 class Resources {
-  String id;
   String href;
   List<String> resourceTypes;
   List<String> interfaces;
-  List<Endpoints> endpoints;
-  String anchor;
-  String deviceID;
-  int instanceID;
-  String title;
-  String supportedContentTypes;
 
   Resources(
-      {this.id,
-      this.href,
+      {this.href,
       this.resourceTypes,
-      this.interfaces,
-      this.endpoints,
-      this.anchor,
-      this.deviceID,
-      this.instanceID,
-      this.title,
-      this.supportedContentTypes});
+      this.interfaces});
 
   Resources.fromJson(Map<String, dynamic> json) {
-    id = json['id'];
     href = json['href'];
     resourceTypes = json['rt'].cast<String>();
     interfaces = json['if'].cast<String>();
-    if (json['eps'] != null) {
-      endpoints = new List<Endpoints>();
-      json['eps'].forEach((v) {
-        endpoints.add(new Endpoints.fromJson(v));
-      });
-    }
-    anchor = json['anchor'];
-    deviceID = json['di'];
-    instanceID = json['ins'];
-    title = json['title'];
-    supportedContentTypes = json['type'];
-  }
-}
-
-class Endpoints {
-  String uRI;
-  int priority;
-
-  Endpoints({this.uRI, this.priority});
-
-  Endpoints.fromJson(Map<String, dynamic> json) {
-    uRI = json['ep'];
-    priority = json['pri'];
-  }
-
-  Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['ep'] = this.uRI;
-    data['pri'] = this.priority;
-    return data;
   }
 }

ocfclient/OCFClient.go

@@ -5,16 +5,16 @@ import (
 	"time"
 
 	"github.com/plgd-dev/cloud/grpc-gateway/pb"
+	grpcCloud "github.com/plgd-dev/cloud/pkg/net/grpc"
 	"github.com/plgd-dev/kit/codec/json"
-	kitGrpc "github.com/plgd-dev/kit/net/grpc"
 	"github.com/plgd-dev/kit/security"
-	"github.com/plgd-dev/kit/strings"
 	"github.com/plgd-dev/sdk/app"
 	"github.com/plgd-dev/sdk/local"
 	"github.com/plgd-dev/sdk/local/core"
 	"github.com/plgd-dev/sdk/schema"
 	"github.com/plgd-dev/sdk/schema/acl"
 	"github.com/plgd-dev/sdk/schema/cloud"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 type (
@@ -27,7 +27,7 @@ type (
 
 // Initialize creates and initializes new local client
 func (c *Ocfclient) Initialize(accessToken, cloudConfiguration string) error {
-	err := json.Decode([]byte(cloudConfiguration), &c.cloudConfiguration)
+	err := protojson.Unmarshal([]byte(cloudConfiguration), &c.cloudConfiguration)
 	if err != nil {
 		return err
 	}
@@ -46,14 +46,15 @@ func (c *Ocfclient) Initialize(accessToken, cloudConfiguration string) error {
 			SigningServerAddress: c.cloudConfiguration.GetSigningServerAddress(),
 			JWTClaimOwnerID:      c.cloudConfiguration.GetJwtClaimOwnerId(),
 		},
-	}, appCallback, func(err error) {})
+	}, appCallback, nil, func(err error) {})
+
 	if err != nil {
 		return err
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second)
 	defer cancel()
-	ctx = kitGrpc.CtxWithToken(ctx, accessToken)
+	ctx = grpcCloud.CtxWithToken(ctx, accessToken)
 	err = localClient.Initialization(ctx)
 	if err != nil {
 		return err
@@ -89,9 +90,11 @@ func (c *Ocfclient) Discover(timeoutSeconds int) (string, error) {
 func getCloudConfiguration(ctx context.Context, device *core.Device, links schema.ResourceLinks) (out interface{}, _ error) {
 	var link schema.ResourceLink
 	for _, l := range links {
-		if strings.SliceContains(l.ResourceTypes, cloud.ConfigurationResourceType) {
-			link = l
-			break
+		for _, rt := range l.ResourceTypes {
+			if rt == cloud.ConfigurationResourceType {
+				link = l
+				break
+			}
 		}
 	}
 
@@ -107,7 +110,7 @@ func getCloudConfiguration(ctx context.Context, device *core.Device, links schem
 func (c *Ocfclient) OwnDevice(deviceID, accessToken string) (string, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 	defer cancel()
-	ctx = kitGrpc.CtxWithToken(ctx, accessToken)
+	ctx = grpcCloud.CtxWithToken(ctx, accessToken)
 	return c.localClient.OwnDevice(ctx, deviceID, local.WithOTM(local.OTMType_JustWorks))
 }
 

ocfclient/build.sh

@@ -1 +1 @@
-gomobile bind --target ios -bundleid dev.plgd -o ../ios/Frameworks/OCFClient.framework
+gomobile bind --target ios/arm64 -bundleid dev.plgd -o ../ios/Frameworks/OCFClient.framework

ocfclient/go.mod

@@ -1,11 +1,11 @@
-module github.com/plgd-dev/onboarding/ocfclient
+module github.com/plgd-dev/plgd.mobile/ocfclient
 
-go 1.14
+go 1.16
 
 require (
-	github.com/plgd-dev/cloud v1.0.1
-	github.com/plgd-dev/go-coap/v2 v2.1.2-0.20201106162854-b526118f5e1c // indirect
-	github.com/plgd-dev/kit v0.0.0-20201012075715-45376a9f2c61
-	github.com/plgd-dev/sdk v0.0.0-20201028101719-4e0d1c693a90
-	golang.org/x/mobile v0.0.0-20200801112145-973feb4309de // indirect
+	github.com/plgd-dev/cloud v1.1.3-0.20210614184948-03b478890cfe
+	github.com/plgd-dev/kit v0.0.0-20210614190235-99984a49de48
+	github.com/plgd-dev/sdk v0.0.0-20210629124313-64311af90a6f
+	golang.org/x/tools v0.1.2 // indirect
+	google.golang.org/protobuf v1.27.1
 )